Skip to content

move testing data files to testing/ #1141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 1 addition & 3 deletions .analysis_options
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ analyzer:
- 'doc/api/**'
- 'lib/templates/*.html'
- 'pub.dartlang.org/**'
- 'test_package/**'
- 'test_package_small/**'
- 'test_package_bad/**'
- 'testing/**'
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
build/
doc/api/
test_package/doc
test_package_small/doc
testing/test_package/doc
testing/test_package_small/doc
packages
.buildlog
.pub
Expand Down
4 changes: 2 additions & 2 deletions test/compare_output_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Uri get _currentFileUri =>
(reflect(main) as ClosureMirror).function.location.sourceUri;

String get _testPackageDocsPath =>
p.fromUri(_currentFileUri.resolve('../test_package_docs'));
p.fromUri(_currentFileUri.resolve('../testing/test_package_docs'));

String get _testPackagePath =>
p.fromUri(_currentFileUri.resolve('../test_package'));
p.fromUri(_currentFileUri.resolve('../testing/test_package'));

void main() {
group('compare outputs', () {
Expand Down
2 changes: 1 addition & 1 deletion test/package_meta_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void main() {

setUp(() {
var d = new Directory(
path.join(Directory.current.path, 'test_package_not_valid'));
path.join(Directory.current.path, 'testing/test_package_not_valid'));
if (!d.existsSync()) {
throw "$d cannot be found";
}
Expand Down
14 changes: 8 additions & 6 deletions test/src/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ import 'package:path/path.dart' as p;
AnalyzerHelper analyzerHelper;
DartSdk sdkDir;
Package testPackage;
final Directory testPackageBadDir = new Directory('test_package_bad');
final Directory testPackageBadDir = new Directory('testing/test_package_bad');

final Directory testPackageDir = new Directory('test_package');
final Directory testPackageDir = new Directory('testing/test_package');
Package testPackageSmall;
final Directory testPackageWithEmbedderYaml =
new Directory('test_package_embedder_yaml');
final Directory testPackageWithNoReadme = new Directory('test_package_small');
new Directory('testing/test_package_embedder_yaml');
final Directory testPackageWithNoReadme =
new Directory('testing/test_package_small');

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

testPackage = _bootPackage(pathsForTestLib, 'test_package');
testPackage = _bootPackage(pathsForTestLib, 'testing/test_package');

testPackageSmall = _bootPackage(['lib/main.dart'], 'test_package_small');
testPackageSmall =
_bootPackage(['lib/main.dart'], 'testing/test_package_small');
}

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