Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2034)

Unified Diff: dart/tools/testing/dart/test_suite.dart

Issue 113713006: test.py: Removed JUnitTestSuite, since it's no longer used (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dart/tools/testing/dart/launch_browser.dart ('k') | dart/tools/testing/dart/utils.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/tools/testing/dart/test_suite.dart
diff --git a/dart/tools/testing/dart/test_suite.dart b/dart/tools/testing/dart/test_suite.dart
index 97453870e9589ac7d519806d2de68b4b1124ab6d..56b64ef56ab35b810e7f08241e0e61ec72782efc 100644
--- a/dart/tools/testing/dart/test_suite.dart
+++ b/dart/tools/testing/dart/test_suite.dart
@@ -15,7 +15,6 @@
library test_suite;
import "dart:async";
-import "dart:convert" show LineSplitter, UTF8;
import "dart:io";
import "drt_updater.dart";
import "multitest.dart";
@@ -1585,117 +1584,6 @@ class AnalyzeLibraryTestSuite extends DartcCompilationTestSuite {
bool get listRecursively => true;
}
-class JUnitTestSuite extends TestSuite {
- String directoryPath;
- String statusFilePath;
- final String dartDir;
- String classPath;
- List<String> testClasses;
- VoidFunction doDone;
- TestExpectations testExpectations;
-
- JUnitTestSuite(Map configuration,
- String suiteName,
- String this.directoryPath,
- String this.statusFilePath)
- : super(configuration, suiteName),
- dartDir = TestUtils.dartDir().toNativePath();
-
- bool isTestFile(String filename) => filename.endsWith("Tests.java") &&
- !filename.contains('com/google/dart/compiler/vm') &&
- !filename.contains('com/google/dart/corelib/SharedTests.java');
-
- void forEachTest(TestCaseEvent onTest,
- Map testCacheIgnored,
- [VoidFunction onDone]) {
- doTest = onTest;
- doDone = onDone;
-
- if (!configuration['analyzer']) {
- // Do nothing. Asynchronously report that the suite is enqueued.
- asynchronously(doDone);
- return;
- }
- RegExp pattern = configuration['selectors']['dartc'];
- if (!pattern.hasMatch('junit_tests')) {
- asynchronously(doDone);
- return;
- }
-
- computeClassPath();
- testClasses = <String>[];
- // Do not read the status file.
- // All exclusions are hardcoded in this script, as they are in testcfg.py.
- processDirectory();
- }
-
- void processDirectory() {
- directoryPath = '$dartDir/$directoryPath';
- Directory dir = new Directory(directoryPath);
-
- dir.list(recursive: true).listen((FileSystemEntity fse) {
- if (fse is File) processFile(fse.path);
- },
- onDone: createTest);
- }
-
- void processFile(String filename) {
- if (!isTestFile(filename)) return;
-
- int index = filename.indexOf('compiler/javatests/com/google/dart');
- if (index != -1) {
- String testRelativePath =
- filename.substring(index + 'compiler/javatests/'.length,
- filename.length - '.java'.length);
- String testClass = testRelativePath.replaceAll('/', '.');
- testClasses.add(testClass);
- }
- }
-
- void createTest() {
- var sdkDir = "$buildDir/dart-sdk".trim();
- List<String> args = <String>[
- '-ea',
- '-classpath', classPath,
- '-Dcom.google.dart.sdk=$sdkDir',
- '-Dcom.google.dart.corelib.SharedTests.test_py=$dartDir/tools/test.py',
- 'org.junit.runner.JUnitCore'];
- args.addAll(testClasses);
-
- // Lengthen the timeout for JUnit tests. It is normal for them
- // to run for a few minutes.
- Map updatedConfiguration = new Map();
- configuration.forEach((key, value) {
- updatedConfiguration[key] = value;
- });
- updatedConfiguration['timeout'] *= 3;
- var command = CommandBuilder.instance.getCommand(
- 'junit_test', 'java', args, configurationDir);
- enqueueNewTestCase(
- new TestCase(suiteName,
- [command],
- updatedConfiguration,
- new Set<Expectation>.from([Expectation.PASS])));
- doDone();
- }
-
- void computeClassPath() {
- classPath =
- ['$buildDir/analyzer/util/analyzer/dart_analyzer.jar',
- '$buildDir/analyzer/dart_analyzer_tests.jar',
- // Third party libraries.
- '$dartDir/third_party/args4j/2.0.12/args4j-2.0.12.jar',
- '$dartDir/third_party/guava/r13/guava-13.0.1.jar',
- '$dartDir/third_party/rhino/1_7R3/js.jar',
- '$dartDir/third_party/hamcrest/v1_3/hamcrest-core-1.3.0RC2.jar',
- '$dartDir/third_party/hamcrest/v1_3/hamcrest-generator-1.3.0RC2.jar',
- '$dartDir/third_party/hamcrest/v1_3/hamcrest-integration-1.3.0RC2.jar',
- '$dartDir/third_party/hamcrest/v1_3/hamcrest-library-1.3.0RC2.jar',
- '$dartDir/third_party/junit/v4_8_2/junit.jar']
- .join(Platform.operatingSystem == 'windows'? ';': ':');
- }
-}
-
class LastModifiedCache {
Map<String, DateTime> _cache = <String, DateTime>{};
« no previous file with comments | « dart/tools/testing/dart/launch_browser.dart ('k') | dart/tools/testing/dart/utils.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698