Move tests from tests/api to harmony-tests.

The vast majority of cleaned up harmony tests
are now in harmony-tests/src/test/org/apache/harmony/tests/

Change-Id: I56c2e484ff434b5618cf6751d602ae9f0db96b30

3 files changed, 45 insertions, 45 deletions

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"
   ]
 }
 ]
diff --git a/expectations/icebox.txt b/expectations/icebox.txt
index 09e05e2..daf9af4 100644
--- a/expectations/icebox.txt
+++ b/expectations/icebox.txt
@@ -107,7 +107,7 @@
 {
   description: "a low impact bug, we can't produce tiny random, probable prime big integers",
   result: EXEC_FAILED,
-  name: "tests.api.java.math.BigIntegerTest#test_ConstructorIILjava_util_Random",
+  name: "org.apache.harmony.tests.java.math.BigIntegerTest#test_ConstructorIILjava_util_Random",
   substring: "junit.framework.AssertionFailedError: Random number one is too big"
 },
 {
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index 869bf70..22a80bd 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -272,7 +272,7 @@
   description: "It's not allowed to pass null as parent class loader to a new ClassLoader anymore. Maybe we need
                 to change URLClassLoader to allow this? It's not specified.",
   result: EXEC_FAILED,
-  name: "tests.api.java.util.ResourceBundleTest#test_getBundleLjava_lang_StringLjava_util_LocaleLjava_lang_ClassLoader"
+  name: "org.apache.harmony.tests.java.util.ResourceBundleTest#test_getBundleLjava_lang_StringLjava_util_LocaleLjava_lang_ClassLoader"
 },
 {
   description: "Fails (probably) because no protection domain is set.",
@@ -293,7 +293,7 @@
 {
   description: "Android doesn't support protection domains.",
   result: EXEC_FAILED,
-  name: "tests.api.java.security.PermissionCollectionTest#test_impliesLjava_security_Permission"
+  name: "org.apache.harmony.tests.java.security.PermissionCollectionTest#test_impliesLjava_security_Permission"
 },
 {
   description: "Android doesn't allow null parent.",
@@ -1683,75 +1683,75 @@
 {
   description: "getExceptionTypes() error when throws clause contains an exception and its sublcass",
   bug: 11647146,
-  name: "tests.api.java.lang.reflect.ProxyTest#test_ProxyClass_withParentAndSubInThrowList"
+  name: "org.apache.harmony.tests.java.lang.reflect.ProxyTest#test_ProxyClass_withParentAndSubInThrowList"
 },
 {
   description: "Known failures in dealing with # in file / jar URLs",
   bug: 11664881,
   names: [
-    "tests.api.internal.net.www.protocol.file.FileURLConnectionTest#testGetContentType",
-    "tests.api.internal.net.www.protocol.file.FileURLConnectionTest#testGetInputStream",
-    "tests.api.internal.net.www.protocol.file.FileURLConnectionTest#testHeaderFunctions",
-    "tests.api.java.lang.ClassLoaderTest#test_getResourceAsStream_withSharpChar",
-    "tests.api.java.lang.ClassTest#test_getResourceAsStream_withSharpChar"
+    "org.apache.harmony.tests.internal.net.www.protocol.file.FileURLConnectionTest#testGetContentType",
+    "org.apache.harmony.tests.internal.net.www.protocol.file.FileURLConnectionTest#testGetInputStream",
+    "org.apache.harmony.tests.internal.net.www.protocol.file.FileURLConnectionTest#testHeaderFunctions",
+    "org.apache.harmony.tests.java.lang.ClassLoaderTest#test_getResourceAsStream_withSharpChar",
+    "org.apache.harmony.tests.java.lang.ClassTest#test_getResourceAsStream_withSharpChar"
   ]
 },
 {
   description: "Known failures in InputStreamReaderTest & OutputStreamWriterTest",
   bug: 11665359,
   names: [
-    "tests.api.java.io.InputStreamReaderTest#test_getEncoding",
-    "tests.api.java.io.InputStreamReaderTest#test_read_1",
-    "tests.api.java.io.InputStreamReaderTest#test_read_specialCharset",
-    "tests.api.java.io.OutputStreamWriterTest#test_getEncoding"
+    "org.apache.harmony.tests.java.io.InputStreamReaderTest#test_getEncoding",
+    "org.apache.harmony.tests.java.io.InputStreamReaderTest#test_read_1",
+    "org.apache.harmony.tests.java.io.InputStreamReaderTest#test_read_specialCharset",
+    "org.apache.harmony.tests.java.io.OutputStreamWriterTest#test_getEncoding"
   ]
 },
 {
   description: "Known failures in PipedInputStreamTest & PipedWriterTest",
   bug: 11666814,
   names: [
-    "tests.api.java.io.PipedInputStreamTest#test_receive",
-    "tests.api.java.io.PipedWriterTest#test_flushAfterClose"
+    "org.apache.harmony.tests.java.io.PipedInputStreamTest#test_receive",
+    "org.apache.harmony.tests.java.io.PipedWriterTest#test_flushAfterClose"
   ]
 },
 {
   description: "Known failures in SerializationStressTest",
   bug: 11668227,
   names: [
-    "tests.api.java.io.SerializationStressTest3#test_18_113_writeObject",
-    "tests.api.java.io.SerializationStressTest3#test_18_115_writeObject",
-    "tests.api.java.io.SerializationStressTest4#test_writeObject_Collections_UnmodifiableMap_UnmodifiableEntrySet"
+    "org.apache.harmony.tests.java.io.SerializationStressTest3#test_18_113_writeObject",
+    "org.apache.harmony.tests.java.io.SerializationStressTest3#test_18_115_writeObject",
+    "org.apache.harmony.tests.java.io.SerializationStressTest4#test_writeObject_Collections_UnmodifiableMap_UnmodifiableEntrySet"
   ]
 },
 {
   description: "Known failure in MathTest 1^NAN should be NAN",
   bug: 11669804,
-  name: "tests.api.java.lang.MathTest#test_powDD"
+  name: "org.apache.harmony.tests.java.lang.MathTest#test_powDD"
 },
 {
   description: "Known failures in PropertiesTest: We don't deal with comments in store()",
   bug: 11686302,
   names: [
-    "tests.api.java.util.PropertiesTest#testStore_scenario0",
-    "tests.api.java.util.PropertiesTest#testStore_scenario1",
-    "tests.api.java.util.PropertiesTest#testStore_scenario2",
-    "tests.api.java.util.PropertiesTest#testStore_scenario3",
-    "tests.api.java.util.PropertiesTest#testStore_scenario9",
-    "tests.api.java.util.PropertiesTest#testStore_scenario11"
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario0",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario1",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario2",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario3",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario9",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario11"
   ]
 },
 {
   description: "Known failures in URLTest and URLDecoderTest",
   bug: 11686814,
   names: [
-    "tests.api.java.net.URLTest#test_ConstructorLjava_net_URLLjava_lang_String",
-    "tests.api.java.net.URLTest#test_sameFileLjava_net_URL",
-    "tests.api.java.net.URLDecoderTest#test_decodeLjava_lang_String_Ljava_lang_String"
+    "org.apache.harmony.tests.java.net.URLTest#test_ConstructorLjava_net_URLLjava_lang_String",
+    "org.apache.harmony.tests.java.net.URLTest#test_sameFileLjava_net_URL",
+    "org.apache.harmony.tests.java.net.URLDecoderTest#test_decodeLjava_lang_String_Ljava_lang_String"
   ]
 },
 {
   description: "Known failure in CookieManagerTest",
   bug: 11689102,
-  name: "tests.api.java.net.CookieManagerTest#test_Put_Get_LURI_LMap"
+  name: "org.apache.harmony.tests.java.net.CookieManagerTest#test_Put_Get_LURI_LMap"
 }
 ]