Revert "Make unittest follow the new package layout."

pkg/unittest/test/mock_test.dart

 // 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.
 
 #library('unittestTest');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 
 class MockList extends Mock implements List {
 }
 
 class Foo {
   sum(a, b, c) => a + b + c;
 }
 
 class FooSpy extends Mock implements Foo {
   Foo real;
@@ skipping 142 matching lines @@
     expect(m.bar(1), 2);
     expect(m.bar(2), 4);
     m.getLogs(callsTo()).verify(happenedExactly(4));
     m.getLogs(callsTo(null, 1)).verify(happenedExactly(2));
     m.getLogs(callsTo(null, 2)).verify(happenedExactly(2));
     m.getLogs(null, returning(1)).verify(neverHappened);
     m.getLogs(null, returning(2)).verify(happenedExactly(2));
     m.getLogs(null, returning(4)).verify(happenedExactly(2));
   });
 
-  test('Mocking: RegExp CallMatcher good', () {
-    var m = new Mock();
-    m.when(callsTo(matches('^[A-Z]'))).
-           alwaysThrow('Method names must start with lower case.');
-    m.test();
+  test('Mocking: RegExp CallMatcher good', () { 
+    var m = new Mock(); 
+    m.when(callsTo(matches('^[A-Z]'))). 
+           alwaysThrow('Method names must start with lower case.');     
+    m.test();   
   });
 
   test('Mocking: No logging', () {
     var m = new Mock.custom(enableLogging:false);
     m.Test();
     expect(() => m.getLogs(callsTo('Test')), throwsA((e) => e.toString() ==
         "Exception: Can't retrieve logs when logging was never enabled."));
   });
 
   test('Mocking: Find logList entry', () {
@@ skipping 409 matching lines @@
     for (var i = 0; i < 10; i++) {
       LogEntry e = new LogEntry(null, 'foo', [i], Action.IGNORE);
       logList.add(e);
     }
     int total = 0;
     logList.stepwiseValidate((log, pos) {
         total += log[pos].args[0] * log[pos + 1].args[0];
         expect(log[pos + 1].args[0] - log[pos].args[0], equals(1));
         return 2;
     });
-    expect(total, equals((0 * 1) + (2 * 3) + (4 * 5) + (6 * 7) + (8 * 9)));
+    expect(total, equals((0 * 1) + (2 * 3) + (4 * 5) + (6 * 7) + (8 * 9))); 
   });
 
   test('Mocking: clearLogs', () {
     var m = new Mock();
     m.foo();
     m.foo();
     m.foo();
     expect(m.log.logs, hasLength(3));
     m.clearLogs();
     expect(m.log.logs, hasLength(0));
@@ skipping 13 matching lines @@
     expect(log.logs, hasLength(6));
     expect(log.logs.every((e) => e.mockName == 'm2' || e.mockName == 'm3'),
         isTrue);
     m2.clearLogs();
     expect(log.logs, hasLength(3));
     expect(log.logs.every((e) => e.mockName =='m3'), isTrue);
     m3.clearLogs();
     expect(log.logs, hasLength(0));
   });
 }