Add names and plain_names fields.

lib/src/runner/configuration.dart

 // Copyright (c) 2015, 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.
 
 import 'dart:io';
 
 import 'package:boolean_selector/boolean_selector.dart';
 import 'package:collection/collection.dart';
 import 'package:glob/glob.dart';
 import 'package:path/path.dart' as p;
@@ skipping 87 matching lines @@
 
   /// Whether the load paths were passed explicitly or the default was used.
   bool get explicitPaths => _paths != null;
 
   /// The glob matching the basename of tests to run.
   ///
   /// This is used to find tests within a directory.
   Glob get filename => _filename ?? defaultFilename;
   final Glob _filename;
 
-  /// The pattern to match against test names to decide which to run, or `null`
+  /// The patterns to match against test names to decide which to run, or `null`
   /// if all tests should be run.
-  final Pattern pattern;
+  ///
+  /// All patterns must match in order for a test to be run.
+  final Set<Pattern> patterns;
 
   /// The set of platforms on which to run tests.
   List<TestPlatform> get platforms => _platforms ?? [TestPlatform.vm];
   final List<TestPlatform> _platforms;
 
   /// The set of presets to use.
   ///
   /// Any chosen presets for the parent configuration are added to the chosen
   /// preset sets for child configurations as well.
   ///
@@ skipping 116 matching lines @@
       bool skip,
       String skipReason,
       PlatformSelector testOn,
       bool pauseAfterLoad,
       bool color,
       String packageRoot,
       String reporter,
       int pubServePort,
       int concurrency,
       Timeout timeout,
-      Pattern pattern,
+      Iterable<Pattern> patterns,
       Iterable<TestPlatform> platforms,
       Iterable<String> paths,
       Glob filename,
       Iterable<String> chosenPresets,
       BooleanSelector includeTags,
       BooleanSelector excludeTags,
       Iterable addTags,
       Map<BooleanSelector, Configuration> tags,
       Map<PlatformSelector, Configuration> onPlatform,
       Map<String, Configuration> presets}) {
     _unresolved() => new Configuration._(
         help: help,
         version: version,
         verboseTrace: verboseTrace,
         jsTrace: jsTrace,
         skip: skip,
         skipReason: skipReason,
         testOn: testOn,
         pauseAfterLoad: pauseAfterLoad,
         color: color,
         packageRoot: packageRoot,
         reporter: reporter,
         pubServePort: pubServePort,
         concurrency: concurrency,
         timeout: timeout,
-        pattern: pattern,
+        patterns: patterns,
         platforms: platforms,
         paths: paths,
         filename: filename,
         chosenPresets: chosenPresets,
         includeTags: includeTags,
         excludeTags: excludeTags,
         addTags: addTags,
 
         // Make sure we pass [chosenPresets] to the child configurations as
         // well. This ensures that 
@@ skipping 43 matching lines @@
           bool skip,
           this.skipReason,
           PlatformSelector testOn,
           bool pauseAfterLoad,
           bool color,
           String packageRoot,
           String reporter,
           int pubServePort,
           int concurrency,
           Timeout timeout,
-          this.pattern,
+          Iterable<Pattern> patterns,
           Iterable<TestPlatform> platforms,
           Iterable<String> paths,
           Glob filename,
           Iterable<String> chosenPresets,
           BooleanSelector includeTags,
           BooleanSelector excludeTags,
           Iterable addTags,
           Map<BooleanSelector, Configuration> tags,
           Map<PlatformSelector, Configuration> onPlatform,
           Map<String, Configuration> presets})
       : _help = help,
         _version = version,
         _verboseTrace = verboseTrace,
         _jsTrace = jsTrace,
         _skip = skip,
         testOn = testOn ?? PlatformSelector.all,
         _pauseAfterLoad = pauseAfterLoad,
         _color = color,
         _packageRoot = packageRoot,
         _reporter = reporter,
         pubServeUrl = pubServePort == null
             ? null
             : Uri.parse("http://localhost:$pubServePort"),
         _concurrency = concurrency,
         timeout = (pauseAfterLoad ?? false)
             ? Timeout.none
             : (timeout == null ? new Timeout.factor(1) : timeout),
+        patterns = new UnmodifiableSetView(patterns?.toSet() ?? new Set()),
         _platforms = _list(platforms),
         _paths = _list(paths),
         _filename = filename,
-        chosenPresets = new Set.from(chosenPresets ?? []),
+        chosenPresets = new UnmodifiableSetView(
+            chosenPresets?.toSet() ?? new Set()),
         includeTags = includeTags ?? BooleanSelector.all,
         excludeTags = excludeTags ?? BooleanSelector.none,
         addTags = new UnmodifiableSetView(addTags?.toSet() ?? new Set()),
         tags = _map(tags),
         onPlatform = _map(onPlatform),
         presets = _map(presets) {
     if (_filename != null && _filename.context.style != p.style) {
       throw new ArgumentError(
           "filename's context must match the current operating system, was "
               "${_filename.context.style}.");
@@ skipping 34 matching lines @@
         skip: other._skip ?? _skip,
         skipReason: other.skipReason ?? skipReason,
         testOn: testOn.intersection(other.testOn),
         pauseAfterLoad: other._pauseAfterLoad ?? _pauseAfterLoad,
         color: other._color ?? _color,
         packageRoot: other._packageRoot ?? _packageRoot,
         reporter: other._reporter ?? _reporter,
         pubServePort: (other.pubServeUrl ?? pubServeUrl)?.port,
         concurrency: other._concurrency ?? _concurrency,
         timeout: timeout.merge(other.timeout),
-        pattern: other.pattern ?? pattern,
+        patterns: patterns.union(other.patterns),
         platforms: other._platforms ?? _platforms,
         paths: other._paths ?? _paths,
         filename: other._filename ?? _filename,
         chosenPresets: chosenPresets.union(other.chosenPresets),
         includeTags: includeTags.intersection(other.includeTags),
         excludeTags: excludeTags.union(other.excludeTags),
         addTags: other.addTags.union(addTags),
         tags: _mergeConfigMaps(tags, other.tags),
         onPlatform: _mergeConfigMaps(onPlatform, other.onPlatform),
         presets: _mergeConfigMaps(presets, other.presets));
@@ skipping 16 matching lines @@
       bool skip,
       String skipReason,
       PlatformSelector testOn,
       bool pauseAfterLoad,
       bool color,
       String packageRoot,
       String reporter,
       int pubServePort,
       int concurrency,
       Timeout timeout,
-      Pattern pattern,
+      Iterable<Pattern> patterns,
       Iterable<TestPlatform> platforms,
       Iterable<String> paths,
       Glob filename,
       Iterable<String> chosenPresets,
       BooleanSelector includeTags,
       BooleanSelector excludeTags,
       Iterable addTags,
       Map<BooleanSelector, Configuration> tags,
       Map<PlatformSelector, Configuration> onPlatform,
       Map<String, Configuration> presets}) {
     return new Configuration(
         help: help ?? _help,
         version: version ?? _version,
         verboseTrace: verboseTrace ?? _verboseTrace,
         jsTrace: jsTrace ?? _jsTrace,
         skip: skip ?? _skip,
         skipReason: skipReason ?? this.skipReason,
         testOn: testOn ?? this.testOn,
         pauseAfterLoad: pauseAfterLoad ?? _pauseAfterLoad,
         color: color ?? _color,
         packageRoot: packageRoot ?? _packageRoot,
         reporter: reporter ?? _reporter,
         pubServePort: pubServePort ?? pubServeUrl?.port,
         concurrency: concurrency ?? _concurrency,
         timeout: timeout ?? this.timeout,
-        pattern: pattern ?? this.pattern,
+        patterns: patterns ?? this.patterns,
         platforms: platforms ?? _platforms,
         paths: paths ?? _paths,
         filename: filename ?? _filename,
         chosenPresets: chosenPresets ?? this.chosenPresets,
         includeTags: includeTags ?? this.includeTags,
         excludeTags: excludeTags ?? this.excludeTags,
         addTags: addTags ?? this.addTags,
         tags: tags ?? this.tags,
         onPlatform: onPlatform ?? this.onPlatform,
         presets: presets ?? this.presets);
   }
 
   /// Merges two maps whose values are [Configuration]s.
   ///
   /// Any overlapping keys in the maps have their configurations merged in the
   /// returned map.
   Map<Object, Configuration> _mergeConfigMaps(Map<Object, Configuration> map1,
           Map<Object, Configuration> map2) =>
       mergeMaps(map1, map2,
           value: (config1, config2) => config1.merge(config2));
 }