commit ab762bb740405d0fefcccf4a0899a234f995be13
author Narayan Kamath <narayan@google.com> Fri Nov 15 18:40:14 2013 +0000
committer Narayan Kamath <narayan@google.com> Fri Nov 15 18:40:14 2013 +0000
tree 2fbc464e8e7d94dc227779b758df20bcd07db8f6
parent 9a3e5229586a8843c296e40fcf0bd213ad9af1b9

Move tests from tests/api to harmony-tests. (Take 2)

This reverts commit d5e281743e55e1daa297fd8043b2d9b6e8e1bed2.

The makefile issue that caused the original build break
has been resolved.

expectations/brokentests.txt

diff --git a/expectations/brokentests.txt b/expectations/brokentests.txt
index 43e6ed2..9d7cf49 100644
--- a/expectations/brokentests.txt
+++ b/expectations/brokentests.txt
@@ -855,28 +855,28 @@
   description: "Some tests depend on ICU data, which has changed. Others make assumptions about floating point rounding",
   result: EXEC_FAILED,
   names: [
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_BigDecimalExceptionOrder",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_DateTimeConversion",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionE",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionF",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionG",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatDoubleBigDecimalExceptionOrder",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_GeneralConversionOther",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_LineSeparator",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_Percent",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_Width"
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_BigDecimalExceptionOrder",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_DateTimeConversion",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionE",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionF",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionG",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatDoubleBigDecimalExceptionOrder",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_GeneralConversionOther",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_LineSeparator",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_Percent",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_Width"
   ]
 },
 {
   description: "(Needs investigation) Some tests make assertions that don't make sense, others use broken port allocation logic.",
   result: EXEC_FAILED,
   names: [
-    "tests.api.java.net.Inet6AddressTest#test_getByNameLjava_lang_String",
-    "tests.api.java.net.InetAddressTest#test_equalsLjava_lang_Object",
-    "tests.api.java.net.InetAddressTest#test_getByNameLjava_lang_String",
-    "tests.api.java.net.InetAddressTest#test_isReachableLjava_net_NetworkInterfaceII_loopbackInterface",
-    "tests.api.java.net.MulticastSocketTest#test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface",
-    "tests.api.java.net.MulticastSocketTest#test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface_IPv4"
+    "org.apache.harmony.tests.java.net.Inet6AddressTest#test_getByNameLjava_lang_String",
+    "org.apache.harmony.tests.java.net.InetAddressTest#test_equalsLjava_lang_Object",
+    "org.apache.harmony.tests.java.net.InetAddressTest#test_getByNameLjava_lang_String",
+    "org.apache.harmony.tests.java.net.InetAddressTest#test_isReachableLjava_net_NetworkInterfaceII_loopbackInterface",
+    "org.apache.harmony.tests.java.net.MulticastSocketTest#test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface",
+    "org.apache.harmony.tests.java.net.MulticastSocketTest#test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface_IPv4"
   ]
 }
 ]