Revert "Make unittest follow the new package layout."

This reverts commit 38f7d16f373832a7bf889192af7845cb602aec01.

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

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

pkg/args/test/args_test.dart

@@ -4,8 +4,9 @@
 
 #library('args_test');
 
-// TODO(rnystrom): Use "package:" URL (#4968).
-#import('../../unittest/lib/unittest.dart');
+#import('../../unittest/unittest.dart');
+
+// TODO(rnystrom): Use "package:" URL here when test.dart can handle pub.
 #import('../lib/args.dart');
 
 main() {

pkg/dartdoc/test/dartdoc_test.dart

@@ -8,7 +8,9 @@
 // TODO(rnystrom): Use "package:" URL (#4968).
 #import('../lib/dartdoc.dart', prefix: 'dd');
 #import('../lib/markdown.dart', prefix: 'md');
-#import('../../unittest/lib/unittest.dart');
+
+// TODO(rnystrom): Better path to unittest.
+#import('../../unittest/unittest.dart');
 
 main() {
   group('countOccurrences', () {

pkg/dartdoc/test/markdown_test.dart

@@ -7,7 +7,9 @@
 
 // TODO(rnystrom): Use "package:" URL (#4968).
 #import('../lib/markdown.dart');
-#import('../../unittest/lib/unittest.dart');
+
+// TODO(rnystrom): Better path to unittest.
+#import('../../unittest/unittest.dart');
 
 /// Most of these tests are based on observing how showdown behaves:
 /// http://softwaremaniacs.org/playground/showdown-highlight/

pkg/intl/test/bidi_format_test.dart

@@ -5,9 +5,8 @@
 
 #library('bidi_format_test');
 
-// TODO(rnystrom): Use "package:" URL (#4968).
 #import('../intl.dart');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 
 /**
  * Tests the bidirectional text formatting library.

pkg/intl/test/bidi_utils_test.dart

@@ -5,9 +5,8 @@
 
 #library('bidi_utils_test');
 
-// TODO(rnystrom): Use "package:" URL (#4968).
 #import('../intl.dart');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 
 /**
  * Tests the bidi utilities library.

pkg/intl/test/date_time_format_test_core.dart

@@ -10,9 +10,8 @@
 
 #library('date_time_format_tests');
 
-// TODO(rnystrom): Use "package:" URL (#4968).
 #import('../date_format.dart');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 #import('date_time_format_test_data.dart');
 #import('../intl.dart');
 #import('../lib/date_format_internal.dart');

pkg/intl/test/intl_message_basic_example_test.dart

@@ -7,13 +7,12 @@
  */
 #library('intl_message_test_2');
 
-// TODO(rnystrom): Use "package:" URL (#4968).
 #import('../date_format.dart');
 #import('../date_symbol_data_local.dart');
 #import('../intl.dart');
 #import('../message_lookup_local.dart');
 #import('../example/basic/basic_example.dart');
-#import('../../unittest/lib/unittest.dart');
+#import('../../unittest/unittest.dart');
 
 List list;
 

pkg/intl/test/intl_message_test.dart

@@ -4,9 +4,8 @@
 
 #library('intl_message_test');
 
-// TODO(rnystrom): Use "package:" URL (#4968).
 #import('../intl.dart');
-#import('../../unittest/lib/unittest.dart');
+#import('../../unittest/unittest.dart');
 #import('../message_lookup_local.dart');
 
 /** Tests the MessageFormat library in dart. */

pkg/intl/test/intl_test.dart

@@ -4,9 +4,8 @@
 
 #library('intl_test');
 
-// TODO(rnystrom): Use "package:" URL (#4968).
 #import('../intl.dart');
-#import('../../unittest/lib/unittest.dart');
+#import('../../unittest/unittest.dart');
 #import('../date_symbol_data_local.dart');
 
 main() {

pkg/intl/test/number_format_test.dart

@@ -6,8 +6,7 @@
 
 #library('number_format_test');
 
-// TODO(rnystrom): Use "package:" URL (#4968).
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 #import('../number_format.dart');
 #import('../intl.dart');
 

pkg/logging/test/logging_test.dart

@@ -7,7 +7,7 @@
 
 // TODO(rnystrom): Use "package:" import when test.dart supports it (#4968).
 #import('../lib/logging.dart');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 
 main() {
   test('level comparison is a valid comparator', () {

pkg/unittest/html_config.dart

@@ -10,7 +10,7 @@
 #import('dart:html');
 #import('unittest.dart');
 
-#source('src/html_print.dart');
+#source('html_print.dart');
 
 class HtmlConfiguration extends Configuration {
   /** Whether this is run within dartium layout tests. */

pkg/unittest/test/instance_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('instance_test');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 #source('test_utils.dart');
 
 doesThrow() { throw 'X'; }

pkg/unittest/test/matchers_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('matcherTest');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 #source('test_utils.dart');
 
 doesNotThrow() {}

pkg/unittest/test/mock_regexp_negative_test.dart

@@ -3,13 +3,13 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('unittestTest');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 
 main() {
   test('Mocking: RegExp CallMatcher bad', () {
-    var m = new Mock();
-    m.when(callsTo(matches('^[A-Z]'))).
-           alwaysThrow('Method names must start with lower case.');
-    m.Test();
+    var m = new Mock();           
+    m.when(callsTo(matches('^[A-Z]'))).          
+           alwaysThrow('Method names must start with lower case.');      
+    m.Test();         
   });
 }

pkg/unittest/test/mock_stepwise_negative_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('unittestTest');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 
 main() {
   test('Mocking: stepwiseValidate', () {

pkg/unittest/test/mock_test.dart

@@ -3,7 +3,7 @@
 // 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 {
 }
@@ -166,11 +166,11 @@ main() {
     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', () {
@@ -600,7 +600,7 @@ main() {
         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', () {

pkg/unittest/test/unittest_test.dart

@@ -11,7 +11,7 @@
 
 #library('unittestTest');
 #import('dart:isolate');
-#import('../../../pkg/unittest/lib/unittest.dart');
+#import('../../../pkg/unittest/unittest.dart');
 
 var tests; // array of test names
 var expected; // array of test expected results (from buildStatusString)

pkg/unittest/unittest.dart

@@ -6,7 +6,7 @@
  * A library for writing dart unit tests.
  *
  * To import this library, specify the relative path to
- * pkg/unittest/lib/unittest.dart.
+ * pkg/unittest/unittest.dart.
  *
  * ##Concepts##
  *
@@ -138,20 +138,20 @@
 
 #import('dart:isolate');
 
-#source('src/collection_matchers.dart');
-#source('src/config.dart');
-#source('src/core_matchers.dart');
-#source('src/description.dart');
-#source('src/expect.dart');
-#source('src/future_matchers.dart');
-#source('src/interfaces.dart');
-#source('src/map_matchers.dart');
-#source('src/matcher.dart');
-#source('src/mock.dart');
-#source('src/numeric_matchers.dart');
-#source('src/operator_matchers.dart');
-#source('src/string_matchers.dart');
-#source('src/test_case.dart');
+#source('collection_matchers.dart');
+#source('config.dart');
+#source('core_matchers.dart');
+#source('description.dart');
+#source('expect.dart');
+#source('future_matchers.dart');
+#source('interfaces.dart');
+#source('map_matchers.dart');
+#source('matcher.dart');
+#source('mock.dart');
+#source('numeric_matchers.dart');
+#source('operator_matchers.dart');
+#source('string_matchers.dart');
+#source('test_case.dart');
 
 /** [Configuration] used by the unittest library. */
 Configuration _config = null;

tests/benchmark_smoke/benchmark_smoke_test.dart

@@ -6,13 +6,13 @@
 // Tests that benchmark classes used in perf testing are not broken.
 #import('benchmark_lib.dart');
 #import('dart:html');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 
 void main() {
   useHtmlConfiguration();
 
-  test('performanceTesting', () {
+  test('performanceTesting', () { 
     window.setTimeout(BENCHMARK_SUITE.runBenchmarks, 0);
     window.setTimeout(expectAsync0(testForCompletion), 0);
   });

tests/html/async_window_test.dart

@@ -1,6 +1,6 @@
 #library('AsyncWindowTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/audiocontext_test.dart

@@ -1,6 +1,6 @@
 #library('AudioContextTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/audioelement_test.dart

@@ -1,6 +1,6 @@
 #library('AudioElementTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/b_element_test.dart

@@ -1,6 +1,6 @@
 #library('BElementTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/blob_constructor_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('blob_test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/cache_test.dart

@@ -1,6 +1,6 @@
 #library('CacheTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/callbacks_test.dart

@@ -1,6 +1,6 @@
 #library('CallbacksTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/canvas_pixel_array_type_alias_test.dart

@@ -1,6 +1,6 @@
 #library('CanvasTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // We have aliased the legacy type CanvasPixelArray with the new type

tests/html/canvas_test.dart

@@ -1,6 +1,6 @@
 #library('CanvasTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/canvas_using_html_test.dart

@@ -1,6 +1,6 @@
 #library('CanvasUsingHtmlTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html', prefix: 'html');
 #import('dart:html');
 

tests/html/cross_frame_test.dart

@@ -1,6 +1,6 @@
 #library('CrossFrameTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/css_test.dart

@@ -1,6 +1,6 @@
 #library('CSSTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/cssstyledeclaration_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('CSSStyleDeclarationTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/dart_object_local_storage_test.dart

@@ -1,6 +1,6 @@
 #library('DartObjectLocalStorageTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // TODO(vsm): Rename this to wrapper_caching_test or similar.  It's

tests/html/datalistelement_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('datalistelement_dataview_test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/document_test.dart

@@ -1,6 +1,6 @@
 #library('DocumentTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/documentfragment_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('DocumentFragmentTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 #source('util.dart');
 

tests/html/dom_constructors_test.dart

@@ -1,6 +1,6 @@
 #library('DOMConstructorsTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/dom_isolates_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file
 
 #library('DOMIsolatesTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 #import('dart:isolate');
 

tests/html/domparser_test.dart

@@ -1,6 +1,6 @@
 #library('DOMParserTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/element_add_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file
 
 #library('ElementAddTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 #source('util.dart');
 

tests/html/element_classes_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('ElementTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/element_constructor_1_test.dart

@@ -7,8 +7,8 @@
 // element_constructor_foo_test.dart file.
 
 #library('ElementConstructorTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/element_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('ElementTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 expectLargeRect(ClientRect rect) {

tests/html/event_customevent_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('EventCustomEventTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // TODO(nweiz): Make this private to testEvents when Frog supports closures with

tests/html/event_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('EventTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // TODO(nweiz): Make this private to testEvents when Frog supports closures with

tests/html/events_test.dart

@@ -1,6 +1,6 @@
 #library('EventsTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/exceptions_test.dart

@@ -1,6 +1,6 @@
 #library('ExceptionsTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/fileapi_test.dart

@@ -1,6 +1,6 @@
 #library('fileapi');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 void fail(message) {

tests/html/form_data_test.dart

@@ -4,8 +4,8 @@
 
 #library('FormDataTest');
 
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 void main() {

tests/html/form_element_test.dart

@@ -4,8 +4,8 @@
 
 #library('FormElementTest');
 
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 void main() {
@@ -34,47 +34,47 @@ void main() {
     form.acceptCharset = charset;
     expect(form.acceptCharset, charset);
   });
-
+  
   test('actionTest', () {
     var action = 'http://dartlang.org/';
     form.action = action;
     expect(form.action, action);
   });
-
+  
   test('autocompleteTest', () {
     var auto = 'on';
     form.autocomplete = auto;
     expect(form.autocomplete, auto);
   });
-
+  
   test('encodingAndEnctypeTest', () {
     expect(form.enctype, form.encoding);
   });
-
+  
   test('lengthTest', () {
     expect(form.length, 0);
     form.innerHTML = '<label>Google: <input type="search" name="q"></label> '
                      '<input type="submit" value="Search...">';
     expect(form.length, 2);
   });
-
+  
   test('methodTest', () {
     var method = 'post';
     form.method = method;
     expect(form.method, method);
   });
-
+  
   test('nameTest', () {
     var name = 'aname';
     form.name = name;
     expect(form.name, name);
   });
-
+  
   test('noValidateTest', () {
     form.noValidate = true;
     expect(form.noValidate, true);
   });
-
+  
   test('targetTest', () {
     var target = 'target';
     form.target = target;

tests/html/hidden_dom_1_test.dart

@@ -1,6 +1,6 @@
 #library('HiddenDom1Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // Test that the dart:html API does not leak native jsdom methods:

tests/html/hidden_dom_2_test.dart

@@ -1,6 +1,6 @@
 #library('HiddenDom2Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // Test that the dart:html API does not leak native jsdom methods:

tests/html/history_test.dart

@@ -1,6 +1,6 @@
 #library('HistoryTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/htmlaudioelement_test.dart

@@ -1,6 +1,6 @@
 #library('AudioElementTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/htmlcollection_test.dart

@@ -1,6 +1,6 @@
 #library('ElementListTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // Test that ElementList implements List<T>

tests/html/htmlelement_test.dart

@@ -1,6 +1,6 @@
 #library('ElementTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/htmloptionscollection_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('HTMLOptionsCollectionTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/indexeddb_1_test.dart

@@ -1,6 +1,6 @@
 #library('IndexedDB1Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 const String DB_NAME = 'Test';

tests/html/indexeddb_2_test.dart

@@ -1,6 +1,6 @@
 #library('IndexedDB1Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 #import('dart:coreimpl');
 #import('utils.dart');

tests/html/indexeddb_3_test.dart

@@ -1,6 +1,6 @@
 #library('IndexedDB3Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // Read with cursor.
@@ -56,7 +56,7 @@ class Test {
 
   fail(message) => (e) {
     guardAsync(() {
-      Expect.fail('IndexedDB failure: $message');
+      Expect.fail('IndexedDB failure: $message'); 
     });
   };
 

tests/html/indexeddb_4_test.dart

@@ -1,6 +1,6 @@
 #library('IndexedDB4Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // Test for IDBKeyRange and IDBCursor.

tests/html/inner_frame_test.dart

@@ -1,6 +1,6 @@
 #library('InnerFrameTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/instance_of_test.dart

@@ -1,6 +1,6 @@
 #library('InstanceOfTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/isolates_test.dart

@@ -1,6 +1,6 @@
 #library('IsolatesTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 #import('dart:json');
 #import('dart:isolate', prefix:'isolate');

tests/html/js_interop_1_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file
 
 #library('JsInterop1Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 #import('dart:json');
 

tests/html/js_interop_2_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file
 
 #library('JsInterop2Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 #import('dart:isolate');
 

tests/html/js_interop_3_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file
 
 #library('JsInterop3Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 #import('dart:isolate');
 

tests/html/js_interop_4_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file
 
 #library('JsInterop4Test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 #import('dart:isolate');
 

tests/html/key_name_location_test.dart

@@ -1,6 +1,6 @@
 #library('KeyNameLocationTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 // Test for existence of some KeyName and KeyLocation constants.

tests/html/localstorage_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('LocalStorageTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/location_test.dart

@@ -1,6 +1,6 @@
 #library('LocationTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/measurement_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('MeasurementTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/messageevent_test.dart

@@ -1,6 +1,6 @@
 #library('SerializedScriptValueTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/mutationobserver_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('mutationobserver_test');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 /**

tests/html/native_gc_test.dart

@@ -1,6 +1,6 @@
 #library('NativeGCTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/node_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('NodeTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 Node makeNode() => new Element.tag('div');

tests/html/performance_api_test.dart

@@ -1,6 +1,6 @@
 #library('PerformanceApiTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {
@@ -10,7 +10,7 @@ main() {
     var requestStart = window.performance.timing.requestStart;
     var responseStart = window.performance.timing.responseStart;
     var responseEnd = window.performance.timing.responseEnd;
-
+    
     var loading = window.performance.timing.domLoading;
     var loadedStart = window.performance.timing.domContentLoadedEventStart;
     var loadedEnd = window.performance.timing.domContentLoadedEventEnd;

tests/html/query_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('QueryTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {
@@ -16,7 +16,7 @@ main() {
   final element =
       new Element.html("<div><br/><img/><input/><img/></div>");
   document.body.nodes.addAll([div, canvas,  element]);
-
+  
 
   test('query', () {
       Element e = query('#testcanvas');

tests/html/queryall_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file
 
 #library('NodeListTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {

tests/html/request_animation_frame_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library('RequestAnimationFrameTest');
-#import('../../pkg/unittest/lib/unittest.dart');
-#import('../../pkg/unittest/lib/html_config.dart');
+#import('../../pkg/unittest/unittest.dart');
+#import('../../pkg/unittest/html_config.dart');
 #import('dart:html');
 
 main() {