Revert "unittest step 3 and 4: remove TestFramework.dart, make test.dart use"

tests/isolate/src/PortTest.dart

Index: tests/isolate/src/PortTest.dart
diff --git a/tests/isolate/src/PortTest.dart b/tests/isolate/src/PortTest.dart
index 56563eedb97fac7e15e465b6efb125d5b13fb646..ab8a2dc223a09d7c430dd6da62118905cd647dc3 100644
--- a/tests/isolate/src/PortTest.dart
+++ b/tests/isolate/src/PortTest.dart
@@ -2,60 +2,64 @@
 // 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.
 
-// Test properties of ports.
-// Note: unittest.dart depends on ports, in particular on the behaviour tested
-// here. To keep things simple, we don't use the unittest library here.
-
+// Dart test program for testing properties of ports.
 #library("PortTest");
 #import("dart:isolate");
 
+class PortTest {
 
-main() {
-  testHashCode();
-  testEquals();
-  testMap();
-}
+  static void testMain() {
+    testHashCode();
+    testEquals();
+    testMap();
+  }
 
-void testHashCode() {
-  ReceivePort rp0 = new ReceivePort();
-  ReceivePort rp1 = new ReceivePort();
-  Expect.equals(rp0.toSendPort().hashCode(), rp0.toSendPort().hashCode());
-  Expect.equals(rp1.toSendPort().hashCode(), rp1.toSendPort().hashCode());
-  rp0.close();
-  rp1.close();
-}
+  static void testHashCode() {
+    ReceivePort rp0 = new ReceivePort();
+    ReceivePort rp1 = new ReceivePort();
+    Expect.equals(rp0.toSendPort().hashCode(), rp0.toSendPort().hashCode());
+    Expect.equals(rp1.toSendPort().hashCode(), rp1.toSendPort().hashCode());
+    rp0.close();
+    rp1.close();
+  }
+
+  static void testEquals() {
+    ReceivePort rp0 = new ReceivePort();
+    ReceivePort rp1 = new ReceivePort();  
+    Expect.equals(rp0.toSendPort(), rp0.toSendPort());
+    Expect.equals(rp1.toSendPort(), rp1.toSendPort());
+    Expect.equals(false, (rp0.toSendPort() == rp1.toSendPort()));
+    rp0.close();
+    rp1.close();
+  }
 
-void testEquals() {
-  ReceivePort rp0 = new ReceivePort();
-  ReceivePort rp1 = new ReceivePort();
-  Expect.equals(rp0.toSendPort(), rp0.toSendPort());
-  Expect.equals(rp1.toSendPort(), rp1.toSendPort());
-  Expect.equals(false, (rp0.toSendPort() == rp1.toSendPort()));
-  rp0.close();
-  rp1.close();
+  static void testMap() {
+    ReceivePort rp0 = new ReceivePort();
+    ReceivePort rp1 = new ReceivePort();
+    final map = new Map<SendPort, int>();
+    map[rp0.toSendPort()] = 42;
+    map[rp1.toSendPort()] = 87;
+    Expect.equals(42, map[rp0.toSendPort()]);
+    Expect.equals(87, map[rp1.toSendPort()]);
+
+    map[rp0.toSendPort()] = 99;
+    Expect.equals(99, map[rp0.toSendPort()]);
+    Expect.equals(87, map[rp1.toSendPort()]);
+
+    map.remove(rp0.toSendPort());
+    Expect.equals(false, map.containsKey(rp0.toSendPort()));
+    Expect.equals(87, map[rp1.toSendPort()]);
+
+    map.remove(rp1.toSendPort());
+    Expect.equals(false, map.containsKey(rp0.toSendPort()));
+    Expect.equals(false, map.containsKey(rp1.toSendPort()));
+    
+    rp0.close();
+    rp1.close();
+  }
+  
 }
 
-void testMap() {
-  ReceivePort rp0 = new ReceivePort();
-  ReceivePort rp1 = new ReceivePort();
-  final map = new Map<SendPort, int>();
-  map[rp0.toSendPort()] = 42;
-  map[rp1.toSendPort()] = 87;
-  Expect.equals(42, map[rp0.toSendPort()]);
-  Expect.equals(87, map[rp1.toSendPort()]);
-
-  map[rp0.toSendPort()] = 99;
-  Expect.equals(99, map[rp0.toSendPort()]);
-  Expect.equals(87, map[rp1.toSendPort()]);
-
-  map.remove(rp0.toSendPort());
-  Expect.equals(false, map.containsKey(rp0.toSendPort()));
-  Expect.equals(87, map[rp1.toSendPort()]);
-
-  map.remove(rp1.toSendPort());
-  Expect.equals(false, map.containsKey(rp0.toSendPort()));
-  Expect.equals(false, map.containsKey(rp1.toSendPort()));
-
-  rp0.close();
-  rp1.close();
+main() {
+  PortTest.testMain();
 }