Use boolean selector syntax for tags.

test/runner/configuration/configuration_test.dart

 // Copyright (c) 2016, 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.
 
 @TestOn("vm")
 
+import 'package:boolean_selector/boolean_selector.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
 import 'package:test/src/backend/test_platform.dart';
 import 'package:test/src/runner/configuration.dart';
 import 'package:test/src/runner/configuration/values.dart';
 import 'package:test/src/util/io.dart';
 
 void main() {
   group("merge", () {
@@ skipping 114 matching lines @@
         expect(merged.pubServeUrl.port, equals(5678));
         expect(merged.pattern, equals("gonk"));
         expect(merged.platforms, equals([TestPlatform.dartium]));
         expect(merged.paths, equals(["blech"]));
       });
     });
 
     group("for tags", () {
       test("if neither is defined, preserves the default", () {
         var merged = new Configuration().merge(new Configuration());
-        expect(merged.includeTags, isEmpty);
-        expect(merged.excludeTags, isEmpty);
+        expect(merged.includeTags, equals(BooleanSelector.all));
+        expect(merged.excludeTags, equals(BooleanSelector.none));
       });
 
       test("if only the old configuration's is defined, uses it", () {
         var merged = new Configuration(
-                includeTags: ["foo", "bar"],
-                excludeTags: ["baz", "bang"])
+                includeTags: new BooleanSelector.parse("foo || bar"),
+                excludeTags: new BooleanSelector.parse("baz || bang"))
             .merge(new Configuration());
 
-        expect(merged.includeTags, unorderedEquals(["foo", "bar"]));
-        expect(merged.excludeTags, unorderedEquals(["baz", "bang"]));
+        expect(merged.includeTags,
+            equals(new BooleanSelector.parse("foo || bar")));
+        expect(merged.excludeTags,
+            equals(new BooleanSelector.parse("baz || bang")));
       });
 
       test("if only the new configuration's is defined, uses it", () {
         var merged = new Configuration().merge(new Configuration(
-            includeTags: ["foo", "bar"],
-            excludeTags: ["baz", "bang"]));
+            includeTags: new BooleanSelector.parse("foo || bar"),
+            excludeTags: new BooleanSelector.parse("baz || bang")));
 
-        expect(merged.includeTags, unorderedEquals(["foo", "bar"]));
-        expect(merged.excludeTags, unorderedEquals(["baz", "bang"]));
+        expect(merged.includeTags,
+            equals(new BooleanSelector.parse("foo || bar")));
+        expect(merged.excludeTags,
+            equals(new BooleanSelector.parse("baz || bang")));
       });
 
-      test("if both are defined, unions them", () {
+      test("if both are defined, unions or intersects them", () {
         var older = new Configuration(
-            includeTags: ["foo", "bar"],
-            excludeTags: ["baz", "bang"]);
+            includeTags: new BooleanSelector.parse("foo || bar"),
+            excludeTags: new BooleanSelector.parse("baz || bang"));
         var newer = new Configuration(
-            includeTags: ["bar", "blip"],
-            excludeTags: ["bang", "qux"]);
+            includeTags: new BooleanSelector.parse("blip"),
+            excludeTags: new BooleanSelector.parse("qux"));
         var merged = older.merge(newer);
 
-        expect(merged.includeTags, unorderedEquals(["foo", "bar", "blip"]));
-        expect(merged.excludeTags, unorderedEquals(["baz", "bang", "qux"]));
+        expect(merged.includeTags,
+            equals(new BooleanSelector.parse("(foo || bar) && blip")));
+        expect(merged.excludeTags,
+            equals(new BooleanSelector.parse("(baz || bang) || qux")));
       });
     });
 
     group("for timeout", () {
       test("if neither is defined, preserves the default", () {
         var merged = new Configuration().merge(new Configuration());
         expect(merged.timeout, equals(new Timeout.factor(1)));
       });
 
       test("if only the old configuration's is defined, uses it", () {
@@ skipping 19 matching lines @@
         var older = new Configuration(
             timeout: new Timeout(new Duration(seconds: 1)));
         var newer = new Configuration(
             timeout: new Timeout(new Duration(seconds: 2)));
         var merged = older.merge(newer);
         expect(merged.timeout, equals(new Timeout(new Duration(seconds: 2))));
       });
     });
   });
 }