Skip to content

Commit f262be9

Browse files
committed
Merge pull request #1141 from dart-lang/move_files
move testing data files to testing/
2 parents 76f5b7c + 9308609 commit f262be9

File tree

619 files changed

+19
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

619 files changed

+19
-23
lines changed

.analysis_options

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ analyzer:
33
- 'doc/api/**'
44
- 'lib/templates/*.html'
55
- 'pub.dartlang.org/**'
6-
- 'test_package/**'
7-
- 'test_package_small/**'
8-
- 'test_package_bad/**'
6+
- 'testing/**'

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
build/
22
doc/api/
3-
test_package/doc
4-
test_package_small/doc
3+
testing/test_package/doc
4+
testing/test_package_small/doc
55
packages
66
.buildlog
77
.pub

test/compare_output_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Uri get _currentFileUri =>
1818
(reflect(main) as ClosureMirror).function.location.sourceUri;
1919

2020
String get _testPackageDocsPath =>
21-
p.fromUri(_currentFileUri.resolve('../test_package_docs'));
21+
p.fromUri(_currentFileUri.resolve('../testing/test_package_docs'));
2222

2323
String get _testPackagePath =>
24-
p.fromUri(_currentFileUri.resolve('../test_package'));
24+
p.fromUri(_currentFileUri.resolve('../testing/test_package'));
2525

2626
void main() {
2727
group('compare outputs', () {

test/package_meta_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void main() {
1717

1818
setUp(() {
1919
var d = new Directory(
20-
path.join(Directory.current.path, 'test_package_not_valid'));
20+
path.join(Directory.current.path, 'testing/test_package_not_valid'));
2121
if (!d.existsSync()) {
2222
throw "$d cannot be found";
2323
}

test/src/utils.dart

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ import 'package:path/path.dart' as p;
2020
AnalyzerHelper analyzerHelper;
2121
DartSdk sdkDir;
2222
Package testPackage;
23-
final Directory testPackageBadDir = new Directory('test_package_bad');
23+
final Directory testPackageBadDir = new Directory('testing/test_package_bad');
2424

25-
final Directory testPackageDir = new Directory('test_package');
25+
final Directory testPackageDir = new Directory('testing/test_package');
2626
Package testPackageSmall;
2727
final Directory testPackageWithEmbedderYaml =
28-
new Directory('test_package_embedder_yaml');
29-
final Directory testPackageWithNoReadme = new Directory('test_package_small');
28+
new Directory('testing/test_package_embedder_yaml');
29+
final Directory testPackageWithNoReadme =
30+
new Directory('testing/test_package_small');
3031

3132
void delete(Directory dir) {
3233
if (dir.existsSync()) dir.deleteSync(recursive: true);
@@ -45,9 +46,10 @@ void init() {
4546
'lib/is_deprecated.dart'
4647
];
4748

48-
testPackage = _bootPackage(pathsForTestLib, 'test_package');
49+
testPackage = _bootPackage(pathsForTestLib, 'testing/test_package');
4950

50-
testPackageSmall = _bootPackage(['lib/main.dart'], 'test_package_small');
51+
testPackageSmall =
52+
_bootPackage(['lib/main.dart'], 'testing/test_package_small');
5153
}
5254

5355
Package _bootPackage(Iterable<String> libPaths, String dirPath) {
File renamed without changes.

0 commit comments

Comments
 (0)