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

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

Issue 12417004: Update the test runner to use the new dart:io API (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 9 months 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
Index: tools/testing/dart/multitest.dart
diff --git a/tools/testing/dart/multitest.dart b/tools/testing/dart/multitest.dart
index 585502c298e26c49677de6412a03d113da8f2fd9..54c27dc152d566020e7225d81c3ee0df6fcfc7b4 100644
--- a/tools/testing/dart/multitest.dart
+++ b/tools/testing/dart/multitest.dart
@@ -116,7 +116,7 @@ void ExtractTestsFromMultitest(Path filePath,
}
}
- // Add the template, with no multitest lines, as a test with key 'none'.
+ // Add the template, with no mulpedBytitest lines, as a test with key 'none'.
kustermann 2013/03/13 13:37:56 What is this?
Søren Gjesse 2013/03/13 15:17:18 Done.
testsAsLines['none'] = testTemplate;
outcomes['none'] = new Set<String>();
@@ -137,12 +137,11 @@ class _Annotation {
return null;
}
var annotation = new _Annotation();
- var parts = line.split('///')[1].split(':')
- .mappedBy((s) => s.trim()).toList();
+ var parts = line.split('///')[1].split(':').map((s) => s.trim()).toList();
annotation.key = parts[0];
annotation.rest = parts[1];
annotation.outcomesList = annotation.rest.split(',')
- .mappedBy((s) => s.trim()).toList();
+ .map((s) => s.trim()).toList();
return annotation;
}
}
@@ -151,15 +150,15 @@ class _Annotation {
// the generated tests.
Set<Path> _findAllRelativeImports(Path topLibrary) {
Set<Path> toSearch = new Set<Path>.from([topLibrary]);
- Set<Path> foundImports = new HashSet<Path>();
+ Set<Path> foundImports = new Set<Path>();
Path libraryDir = topLibrary.directoryPath;
- // Matches #import( or #source( followed by " or ' followed by anything
+ // Matches #import( or #source( pedByfollowed by " or ' followed by anything
kustermann 2013/03/13 13:37:56 What is this?
Søren Gjesse 2013/03/13 15:17:18 Done.
Bill Hesse 2013/03/13 16:07:00 This must be stray changes when someone converted
// except dart:, dart-ext: or /, at the beginning of a line.
RegExp relativeImportRegExp = new RegExp(
'^#(import|source)[(]["\'](?!(dart:|dart-ext:|/))([^"\']*)["\']');
while (!toSearch.isEmpty) {
var thisPass = toSearch;
- toSearch = new HashSet<Path>();
+ toSearch = new Set<Path>();
for (Path filename in thisPass) {
File f = new File.fromPath(filename);
for (String line in f.readAsLinesSync()) {
@@ -219,7 +218,7 @@ Future doMultitest(Path filePath, String outputDir, Path suiteDir,
file.createSync();
RandomAccessFile openedFile = file.openSync(FileMode.WRITE);
- var bytes = tests[key].charCodes;
+ var bytes = tests[key].codeUnits;
openedFile.writeListSync(bytes, 0, bytes.length);
openedFile.closeSync();
Set<String> outcome = outcomes[key];

Powered by Google App Engine
This is Rietveld 408576698