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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/scheduled_test/test/descriptor_test.dart

Issue 12853005: Change the way Patterns work in scheduled_test/descriptor. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Code review changes. 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
« no previous file with comments | « pkg/scheduled_test/lib/src/utils.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/scheduled_test/test/descriptor_test.dart
diff --git a/pkg/scheduled_test/test/descriptor_test.dart b/pkg/scheduled_test/test/descriptor_test.dart
index d203bbe618f4d2cce2c44256edc03e8f73312e12..f1b3b2ffee6c5520fa6e2e12b07c17f6094508df 100644
--- a/pkg/scheduled_test/test/descriptor_test.dart
+++ b/pkg/scheduled_test/test/descriptor_test.dart
@@ -45,26 +45,6 @@ void main() {
});
});
- expectTestsPass('file().create() with a RegExp name fails', () {
- var errors;
- test('test 1', () {
- scheduleSandbox();
-
- currentSchedule.onException.schedule(() {
- errors = currentSchedule.errors;
- });
-
- d.file(new RegExp(r'name\.txt'), 'contents').create();
- });
-
- test('test 2', () {
- expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
- expect(errors.map((e) => e.error), equals([
- r"Pattern /name\.txt/ must be a string."
- ]), verbose: true);
- });
- }, passing: ['test 2']);
-
expectTestsPass('file().validate() completes successfully if the filesystem '
'matches the descriptor', () {
test('test', () {
@@ -128,107 +108,6 @@ void main() {
});
}, passing: ['test 2']);
- expectTestsPass('file().validate() with a RegExp completes successfully if '
- 'the filesystem matches the descriptor', () {
- test('test', () {
- scheduleSandbox();
-
- schedule(() {
- return new File(path.join(sandbox, 'name.txt'))
- .writeAsString('contents');
- });
-
- d.file(new RegExp(r'na..\.txt'), 'contents').validate();
- });
- });
-
- expectTestsPass("file().validate() with a RegExp fails if there's a file "
- "with the wrong contents", () {
- var errors;
- test('test 1', () {
- scheduleSandbox();
-
- currentSchedule.onException.schedule(() {
- errors = currentSchedule.errors;
- });
-
- schedule(() {
- return new File(path.join(sandbox, 'name.txt'))
- .writeAsString('some\nwrongtents');
- });
-
- d.file(new RegExp(r'na..\.txt'), 'some\ncontents\nand stuff').validate();
- });
-
- test('test 2', () {
- expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
- expect(errors.map((e) => e.error), equals([
- "File 'name.txt' (matching /na..\\.txt/) should contain:\n"
- "| some\n"
- "| contents\n"
- "| and stuff\n"
- "but actually contained:\n"
- "| some\n"
- "X wrongtents\n"
- "? and stuff"
- ]), verbose: true);
- });
- }, passing: ['test 2']);
-
- expectTestsPass("file().validate() with a RegExp fails if there's no "
- "file", () {
- var errors;
- test('test 1', () {
- scheduleSandbox();
-
- currentSchedule.onException.schedule(() {
- errors = currentSchedule.errors;
- });
-
- d.file(new RegExp(r'na..\.txt'), 'contents').validate();
- });
-
- test('test 2', () {
- expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
- expect(errors.length, equals(1));
- expect(errors.first.error,
- matches(r"^No entry found in '[^']+' matching /na\.\.\\\.txt/\.$"));
- });
- }, passing: ['test 2']);
-
- expectTestsPass("file().validate() with a RegExp fails if there are multiple "
- "matching files", () {
- var errors;
- test('test 1', () {
- scheduleSandbox();
-
- currentSchedule.onException.schedule(() {
- errors = currentSchedule.errors;
- });
-
- schedule(() {
- return Future.wait([
- new File(path.join(sandbox, 'name.txt')).writeAsString('contents'),
- new File(path.join(sandbox, 'nape.txt')).writeAsString('contents'),
- new File(path.join(sandbox, 'nail.txt')).writeAsString('contents')
- ]);
- });
-
- d.file(new RegExp(r'na..\.txt'), 'contents').validate();
- });
-
- test('test 2', () {
- expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
- expect(errors.length, equals(1));
- expect(errors.first.error,
- matches(
- r"^Multiple entries found in '[^']+' matching /na\.\.\\\.txt/:\n"
- r"\* .*[\\/]nail\.txt\n"
- r"\* .*[\\/]name\.txt\n"
- r"\* .*[\\/]nape\.txt"));
- });
- }, passing: ['test 2']);
-
expectTestsPass("file().read() returns the contents of the file as a stream",
() {
test('test', () {
@@ -251,13 +130,6 @@ void main() {
});
});
- expectTestsPass("file().describe() with a RegExp describes the file", () {
- test('test', () {
- expect(d.file(new RegExp(r'na..\.txt'), 'contents').describe(),
- equals(r'file matching /na..\.txt/'));
- });
- });
-
expectTestsPass('binaryFile().create() creates a file', () {
test('test', () {
scheduleSandbox();
@@ -355,26 +227,6 @@ void main() {
});
});
- expectTestsPass("directory().create() with a RegExp name fails", () {
- var errors;
- test('test 1', () {
- scheduleSandbox();
-
- currentSchedule.onException.schedule(() {
- errors = currentSchedule.errors;
- });
-
- d.dir(new RegExp('dir')).create();
- });
-
- test('test 2', () {
- expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
- expect(errors.map((e) => e.error), equals([
- "Pattern /dir/ must be a string."
- ]), verbose: true);
- });
- }, passing: ['test 2']);
-
expectTestsPass("directory().validate() completes successfully if the "
"filesystem matches the descriptor", () {
test('test', () {
@@ -538,161 +390,6 @@ void main() {
});
}, passing: ['test 2']);
- expectTestsPass("directory().validate() with a RegExp completes successfully "
- "if the filesystem matches the descriptor", () {
- test('test', () {
- scheduleSandbox();
-
- schedule(() {
- var dirPath = path.join(sandbox, 'dir');
- var subdirPath = path.join(dirPath, 'subdir');
- return new Directory(subdirPath).create(recursive: true).then((_) {
- return Future.wait([
- new File(path.join(dirPath, 'file1.txt'))
- .writeAsString('contents1'),
- new File(path.join(dirPath, 'file2.txt'))
- .writeAsString('contents2'),
- new File(path.join(subdirPath, 'subfile1.txt'))
- .writeAsString('subcontents1'),
- new File(path.join(subdirPath, 'subfile2.txt'))
- .writeAsString('subcontents2')
- ]);
- });
- });
-
- d.dir(new RegExp('d.r'), [
- d.dir('subdir', [
- d.file('subfile1.txt', 'subcontents1'),
- d.file('subfile2.txt', 'subcontents2')
- ]),
- d.file('file1.txt', 'contents1'),
- d.file('file2.txt', 'contents2')
- ]).validate();
- });
- });
-
- expectTestsPass("directory().validate() with a RegExp fails if there's a dir "
- "with the wrong contents", () {
- var errors;
- test('test 1', () {
- scheduleSandbox();
-
- currentSchedule.onException.schedule(() {
- errors = currentSchedule.errors;
- });
-
- schedule(() {
- var dirPath = path.join(sandbox, 'dir');
- var subdirPath = path.join(dirPath, 'subdir');
- return new Directory(subdirPath).create(recursive: true).then((_) {
- return Future.wait([
- new File(path.join(dirPath, 'file1.txt'))
- .writeAsString('contents1'),
- new File(path.join(subdirPath, 'subfile1.txt'))
- .writeAsString('subcontents1'),
- new File(path.join(subdirPath, 'subfile2.txt'))
- .writeAsString('subcontents2')
- ]);
- });
- });
-
- d.dir(new RegExp('d.r'), [
- d.dir('subdir', [
- d.file('subfile1.txt', 'subcontents1'),
- d.file('subfile2.txt', 'subcontents2')
- ]),
- d.file('file1.txt', 'contents1'),
- d.file('file2.txt', 'contents2')
- ]).validate();
- });
-
- test('test 2', () {
- expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
- expect(errors.length, equals(1));
- expect(errors.first.error,
- matches(r"^File not found: '[^']+[\\/]dir[\\/]file2\.txt'\.$"));
- });
- }, passing: ['test 2']);
-
- expectTestsPass("directory().validate() with a RegExp fails if there's no "
- "dir", () {
- var errors;
- test('test 1', () {
- scheduleSandbox();
-
- currentSchedule.onException.schedule(() {
- errors = currentSchedule.errors;
- });
-
- d.dir(new RegExp('d.r'), [
- d.dir('subdir', [
- d.file('subfile1.txt', 'subcontents1'),
- d.file('subfile2.txt', 'subcontents2')
- ]),
- d.file('file1.txt', 'contents1'),
- d.file('file2.txt', 'contents2')
- ]).validate();
- });
-
- test('test 2', () {
- expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
- expect(errors.length, equals(1));
- expect(errors.first.error,
- matches(r"^No entry found in '[^']+' matching /d\.r/\.$"));
- });
- }, passing: ['test 2']);
-
- expectTestsPass("directory().validate() with a RegExp fails if there are "
- "multiple matching dirs", () {
- var errors;
- test('test 1', () {
- scheduleSandbox();
-
- currentSchedule.onException.schedule(() {
- errors = currentSchedule.errors;
- });
-
- schedule(() {
- return Future.wait(['dir', 'dar', 'dor'].map((dir) {
- var dirPath = path.join(sandbox, dir);
- var subdirPath = path.join(dirPath, 'subdir');
- return new Directory(subdirPath).create(recursive: true).then((_) {
- return Future.wait([
- new File(path.join(dirPath, 'file1.txt'))
- .writeAsString('contents1'),
- new File(path.join(dirPath, 'file2.txt'))
- .writeAsString('contents2'),
- new File(path.join(subdirPath, 'subfile1.txt'))
- .writeAsString('subcontents1'),
- new File(path.join(subdirPath, 'subfile2.txt'))
- .writeAsString('subcontents2')
- ]);
- });
- }));
- });
-
- d.dir(new RegExp('d.r'), [
- d.dir('subdir', [
- d.file('subfile1.txt', 'subcontents1'),
- d.file('subfile2.txt', 'subcontents2')
- ]),
- d.file('file1.txt', 'contents1'),
- d.file('file2.txt', 'contents2')
- ]).validate();
- });
-
- test('test 2', () {
- expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
- expect(errors.length, equals(1));
- expect(errors.first.error,
- matches(
- r"^Multiple entries found in '[^']+' matching /d\.r/:\n"
- r"\* .*[\\/]dar\n"
- r"\* .*[\\/]dir\n"
- r"\* .*[\\/]dor"));
- });
- }, passing: ['test 2']);
-
expectTestsPass("directory().load() loads a file", () {
test('test', () {
var dir = d.dir('dir', [d.file('name.txt', 'contents')]);
@@ -762,16 +459,6 @@ void main() {
});
});
- expectTestsPass("directory().load() fails to load a file with a RegExp name",
- () {
- test('test', () {
- var dir = d.dir('dir', [d.file(new RegExp(r'name\.txt'), 'contents')]);
-
- expect(dir.load('name.txt').toList(),
- throwsA(equals(r"Pattern /name\.txt/ must be a string.")));
- });
- });
-
expectTestsPass("directory().load() fails to load a file that doesn't exist",
() {
test('test', () {
@@ -802,15 +489,13 @@ void main() {
test('test', () {
var dir = d.dir('dir', [
d.file('file1.txt', 'contents1'),
- d.file('file2.txt', 'contents2'),
- d.file(new RegExp(r're\.txt'), 're-contents')
+ d.file('file2.txt', 'contents2')
]);
expect(dir.describe(), equals(
"dir\n"
"|-- file1.txt\n"
- "|-- file2.txt\n"
- "'-- file matching /re\\.txt/"));
+ "'-- file2.txt"));
});
});
@@ -841,21 +526,6 @@ void main() {
});
});
- expectTestsPass("directory().describe() with a RegExp describes the "
- "directory", () {
- test('test', () {
- var dir = d.dir(new RegExp(r'd.r'), [
- d.file('file1.txt', 'contents1'),
- d.file('file2.txt', 'contents2')
- ]);
-
- expect(dir.describe(), equals(
- "directory matching /d.r/\n"
- "|-- file1.txt\n"
- "'-- file2.txt"));
- });
- });
-
expectTestsPass("directory().describe() with no contents returns the "
"directory name", () {
test('test', () {
@@ -976,7 +646,7 @@ void main() {
expect(d.async(new Future.immediate(d.file('name.txt')))
.load('path').toList(),
- throwsA(equals("Async descriptors don't support load().")));
+ throwsA(equals("AsyncDescriptors don't support load().")));
});
});
@@ -985,7 +655,7 @@ void main() {
scheduleSandbox();
expect(d.async(new Future.immediate(d.file('name.txt'))).read().toList(),
- throwsA(equals("Async descriptors don't support read().")));
+ throwsA(equals("AsyncDescriptors don't support read().")));
});
});
@@ -1015,15 +685,6 @@ void main() {
});
});
- expectTestsPass("nothing().validate() with a RegExp succeeds if nothing's "
- "there", () {
- test('test', () {
- scheduleSandbox();
-
- d.nothing(new RegExp('f.o')).validate();
- });
- });
-
expectTestsPass("nothing().validate() fails if there's a file", () {
var errors;
test('test 1', () {
@@ -1068,8 +729,86 @@ void main() {
});
}, passing: ['test 2']);
- expectTestsPass("nothing().validate() with a RegExp fails if there are "
- "multiple entries", () {
+ expectTestsPass("nothing().load() fails", () {
+ test('test', () {
+ scheduleSandbox();
+
+ expect(d.nothing('name.txt').load('path').toList(),
+ throwsA(equals("Nothing descriptors don't support load().")));
+ });
+ });
+
+ expectTestsPass("nothing().read() fails", () {
+ test('test', () {
+ scheduleSandbox();
+
+ expect(d.nothing('name.txt').read().toList(),
+ throwsA(equals("Nothing descriptors don't support read().")));
+ });
+ });
+
+ expectTestsPass("pattern().validate() succeeds if there's a file matching "
+ "the pattern and the child entry", () {
+ test('test', () {
+ scheduleSandbox();
+
+ d.file('foo', 'blap').create();
+
+ d.filePattern(new RegExp(r'f..'), 'blap').validate();
+ });
+ });
+
+ expectTestsPass("pattern().validate() succeeds if there's a dir matching "
+ "the pattern and the child entry", () {
+ test('test', () {
+ scheduleSandbox();
+
+ d.dir('foo', [
+ d.file('bar', 'baz')
+ ]).create();
+
+ d.dirPattern(new RegExp(r'f..'), [
+ d.file('bar', 'baz')
+ ]).validate();
+ });
+ });
+
+ expectTestsPass("pattern().validate() succeeds if there's multiple files "
+ "matching the pattern but only one matching the child entry", () {
+ test('test', () {
+ scheduleSandbox();
+
+ d.file('foo', 'blap').create();
+ d.file('fee', 'blak').create();
+ d.file('faa', 'blut').create();
+
+ d.filePattern(new RegExp(r'f..'), 'blap').validate();
+ });
+ });
+
+ expectTestsPass("pattern().validate() fails if there's no file matching the "
+ "pattern", () {
+ var errors;
+ test('test 1', () {
+ scheduleSandbox();
+
+ currentSchedule.onException.schedule(() {
+ errors = currentSchedule.errors;
+ });
+
+ d.filePattern(new RegExp(r'f..'), 'bar').validate();
+ });
+
+ test('test 2', () {
+ expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
+ expect(errors.length, equals(1));
+ expect(errors.first.error,
+ matches(r"^No entry found in '[^']+' matching /f\.\./\.$"));
+ });
+ }, passing: ['test 2']);
+
+ expectTestsPass("pattern().validate() fails if there's a file matching the "
+ "pattern but not the entry", () {
var errors;
test('test 1', () {
scheduleSandbox();
@@ -1078,40 +817,85 @@ void main() {
errors = currentSchedule.errors;
});
- d.dir('foo').create();
- d.file('faa', 'contents').create();
- d.file('not-foo', 'contents').create();
- d.nothing(new RegExp(r'^f..$')).validate();
+ d.file('foo', 'bap').create();
+ d.filePattern(new RegExp(r'f..'), 'bar').validate();
});
test('test 2', () {
expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
expect(errors.length, equals(1));
expect(errors.first.error,
- matches(r"^Expected nothing to exist in '[^']+' matching "
- r"/\^f\.\.\$/, but found:\n"
- r"\* .*[\\/]faa\n"
- r"\* .*[\\/]foo$"));
+ matches(r"^Caught error\n"
+ r"| File 'foo' should contain:\n"
+ r"| | bar\n"
+ r"| but actually contained:\n"
+ r"| X bap\n"
+ r"while validating\n"
+ r"| foo$"));
});
}, passing: ['test 2']);
- expectTestsPass("nothing().load() fails", () {
- test('test', () {
+ expectTestsPass("pattern().validate() fails if there's a dir matching the "
+ "pattern but not the entry", () {
+ var errors;
+ test('test 1', () {
scheduleSandbox();
- expect(d.nothing('name.txt').load('path').toList(),
- throwsA(equals("Nothing descriptors don't support load().")));
+ currentSchedule.onException.schedule(() {
+ errors = currentSchedule.errors;
+ });
+
+ d.dir('foo', [
+ d.file('bar', 'bap')
+ ]).create();
+
+ d.dirPattern(new RegExp(r'f..'), [
+ d.file('bar', 'baz')
+ ]).validate();
});
- });
- expectTestsPass("nothing().read() fails", () {
- test('test', () {
+ test('test 2', () {
+ expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
+ expect(errors.length, equals(1));
+ expect(errors.first.error,
+ matches(r"^Caught error\n"
+ r"| File 'bar' should contain:\n"
+ r"| | baz\n"
+ r"| but actually contained:\n"
+ r"| X bap"
+ r"while validating\n"
+ r"| foo\n"
+ r"| '-- bar$"));
+ });
+ }, passing: ['test 2']);
+
+ expectTestsPass("pattern().validate() fails if there's multiple files "
+ "matching the pattern and the child entry", () {
+ var errors;
+ test('test 1', () {
scheduleSandbox();
- expect(d.nothing('name.txt').read().toList(),
- throwsA(equals("Nothing descriptors don't support read().")));
+ currentSchedule.onException.schedule(() {
+ errors = currentSchedule.errors;
+ });
+
+ d.file('foo', 'bar').create();
+ d.file('fee', 'bar').create();
+ d.file('faa', 'bar').create();
+ d.filePattern(new RegExp(r'f..'), 'bar').validate();
});
- });
+
+ test('test 2', () {
+ expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
+ expect(errors.length, equals(1));
+ expect(errors.first.error, matches(
+ r"^Multiple valid entries found in '[^']+' matching "
+ r"\/f\.\./:\n"
+ r"\* faa\n"
+ r"\* fee\n"
+ r"\* foo$"));
+ });
+ }, passing: ['test 2']);
}
void scheduleSandbox() {
« no previous file with comments | « pkg/scheduled_test/lib/src/utils.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698