start migration to pkg/test
diff --git a/pubspec.yaml b/pubspec.yaml
index 5e9f0d5..265a983 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,4 +11,4 @@
utf: '>=0.9.0 <0.10.0'
dev_dependencies:
path: '>=0.9.0 <2.0.0'
- unittest: '>=0.10.0 <0.12.0'
+ test: '^0.12.0'
diff --git a/test/dom_test.dart b/test/dom_test.dart
index 404a488..671d0b1 100644
--- a/test/dom_test.dart
+++ b/test/dom_test.dart
@@ -1,7 +1,7 @@
/// Additional feature tests that aren't based on test data.
library dom_test;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:html/dom.dart';
import 'package:html/parser.dart';
diff --git a/test/parser_feature_test.dart b/test/parser_feature_test.dart
index d185a14..e5c1d8c 100644
--- a/test/parser_feature_test.dart
+++ b/test/parser_feature_test.dart
@@ -1,7 +1,7 @@
/// Additional feature tests that aren't based on test data.
library parser_feature_test;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:html/dom.dart';
import 'package:html/parser.dart';
import 'package:html/src/constants.dart';
diff --git a/test/parser_test.dart b/test/parser_test.dart
index 516a0f4..20c26eb 100644
--- a/test/parser_test.dart
+++ b/test/parser_test.dart
@@ -3,7 +3,7 @@
import 'dart:convert';
import 'dart:io';
import 'package:path/path.dart' as pathos;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:html/dom.dart';
import 'package:html/parser.dart';
import 'package:html/parser_console.dart' as parser_console;
diff --git a/test/run_all.dart b/test/run_all.dart
index d2bf9ce..b050609 100644
--- a/test/run_all.dart
+++ b/test/run_all.dart
@@ -5,8 +5,7 @@
library test.run_all;
-import 'package:unittest/compact_vm_config.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'dom_test.dart' as dom_test;
import 'parser_feature_test.dart' as parser_feature_test;
@@ -15,7 +14,6 @@
main(List<String> args) {
var pattern = new RegExp(args.length > 0 ? args[0] : '.');
- useCompactVMConfiguration();
void addGroup(testFile, void testMain()) {
if (pattern.hasMatch(testFile)) {
diff --git a/test/selectors/level1_baseline_test.dart b/test/selectors/level1_baseline_test.dart
index e052843..bef290c 100644
--- a/test/selectors/level1_baseline_test.dart
+++ b/test/selectors/level1_baseline_test.dart
@@ -8,12 +8,14 @@
import 'dart:io';
import 'package:html/dom.dart';
import 'package:html/parser.dart';
-import 'package:unittest/unittest.dart';
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
import 'level1_lib.dart' hide test;
import 'selectors.dart';
+import '../support.dart';
Document getTestContentDocument() {
- var testPath = Platform.script.resolve('level1-content.html').toFilePath();
+ var testPath = p.join(testDir, 'selectors', 'level1-content.html');
return parse(new File(testPath).readAsStringSync());
}
diff --git a/test/selectors/level1_lib.dart b/test/selectors/level1_lib.dart
index 34b7c75..0bf08f6 100644
--- a/test/selectors/level1_lib.dart
+++ b/test/selectors/level1_lib.dart
@@ -10,7 +10,7 @@
library html.test.selectors.level1_lib;
import 'package:html/dom.dart';
-import 'package:unittest/unittest.dart' as unittest;
+import 'package:test/test.dart' as unittest;
Document doc;
diff --git a/test/support.dart b/test/support.dart
index 1bb2550..f467faa 100644
--- a/test/support.dart
+++ b/test/support.dart
@@ -3,7 +3,8 @@
import 'dart:io';
import 'dart:collection';
-import 'package:path/path.dart' as path;
+
+import 'package:path/path.dart' as p;
import 'package:html/src/treebuilder.dart';
import 'package:html/dom.dart';
import 'package:html/dom_parsing.dart';
@@ -19,10 +20,12 @@
return _treeTypes;
}
-final testDataDir = Platform.script.resolve('data').toFilePath();
+final testDir = p.join(p.dirname(p.fromUri(Platform.packageConfig)), 'test');
+
+final testDataDir = p.join(testDir, 'data');
Iterable<String> getDataFiles(String subdirectory) {
- var dir = new Directory(path.join(testDataDir, subdirectory));
+ var dir = new Directory(p.join(testDataDir, subdirectory));
return dir.listSync().where((f) => f is File).map((f) => f.path);
}
diff --git a/test/tokenizer_test.dart b/test/tokenizer_test.dart
index bdac1fd..a8543ff 100644
--- a/test/tokenizer_test.dart
+++ b/test/tokenizer_test.dart
@@ -5,7 +5,7 @@
import 'dart:io';
import 'dart:mirrors';
import 'package:path/path.dart' as pathos;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:html/src/char_encodings.dart';
import 'package:html/src/token.dart';
import 'package:html/src/tokenizer.dart';
