use pkg/test and allow latest version of logging pkg
R=jakemac@google.com
Review URL: https://codereview.chromium.org//1131243005
diff --git a/pubspec.yaml b/pubspec.yaml
index 5ef264a..7d3c6dd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: csslib
-version: 0.12.0
+version: 0.12.1-dev
author: Polymer.dart Team <web-ui-dev@dartlang.org>
description: A library for parsing CSS.
homepage: https://github.com/dart-lang/csslib
@@ -7,9 +7,9 @@
sdk: '>=1.1.0 <2.0.0'
dependencies:
args: '>=0.9.0 <0.14.0'
- logging: '>=0.9.0 <0.10.0'
+ logging: '>=0.9.0 <0.12.0'
path: '>=0.9.0 <2.0.0'
source_span: '>=1.0.0 <2.0.0'
dev_dependencies:
browser: '>=0.9.0 <0.11.0'
- unittest: '>=0.9.0 <0.12.0'
+ test: '>=0.12.0 <0.13.0'
diff --git a/test/big_1_test.dart b/test/big_1_test.dart
index 5f38ba0..f92ea82 100644
--- a/test/big_1_test.dart
+++ b/test/big_1_test.dart
@@ -4,7 +4,7 @@
library big_1_test;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'testing.dart';
compilePolyfillAndValidate(String input, String generated) {
diff --git a/test/compiler_test.dart b/test/compiler_test.dart
index 5d5dcf5..88b7a2d 100644
--- a/test/compiler_test.dart
+++ b/test/compiler_test.dart
@@ -5,7 +5,7 @@
library compiler_test;
import 'dart:convert';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:csslib/parser.dart';
import 'package:csslib/visitor.dart';
import 'testing.dart';
diff --git a/test/debug_test.dart b/test/debug_test.dart
index 6cfea56..94898eb 100644
--- a/test/debug_test.dart
+++ b/test/debug_test.dart
@@ -1,6 +1,6 @@
library debug;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'testing.dart';
void main() {
diff --git a/test/declaration_test.dart b/test/declaration_test.dart
index f01b804..8326a03 100644
--- a/test/declaration_test.dart
+++ b/test/declaration_test.dart
@@ -4,7 +4,8 @@
library declaration_test;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
+
import 'testing.dart';
void testSimpleTerms() {
@@ -342,7 +343,7 @@
expect(prettyPrint(stylesheet), generated);
input = '''
- @media handheld and (min-width: 20em),
+ @media handheld and (min-width: 20em),
screen and (min-width: 20em) {
#id { color: red; }
.myclass { height: 20px; }
@@ -751,8 +752,8 @@
Filter: FlipV;
Filter: Gray;
FILTER: Chroma(Color = #000000) Mask(Color=#00FF00);
- Filter: Alpha(Opacity=100, FinishOpacity=0, Style=2, StartX=20, StartY=40,
- FinishX=0, FinishY=0) Wave(Add=0, Freq=5, LightStrength=20,
+ Filter: Alpha(Opacity=100, FinishOpacity=0, Style=2, StartX=20, StartY=40,
+ FinishX=0, FinishY=0) Wave(Add=0, Freq=5, LightStrength=20,
Phase=220, Strength=10);
}
''';
@@ -762,8 +763,8 @@
' Filter: FlipV;\n Filter: Gray;\n'
' FILTER: Chroma(Color = #000000) Mask(Color=#00FF00);\n'
' Filter: Alpha(Opacity=100, FinishOpacity=0, Style=2, '
- 'StartX=20, StartY=40, \n'
- ' FinishX=0, FinishY=0) Wave(Add=0, Freq=5, LightStrength=20, \n'
+ 'StartX=20, StartY=40,\n'
+ ' FinishX=0, FinishY=0) Wave(Add=0, Freq=5, LightStrength=20,\n'
' Phase=220, Strength=10);\n}';
stylesheet = parseCss(input3, errors: errors..clear(), opts: simpleOptions);
diff --git a/test/error_test.dart b/test/error_test.dart
index 71890cc..fc9ecf6 100644
--- a/test/error_test.dart
+++ b/test/error_test.dart
@@ -4,9 +4,10 @@
library error_test;
-import 'package:unittest/unittest.dart';
-import 'testing.dart';
import 'package:csslib/src/messages.dart';
+import 'package:test/test.dart';
+
+import 'testing.dart';
/**
* Test for unsupported font-weights values of bolder, lighter and inherit.
diff --git a/test/extend_test.dart b/test/extend_test.dart
index 94d9e7b..49c8a9c 100644
--- a/test/extend_test.dart
+++ b/test/extend_test.dart
@@ -4,7 +4,8 @@
library extend_test;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
+
import 'testing.dart';
compileAndValidate(String input, String generated) {
diff --git a/test/mixin_test.dart b/test/mixin_test.dart
index 937ed44..c94c9c0 100644
--- a/test/mixin_test.dart
+++ b/test/mixin_test.dart
@@ -4,7 +4,8 @@
library mixin_test;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
+
import 'testing.dart';
compileAndValidate(String input, String generated) {
diff --git a/test/nested_test.dart b/test/nested_test.dart
index db25679..797ac5f 100644
--- a/test/nested_test.dart
+++ b/test/nested_test.dart
@@ -4,7 +4,8 @@
library nested_test;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
+
import 'testing.dart';
compileAndValidate(String input, String generated) {
@@ -413,7 +414,7 @@
.textLink {
color: fooL1;
&:hover { color: barL1;}
- }
+ }
.picLink {
background-image: url(/fooL1.jpg);
&:hover { background-image: url(/barL1.jpg);}
@@ -423,7 +424,7 @@
background-image: url(/fooL2.jpg);
&:hover { color: barL2; background-image: url(/barL2.jpg);}
}
- }
+ }
}''';
final generated1 = r'''.light {
@@ -456,11 +457,11 @@
.light .leftCol & {
color: fooL1;
&:hover { color: barL1; }
- }
+ }
.light .rightCol & {
color: fooL3;
&:hover { color: barL3; }
- }
+ }
}''';
final generated2 = r'''
diff --git a/test/run.sh b/test/run.sh
deleted file mode 100755
index 7d26209..0000000
--- a/test/run.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Usage: call directly in the commandline as test/run.sh ensuring that you have
-# 'dart' in your path. Filter tests by passing a pattern as an argument to this
-# script.
-
-# TODO(sigmund): replace with a real test runner
-
-# bail on error
-set -e
-
-# print commands executed by this script
-# set -x
-
-DIR=$( cd $( dirname "${BASH_SOURCE[0]}" ) && pwd )
-DART_FLAGS="--checked"
-TEST_PATTERN=$1
-
-if [[ ($TEST_PATTERN == "") ]]; then
- # Note: dart_analyzer needs to be run from the root directory for proper path
- # canonicalization.
- pushd $DIR/.. &>/dev/null
- echo Analyzing compiler for warnings or type errors
- dartanalyzer --fatal-warnings --fatal-type-errors bin/css.dart
- popd &>/dev/null
-fi
-
-pushd $DIR &>/dev/null
-if [[ ($TEST_PATTERN == "canary") || ($TEST_PATTERN = "") ]]; then
- dart $DART_FLAGS run_all.dart
-else
- dart $DART_FLAGS run_all.dart $TEST_PATTERN
-fi
-popd &>/dev/null
-
-echo All tests completed.
diff --git a/test/run_all.dart b/test/run_all.dart
deleted file mode 100644
index 36020cd..0000000
--- a/test/run_all.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-/**
- * This is a helper for run.sh. We try to run all of the Dart code in one
- * instance of the Dart VM to reduce warm-up time.
- */
-library run_impl;
-
-import 'package:unittest/compact_vm_config.dart';
-import 'testing.dart';
-
-import 'big_1_test.dart' as big_1_test;
-import 'compiler_test.dart' as compiler_test;
-import 'declaration_test.dart' as declaration_test;
-import 'debug_test.dart' as debug_test;
-import 'error_test.dart' as error_test;
-import 'extend_test.dart' as extend_test;
-import 'mixin_test.dart' as mixin_test;
-import 'nested_test.dart' as nested_test;
-import 'selector_test.dart' as selector_test;
-import 'var_test.dart' as var_test;
-import 'visitor_test.dart' as visitor_test;
-
-void main(List<String> arguments) {
- var pattern = new RegExp(arguments.length > 0 ? arguments[0] : '.');
-
- useCompactVMConfiguration();
- useMockMessages();
-
- if (pattern.hasMatch('debug_test.dart')) debug_test.main();
- if (pattern.hasMatch('compiler_test.dart')) compiler_test.main();
- if (pattern.hasMatch('declaration_test.dart')) declaration_test.main();
- if (pattern.hasMatch('var_test.dart')) var_test.main();
- if (pattern.hasMatch('nested_test.dart')) nested_test.main();
- if (pattern.hasMatch('selector_test.dart')) selector_test.main();
- if (pattern.hasMatch('mixin_test.dart')) mixin_test.main();
- if (pattern.hasMatch('extend_test.dart')) extend_test.main();
- if (pattern.hasMatch('big_1_test.dart')) big_1_test.main();
- if (pattern.hasMatch('visitor_test.dart')) visitor_test.main();
- if (pattern.hasMatch('error_test.dart')) error_test.main();
-}
diff --git a/test/selector_test.dart b/test/selector_test.dart
index 5d687e6..aefab16 100644
--- a/test/selector_test.dart
+++ b/test/selector_test.dart
@@ -4,9 +4,10 @@
library selector_test;
-import 'package:unittest/unittest.dart';
-import 'testing.dart';
import 'package:csslib/parser.dart';
+import 'package:test/test.dart';
+
+import 'testing.dart';
void testSelectorSuccesses() {
var errors = [];
diff --git a/test/testing.dart b/test/testing.dart
index df65532..de2aab1 100644
--- a/test/testing.dart
+++ b/test/testing.dart
@@ -24,10 +24,6 @@
const options = const PreprocessorOptions(
useColors: false, warningsAsErrors: true, inputFile: 'memory');
-void useMockMessages() {
- messages = new Messages(printHandler: (message) {});
-}
-
/**
* Spin-up CSS parser in checked mode to detect any problematic CSS. Normally,
* CSS will allow any property/value pairs regardless of validity; all of our
diff --git a/test/var_test.dart b/test/var_test.dart
index 657459d..3972023 100644
--- a/test/var_test.dart
+++ b/test/var_test.dart
@@ -4,7 +4,8 @@
library var_test;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
+
import 'testing.dart';
compileAndValidate(String input, String generated) {
diff --git a/test/visitor_test.dart b/test/visitor_test.dart
index e7102de..803b106 100644
--- a/test/visitor_test.dart
+++ b/test/visitor_test.dart
@@ -4,8 +4,9 @@
library visitor_test;
-import 'package:unittest/unittest.dart';
import 'package:csslib/visitor.dart';
+import 'package:test/test.dart';
+
import 'testing.dart';
class ClassVisitor extends Visitor {
