pkg/unittest: dartfmt

[email protected]

Review URL: https://codereview.chromium.org//208593004

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@34268 260f80e4-7a28-3924-810f-c04153c831b5

Author: kevmoo

pkg/unittest/lib/html_individual_config.dart

@@ -28,8 +28,8 @@ class HtmlIndividualConfiguration extends htmlconfig.HtmlConfiguration {
           .where((p) => p.startsWith('group='))
           .toList();
 
-      if(!groups.isEmpty) {
-        if(groups.length > 1) {
+      if (!groups.isEmpty) {
+        if (groups.length > 1) {
           throw new ArgumentError('More than one "group" parameter provided.');
         }
 

pkg/unittest/lib/src/core_matchers.dart

@@ -21,8 +21,7 @@ class _Empty extends Matcher {
       return false;
     }
   }
-  Description describe(Description description) =>
-      description.add('empty');
+  Description describe(Description description) => description.add('empty');
 }
 
 /** A matcher that matches any null value. */
@@ -34,15 +33,13 @@ const Matcher isNotNull = const _IsNotNull();
 class _IsNull extends Matcher {
   const _IsNull();
   bool matches(item, Map matchState) => item == null;
-  Description describe(Description description) =>
-      description.add('null');
+  Description describe(Description description) => description.add('null');
 }
 
 class _IsNotNull extends Matcher {
   const _IsNotNull();
   bool matches(item, Map matchState) => item != null;
-  Description describe(Description description) =>
-      description.add('not null');
+  Description describe(Description description) => description.add('not null');
 }
 
 /** A matcher that matches the Boolean value true. */
@@ -54,15 +51,13 @@ const Matcher isFalse = const _IsFalse();
 class _IsTrue extends Matcher {
   const _IsTrue();
   bool matches(item, Map matchState) => item == true;
-  Description describe(Description description) =>
-      description.add('true');
+  Description describe(Description description) => description.add('true');
 }
 
 class _IsFalse extends Matcher {
   const _IsFalse();
   bool matches(item, Map matchState) => item == false;
-  Description describe(Description description) =>
-      description.add('false');
+  Description describe(Description description) => description.add('false');
 }
 
 /**
@@ -101,15 +96,15 @@ class _DeepMatcher extends Matcher {
   final int _limit;
   var count;
 
-  _DeepMatcher(this._expected, [limit = 1000]) : this._limit = limit;
+  _DeepMatcher(this._expected, [limit = 1000]): this._limit = limit;
 
   // Returns a pair (reason, location)
   List _compareIterables(expected, actual, matcher, depth, location) {
     if (actual is! Iterable) return ['is not Iterable', location];
 
     var expectedIterator = expected.iterator;
     var actualIterator = actual.iterator;
-    for (var index = 0;; index++) {
+    for (var index = 0; ; index++) {
       // Advance in lockstep.
       var expectedNext = expectedIterator.moveNext();
       var actualNext = actualIterator.moveNext();
@@ -324,8 +319,7 @@ const Matcher anything = const _IsAnything();
 class _IsAnything extends Matcher {
   const _IsAnything();
   bool matches(item, Map matchState) => true;
-  Description describe(Description description) =>
-      description.add('anything');
+  Description describe(Description description) => description.add('anything');
 }
 
 /**
@@ -352,7 +346,7 @@ class _IsAnything extends Matcher {
  */
 class isInstanceOf<T> extends Matcher {
   final String _name;
-  const isInstanceOf([name = 'specified type']) : this._name = name;
+  const isInstanceOf([name = 'specified type']): this._name = name;
   bool matches(obj, Map matchState) => obj is T;
   // The description here is lame :-(
   Description describe(Description description) =>
@@ -405,8 +399,7 @@ const Matcher returnsNormally = const _ReturnsNormally();
 class Throws extends Matcher {
   final Matcher _matcher;
 
-  const Throws([Matcher matcher]) :
-    this._matcher = matcher;
+  const Throws([Matcher matcher]): this._matcher = matcher;
 
   bool matches(item, Map matchState) {
     if (item is! Function && item is! Future) return false;
@@ -523,19 +516,17 @@ class _ReturnsNormally extends Matcher {
 abstract class TypeMatcher extends Matcher {
   final String _name;
   const TypeMatcher(this._name);
-  Description describe(Description description) =>
-      description.add(_name);
+  Description describe(Description description) => description.add(_name);
 }
 
 /** A matcher for FormatExceptions. */
 const isFormatException = const _FormatException();
 
 /** A matcher for functions that throw FormatException. */
-const Matcher throwsFormatException =
-    const Throws(isFormatException);
+const Matcher throwsFormatException = const Throws(isFormatException);
 
 class _FormatException extends TypeMatcher {
-  const _FormatException() : super("FormatException");
+  const _FormatException(): super("FormatException");
   bool matches(item, Map matchState) => item is FormatException;
 }
 
@@ -546,55 +537,51 @@ const isException = const _Exception();
 const Matcher throwsException = const Throws(isException);
 
 class _Exception extends TypeMatcher {
-  const _Exception() : super("Exception");
+  const _Exception(): super("Exception");
   bool matches(item, Map matchState) => item is Exception;
 }
 
 /** A matcher for ArgumentErrors. */
 const isArgumentError = const _ArgumentError();
 
 /** A matcher for functions that throw ArgumentError. */
-const Matcher throwsArgumentError =
-    const Throws(isArgumentError);
+const Matcher throwsArgumentError = const Throws(isArgumentError);
 
 class _ArgumentError extends TypeMatcher {
-  const _ArgumentError() : super("ArgumentError");
+  const _ArgumentError(): super("ArgumentError");
   bool matches(item, Map matchState) => item is ArgumentError;
 }
 
 /** A matcher for RangeErrors. */
 const isRangeError = const _RangeError();
 
 /** A matcher for functions that throw RangeError. */
-const Matcher throwsRangeError =
-    const Throws(isRangeError);
+const Matcher throwsRangeError = const Throws(isRangeError);
 
 class _RangeError extends TypeMatcher {
-  const _RangeError() : super("RangeError");
+  const _RangeError(): super("RangeError");
   bool matches(item, Map matchState) => item is RangeError;
 }
 
 /** A matcher for NoSuchMethodErrors. */
 const isNoSuchMethodError = const _NoSuchMethodError();
 
 /** A matcher for functions that throw NoSuchMethodError. */
-const Matcher throwsNoSuchMethodError =
-    const Throws(isNoSuchMethodError);
+const Matcher throwsNoSuchMethodError = const Throws(isNoSuchMethodError);
 
 class _NoSuchMethodError extends TypeMatcher {
-  const _NoSuchMethodError() : super("NoSuchMethodError");
+  const _NoSuchMethodError(): super("NoSuchMethodError");
   bool matches(item, Map matchState) => item is NoSuchMethodError;
 }
 
 /** A matcher for UnimplementedErrors. */
 const isUnimplementedError = const _UnimplementedError();
 
 /** A matcher for functions that throw Exception. */
-const Matcher throwsUnimplementedError =
-    const Throws(isUnimplementedError);
+const Matcher throwsUnimplementedError = const Throws(isUnimplementedError);
 
 class _UnimplementedError extends TypeMatcher {
-  const _UnimplementedError() : super("UnimplementedError");
+  const _UnimplementedError(): super("UnimplementedError");
   bool matches(item, Map matchState) => item is UnimplementedError;
 }
 
@@ -605,44 +592,40 @@ const isUnsupportedError = const _UnsupportedError();
 const Matcher throwsUnsupportedError = const Throws(isUnsupportedError);
 
 class _UnsupportedError extends TypeMatcher {
-  const _UnsupportedError() :
-      super("UnsupportedError");
+  const _UnsupportedError(): super("UnsupportedError");
   bool matches(item, Map matchState) => item is UnsupportedError;
 }
 
 /** A matcher for StateErrors. */
 const isStateError = const _StateError();
 
 /** A matcher for functions that throw StateError. */
-const Matcher throwsStateError =
-    const Throws(isStateError);
+const Matcher throwsStateError = const Throws(isStateError);
 
 class _StateError extends TypeMatcher {
-  const _StateError() : super("StateError");
+  const _StateError(): super("StateError");
   bool matches(item, Map matchState) => item is StateError;
 }
 
 /** A matcher for FallThroughError. */
 const isFallThroughError = const _FallThroughError();
 
 /** A matcher for functions that throw FallThroughError. */
-const Matcher throwsFallThroughError =
-    const Throws(isFallThroughError);
+const Matcher throwsFallThroughError = const Throws(isFallThroughError);
 
 class _FallThroughError extends TypeMatcher {
-  const _FallThroughError() : super("FallThroughError");
+  const _FallThroughError(): super("FallThroughError");
   bool matches(item, Map matchState) => item is FallThroughError;
 }
 
 /** A matcher for NullThrownError. */
 const isNullThrownError = const _NullThrownError();
 
 /** A matcher for functions that throw NullThrownError. */
-const Matcher throwsNullThrownError =
-    const Throws(isNullThrownError);
+const Matcher throwsNullThrownError = const Throws(isNullThrownError);
 
 class _NullThrownError extends TypeMatcher {
-  const _NullThrownError() : super("NullThrownError");
+  const _NullThrownError(): super("NullThrownError");
   bool matches(item, Map matchState) => item is NullThrownError;
 }
 
@@ -654,7 +637,7 @@ const Matcher throwsConcurrentModificationError =
     const Throws(isConcurrentModificationError);
 
 class _ConcurrentModificationError extends TypeMatcher {
-  const _ConcurrentModificationError() : super("ConcurrentModificationError");
+  const _ConcurrentModificationError(): super("ConcurrentModificationError");
   bool matches(item, Map matchState) => item is ConcurrentModificationError;
 }
 
@@ -680,36 +663,35 @@ const Matcher throwsCyclicInitializationError =
     const Throws(isCyclicInitializationError);
 
 class _CyclicInitializationError extends TypeMatcher {
-  const _CyclicInitializationError() : super("CyclicInitializationError");
+  const _CyclicInitializationError(): super("CyclicInitializationError");
   bool matches(item, Map matchState) => item is CyclicInitializationError;
 }
 
 /** A matcher for Map types. */
 const isMap = const _IsMap();
 
 class _IsMap extends TypeMatcher {
-  const _IsMap() : super("Map");
+  const _IsMap(): super("Map");
   bool matches(item, Map matchState) => item is Map;
 }
 
 /** A matcher for List types. */
 const isList = const _IsList();
 
 class _IsList extends TypeMatcher {
-  const _IsList() : super("List");
+  const _IsList(): super("List");
   bool matches(item, Map matchState) => item is List;
 }
 
 /**
  * Returns a matcher that matches if an object has a length property
  * that matches [matcher].
  */
-Matcher hasLength(matcher) =>
-    new _HasLength(wrapMatcher(matcher));
+Matcher hasLength(matcher) => new _HasLength(wrapMatcher(matcher));
 
 class _HasLength extends Matcher {
   final Matcher _matcher;
-  const _HasLength([Matcher matcher = null]) : this._matcher = matcher;
+  const _HasLength([Matcher matcher = null]): this._matcher = matcher;
 
   bool matches(item, Map matchState) {
     try {
@@ -820,7 +802,7 @@ class _In extends Matcher {
  *
  *     expect(v, predicate((x) => ((x % 2) == 0), "is even"))
  */
-Matcher predicate(Function f, [description ='satisfies function']) =>
+Matcher predicate(Function f, [description = 'satisfies function']) =>
     new _Predicate(f, description);
 
 class _Predicate extends Matcher {

pkg/unittest/lib/src/interfaces.dart

@@ -41,8 +41,7 @@ abstract class Description {
    * This is used to add a description of an [Iterable] [list],
    * with appropriate [start] and [end] markers and inter-element [separator].
    */
-  Description addAll(String start, String separator, String end,
-                     Iterable list);
+  Description addAll(String start, String separator, String end, Iterable list);
 }
 
 /**

pkg/unittest/lib/src/iterable_matchers.dart

@@ -156,8 +156,7 @@ abstract class _IterableMatcher extends Matcher {
  *
  *  Note that this is `O(n^2)` and so should only be used on small objects.
  */
-Matcher unorderedMatches(Iterable expected) =>
-    new _UnorderedMatches(expected);
+Matcher unorderedMatches(Iterable expected) => new _UnorderedMatches(expected);
 
 class _UnorderedMatches extends Matcher {
   final List<Matcher> _expected;
@@ -166,7 +165,7 @@ class _UnorderedMatches extends Matcher {
       : _expected = expected.map(wrapMatcher).toList();
 
   String _test(item) {
-    if (item is !Iterable) return 'not iterable';
+    if (item is! Iterable) return 'not iterable';
     item = item.toList();
 
     // Check the lengths are the same.

pkg/unittest/lib/src/operator_matchers.dart

@@ -14,8 +14,7 @@ class _IsNot extends Matcher {
 
   const _IsNot(Matcher this._matcher);
 
-  bool matches(item, Map matchState) =>
-      !_matcher.matches(item, matchState);
+  bool matches(item, Map matchState) => !_matcher.matches(item, matchState);
 
   Description describe(Description description) =>
     description.add('not ').addDescriptionOf(_matcher);

pkg/unittest/lib/src/simple_configuration.dart

@@ -56,7 +56,7 @@ class SimpleConfiguration extends Configuration {
    * The constructor sets up a failure handler for [expect] that redirects
    * [expect] failures to [onExpectFailure].
    */
-  SimpleConfiguration() : super.blank() {
+  SimpleConfiguration(): super.blank() {
     configureExpectFailureHandler(new _ExpectFailureHandler(this));
   }
 

pkg/unittest/lib/unittest.dart

@@ -269,13 +269,13 @@ void test(String spec, TestFunction body) {
   ensureInitialized();
   if (!_soloTestSeen || _soloNestingLevel > 0) {
     var testcase = new TestCase._internal(testCases.length + 1, _fullSpec(spec),
-                                        body);
+        body);
     _testCases.add(testcase);
   }
 }
 
 /** Convenience function for skipping a test. */
-void skip_test(String spec, TestFunction body){}
+void skip_test(String spec, TestFunction body) {}
 
 /**
  * Creates a new test case with the given description and body. The
@@ -671,8 +671,7 @@ void _ensureInitialized(bool configAutoStart) {
 }
 
 /** Select a solo test by ID. */
-void setSoloTest(int id) =>
-  _testCases.retainWhere((t) => t.id == id);
+void setSoloTest(int id) => _testCases.retainWhere((t) => t.id == id);
 
 /** Enable/disable a test by ID. */
 void _setTestEnabledState(int testId, bool state) {
@@ -713,7 +712,7 @@ bool formatStacks = true;
 bool filterStacks = true;
 
 void _requireNotRunning() {
-  if(_currentTestCaseIndex != -1) {
+  if (_currentTestCaseIndex != -1) {
     throw new StateError('Not allowed when tests are running.');
   }
 }