Revert "Move tests from tests/api to harmony-tests."
This reverts commit 81bf28ad31131815d0a36a43a0eca3c29aefdfcd.
Breaks build
Change-Id: I3f1562921ffe8fdbec36971dd65db398c27c92db
diff --git a/expectations/brokentests.txt b/expectations/brokentests.txt
index 9d7cf49..43e6ed2 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: [
- "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"
+ "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"
]
},
{
description: "(Needs investigation) Some tests make assertions that don't make sense, others use broken port allocation logic.",
result: EXEC_FAILED,
names: [
- "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"
+ "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"
]
}
]
diff --git a/expectations/icebox.txt b/expectations/icebox.txt
index daf9af4..09e05e2 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: "org.apache.harmony.tests.java.math.BigIntegerTest#test_ConstructorIILjava_util_Random",
+ name: "tests.api.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 22a80bd..869bf70 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: "org.apache.harmony.tests.java.util.ResourceBundleTest#test_getBundleLjava_lang_StringLjava_util_LocaleLjava_lang_ClassLoader"
+ name: "tests.api.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: "org.apache.harmony.tests.java.security.PermissionCollectionTest#test_impliesLjava_security_Permission"
+ name: "tests.api.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: "org.apache.harmony.tests.java.lang.reflect.ProxyTest#test_ProxyClass_withParentAndSubInThrowList"
+ name: "tests.api.java.lang.reflect.ProxyTest#test_ProxyClass_withParentAndSubInThrowList"
},
{
description: "Known failures in dealing with # in file / jar URLs",
bug: 11664881,
names: [
- "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"
+ "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"
]
},
{
description: "Known failures in InputStreamReaderTest & OutputStreamWriterTest",
bug: 11665359,
names: [
- "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"
+ "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"
]
},
{
description: "Known failures in PipedInputStreamTest & PipedWriterTest",
bug: 11666814,
names: [
- "org.apache.harmony.tests.java.io.PipedInputStreamTest#test_receive",
- "org.apache.harmony.tests.java.io.PipedWriterTest#test_flushAfterClose"
+ "tests.api.java.io.PipedInputStreamTest#test_receive",
+ "tests.api.java.io.PipedWriterTest#test_flushAfterClose"
]
},
{
description: "Known failures in SerializationStressTest",
bug: 11668227,
names: [
- "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"
+ "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"
]
},
{
description: "Known failure in MathTest 1^NAN should be NAN",
bug: 11669804,
- name: "org.apache.harmony.tests.java.lang.MathTest#test_powDD"
+ name: "tests.api.java.lang.MathTest#test_powDD"
},
{
description: "Known failures in PropertiesTest: We don't deal with comments in store()",
bug: 11686302,
names: [
- "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"
+ "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"
]
},
{
description: "Known failures in URLTest and URLDecoderTest",
bug: 11686814,
names: [
- "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"
+ "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"
]
},
{
description: "Known failure in CookieManagerTest",
bug: 11689102,
- name: "org.apache.harmony.tests.java.net.CookieManagerTest#test_Put_Get_LURI_LMap"
+ name: "tests.api.java.net.CookieManagerTest#test_Put_Get_LURI_LMap"
}
]
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
index 1da9502..f101c73 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package org.apache.harmony.luni.tests.java.io;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerParseLargeFileBenchmarkTest.java b/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
index 4b0d1ea..117f211 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.io.IOException;
import java.io.Reader;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java b/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerTest.java
index 585ba44..b3e1abc 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UUIDTest.java b/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UUIDTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java
index a56a2d4..d8f4cc4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UUIDTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java
@@ -15,7 +15,7 @@
* the License.
*/
-package org.apache.harmony.tests.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.UUID;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/B.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/B.java
deleted file mode 100644
index 03ebb15..0000000
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/B.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.apache.harmony.tests.java.util.support;
-
-public class B extends A {
-}
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/I.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/I.java
deleted file mode 100644
index 4538945..0000000
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/I.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.apache.harmony.tests.java.util.support;
-
-public interface I {
- String find(String key);
-}
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/FileTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/io/FileTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/FileTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/io/FileTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/IOErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/io/IOErrorTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/IOErrorTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/io/IOErrorTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_integers.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_integers.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_integers.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_integers.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_strings.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_strings.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_strings.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_strings.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testfile b/harmony-tests/src/test/resources/serialization/tests/api/java/io/testfile
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testfile
rename to harmony-tests/src/test/resources/serialization/tests/api/java/io/testfile
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/AbstractMethodErrorTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/AbstractMethodErrorTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.0.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.0.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.0.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.1.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.1.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.1.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.2.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.2.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.2.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.2.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.3.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.3.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.3.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.3.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.harmony.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.harmony.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalArgumentExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalArgumentExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalStateExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalStateExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/SecurityExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/SecurityExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/SecurityExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/SecurityExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBufferTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBufferTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBufferTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBufferTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBuilderTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBuilderTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBuilderTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBuilderTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/UnsupportedOperationExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/lang/UnsupportedOperationExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/HttpRetryExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/net/HttpRetryExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/HttpRetryExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/net/HttpRetryExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet4AddressTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet4AddressTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet4AddressTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet4AddressTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.0.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.0.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.0.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.1.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.1.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.1.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetAddressTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetAddressTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetAddressTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/net/InetAddressTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.0.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.0.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.0.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.1.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.1.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.1.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/net/SocketTimeoutExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/net/SocketTimeoutExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleEntry.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleEntry.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleEntry.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleEntry.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ArrayDequeTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/ArrayDequeTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ArrayDequeTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/ArrayDequeTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/BitSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/BitSetTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/BitSetTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/BitSetTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedCollection.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedCollection.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedCollection.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedCollection.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedList.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedList.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedList.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedList.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedListRandomAccess.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedListRandomAccess.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedListRandomAccess.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedListRandomAccess.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedMap.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedMap.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedMap.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedMap.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSet.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSet.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSet.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSet.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedMap.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedMap.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedMap.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedMap.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedSet.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedSet.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedSet.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedSet.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_asLifoQueue.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_asLifoQueue.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_asLifoQueue.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_asLifoQueue.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_newSetFromMap.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_newSetFromMap.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_newSetFromMap.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_newSetFromMap.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatterClosedExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatterClosedExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashMapTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashMapTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/HashMapTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashSetTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IdentityHashMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/IdentityHashMapTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IdentityHashMapTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/IdentityHashMapTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatCodePointExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatCodePointExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatConversionExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatConversionExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatFlagsExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatFlagsExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatWidthExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatWidthExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/InputMismatchExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/InputMismatchExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/LinkedListTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/LinkedListTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/LinkedListTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/LinkedListTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatArgumentExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatArgumentExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatWidthExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatWidthExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/PriorityQueue.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/PriorityQueue.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/RandomTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/RandomTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/RandomTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/RandomTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/ServiceConfigurationErrorTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/ServiceConfigurationErrorTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatConversionExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatConversionExceptionTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatFlagsExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatFlagsExceptionTest.golden.ser
Binary files differ
diff --git a/luni/src/test/java/libcore/java/lang/reflect/OldGenericReflectionCornerCases.java b/luni/src/test/java/libcore/java/lang/reflect/OldGenericReflectionCornerCases.java
index ad3cc06..168a00d 100644
--- a/luni/src/test/java/libcore/java/lang/reflect/OldGenericReflectionCornerCases.java
+++ b/luni/src/test/java/libcore/java/lang/reflect/OldGenericReflectionCornerCases.java
@@ -16,12 +16,12 @@
package libcore.java.lang.reflect;
-import org.apache.harmony.tests.java.lang.reflect.GenericReflectionTestsBase;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
+import tests.api.java.lang.reflect.GenericReflectionTestsBase;
/**
* Tests generic reflection in more complicated cases. In particular: Scoping of
diff --git a/luni/src/test/java/libcore/java/lang/reflect/OldGenericTypesTest.java b/luni/src/test/java/libcore/java/lang/reflect/OldGenericTypesTest.java
index 9dec794..69eff4f 100644
--- a/luni/src/test/java/libcore/java/lang/reflect/OldGenericTypesTest.java
+++ b/luni/src/test/java/libcore/java/lang/reflect/OldGenericTypesTest.java
@@ -21,7 +21,7 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
-import org.apache.harmony.tests.java.lang.reflect.GenericReflectionTestsBase;
+import tests.api.java.lang.reflect.GenericReflectionTestsBase;
/**
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/internal/net/www/protocol/file/FileURLConnectionTest.java b/luni/src/test/java/tests/api/internal/net/www/protocol/file/FileURLConnectionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/internal/net/www/protocol/file/FileURLConnectionTest.java
rename to luni/src/test/java/tests/api/internal/net/www/protocol/file/FileURLConnectionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedInputStreamTest.java b/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
index aea5196..3d16e74 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import junit.framework.TestCase;
import tests.support.Support_PlatformFile;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedOutputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
index 9c5bb2d..12cb0d7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedWriterTest.java b/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedWriterTest.java
rename to luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
index d1bb971..f4e2cdb 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.BufferedWriter;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayInputStreamTest.java b/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
index 4ab972d..c10f9c5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayOutputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
index 9e95de1..cee1df4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayOutputStream;
import java.io.FileDescriptor;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayReaderTest.java b/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayReaderTest.java
rename to luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
index 8865332..71ea6e3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.CharArrayReader;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayWriterTest.java b/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayWriterTest.java
rename to luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java
index 951a1a1..407c286 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.CharArrayReader;
import java.io.CharArrayWriter;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharConversionExceptionTest.java b/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharConversionExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
index c399793..2d43ea9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharConversionExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.CharConversionException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ComputeSerialVersionUIDTest.java b/luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ComputeSerialVersionUIDTest.java
rename to luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java
index 12542fd..458c27f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ComputeSerialVersionUIDTest.java
+++ b/luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java
@@ -1,11 +1,11 @@
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ObjectInputStream;
public class ComputeSerialVersionUIDTest extends junit.framework.TestCase {
- private String path = "/serialization/org/apache/harmony/tests/java/io/";
+ private String path = "/serialization/tests/api/java/io/";
public void testComputeSUIDClass() throws Exception {
ObjectInputStream ois = new ObjectInputStream(getClass()
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ConsoleTest.java b/luni/src/test/java/tests/api/java/io/ConsoleTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ConsoleTest.java
rename to luni/src/test/java/tests/api/java/io/ConsoleTest.java
index 47e8779..0f2b17f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ConsoleTest.java
+++ b/luni/src/test/java/tests/api/java/io/ConsoleTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import junit.framework.TestCase;
import java.io.ByteArrayInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataInputStreamTest.java b/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
index 67a4e5f..8403af7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataOutputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
index 1f124f1..d6c27b9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/EOFExceptionTest.java b/luni/src/test/java/tests/api/java/io/EOFExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/EOFExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/EOFExceptionTest.java
index 1610816..80e4636 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/EOFExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/EOFExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileDescriptorTest.java b/luni/src/test/java/tests/api/java/io/FileDescriptorTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileDescriptorTest.java
rename to luni/src/test/java/tests/api/java/io/FileDescriptorTest.java
index b4bb180..f994677 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileDescriptorTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileDescriptorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.BufferedOutputStream;
import java.io.File;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileInputStreamTest.java b/luni/src/test/java/tests/api/java/io/FileInputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/FileInputStreamTest.java
index 2da82f4..031cd39 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileInputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import junit.framework.TestCase;
import tests.support.Support_PlatformFile;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileNotFoundExceptionTest.java b/luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileNotFoundExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java
index a1772cd..466aa3d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileNotFoundExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.FileNotFoundException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileOutputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
index 1d13f76..8f3c498 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
@@ -15,7 +15,7 @@
* the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.File;
import java.io.FileDescriptor;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileReaderTest.java b/luni/src/test/java/tests/api/java/io/FileReaderTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileReaderTest.java
rename to luni/src/test/java/tests/api/java/io/FileReaderTest.java
index bbe20fa..d2ed6de 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileReaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.BufferedWriter;
import java.io.File;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java b/luni/src/test/java/tests/api/java/io/FileTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java
rename to luni/src/test/java/tests/api/java/io/FileTest.java
index eed9841..5660e37 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import junit.framework.TestCase;
import org.apache.harmony.testframework.serialization.SerializationTest;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileWriterTest.java b/luni/src/test/java/tests/api/java/io/FileWriterTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileWriterTest.java
rename to luni/src/test/java/tests/api/java/io/FileWriterTest.java
index f8f0d4f..1fb38dc 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileWriterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterInputStreamTest.java b/luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java
index 600b145..14b63dc 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.File;
import java.io.FilterInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterOutputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
index 666955d..5a5b6b0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOErrorTest.java b/luni/src/test/java/tests/api/java/io/IOErrorTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOErrorTest.java
rename to luni/src/test/java/tests/api/java/io/IOErrorTest.java
index b95adc9..69f9efd 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOErrorTest.java
+++ b/luni/src/test/java/tests/api/java/io/IOErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOError;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOExceptionTest.java b/luni/src/test/java/tests/api/java/io/IOExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/IOExceptionTest.java
index d0b26db..943fc8b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/IOExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java b/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java
rename to luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
index 79a9f39..fa9f5b9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamTest.java b/luni/src/test/java/tests/api/java/io/InputStreamTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/InputStreamTest.java
index f2543c3..9d478c7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/InputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.InputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InterruptedIOExceptionTest.java b/luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InterruptedIOExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java
index 5fc3d44..ae38d0e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InterruptedIOExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.InterruptedIOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InvalidClassExceptionTest.java b/luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InvalidClassExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java
index f0d30f2..de7017a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InvalidClassExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.InvalidClassException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberInputStreamTest.java b/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
index de345f1..189daef 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberReaderTest.java b/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberReaderTest.java
rename to luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
index d20b7af..e90c561 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotActiveExceptionTest.java b/luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotActiveExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java
index cd62bbc..a34a349 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotActiveExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.NotActiveException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotSerializableExceptionTest.java b/luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotSerializableExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java
index 9df51a0..a4c90c8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotSerializableExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.NotSerializableException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java b/luni/src/test/java/tests/api/java/io/ObjectInputStream2Test.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java
rename to luni/src/test/java/tests/api/java/io/ObjectInputStream2Test.java
index af5fce5..6988f27 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectInputStream2Test.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStream2Test.java b/luni/src/test/java/tests/api/java/io/ObjectOutputStream2Test.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStream2Test.java
rename to luni/src/test/java/tests/api/java/io/ObjectOutputStream2Test.java
index 99546c4..82d82b9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStream2Test.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectOutputStream2Test.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
index 1c98257..96d1771 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java b/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
similarity index 93%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java
rename to luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
index 3806492..ddaf8a7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import junit.framework.TestCase;
import java.io.Externalizable;
@@ -81,7 +81,7 @@
ObjectStreamClass osc = ObjectStreamClass.lookup(DummyClass.class);
assertEquals(
"getName returned incorrect name: " + osc.getName(),
- "org.apache.harmony.tests.java.io.ObjectStreamClassTest$DummyClass",
+ "tests.api.java.io.ObjectStreamClassTest$DummyClass",
osc.getName());
}
@@ -117,7 +117,7 @@
ObjectStreamClass osc = ObjectStreamClass.lookup(DummyClass.class);
assertEquals(
"lookup returned wrong class: " + osc.getName(),
- "org.apache.harmony.tests.java.io.ObjectStreamClassTest$DummyClass",
+ "tests.api.java.io.ObjectStreamClassTest$DummyClass",
osc.getName());
}
@@ -201,17 +201,17 @@
// java.io.ObjectStreamClass.lookupAny(java.lang.Class)
ObjectStreamClass osc = ObjectStreamClass.lookupAny(DummyClass.class);
assertEquals("lookup returned wrong class: " + osc.getName(),
- "org.apache.harmony.tests.java.io.ObjectStreamClassTest$DummyClass", osc
+ "tests.api.java.io.ObjectStreamClassTest$DummyClass", osc
.getName());
osc = ObjectStreamClass.lookupAny(NonSerialzableClass.class);
assertEquals("lookup returned wrong class: " + osc.getName(),
- "org.apache.harmony.tests.java.io.ObjectStreamClassTest$NonSerialzableClass",
+ "tests.api.java.io.ObjectStreamClassTest$NonSerialzableClass",
osc.getName());
osc = ObjectStreamClass.lookupAny(ExternalizableClass.class);
assertEquals("lookup returned wrong class: " + osc.getName(),
- "org.apache.harmony.tests.java.io.ObjectStreamClassTest$ExternalizableClass",
+ "tests.api.java.io.ObjectStreamClassTest$ExternalizableClass",
osc.getName());
osc = ObjectStreamClass.lookup(NonSerialzableClass.class);
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamConstantsTest.java b/luni/src/test/java/tests/api/java/io/ObjectStreamConstantsTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamConstantsTest.java
rename to luni/src/test/java/tests/api/java/io/ObjectStreamConstantsTest.java
index 7fbaa93..5fd09f6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamConstantsTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectStreamConstantsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ObjectStreamConstants;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamFieldTest.java b/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamFieldTest.java
rename to luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
index 8dd12a4..2b225b4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamFieldTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OpenRandomFileTest.java b/luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OpenRandomFileTest.java
rename to luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java
index 2341ee9..cb7b312 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OpenRandomFileTest.java
+++ b/luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamTesterTest.java b/luni/src/test/java/tests/api/java/io/OutputStreamTesterTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamTesterTest.java
rename to luni/src/test/java/tests/api/java/io/OutputStreamTesterTest.java
index 0b5dde1..f9e1561 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamTesterTest.java
+++ b/luni/src/test/java/tests/api/java/io/OutputStreamTesterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import junit.framework.TestSuite;
import org.apache.harmony.testframework.SinkTester;
@@ -48,8 +48,7 @@
*/
public class OutputStreamTesterTest {
- // TODO: Rewrite this test so that id doesn't need a suite().
- private static junit.framework.Test suite() {
+ public static junit.framework.Test suite() {
TestSuite suite = new TestSuite();
// sink tests
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java b/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java
rename to luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
index dece473..16244ec 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedInputStreamTest.java b/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java
index 9cf8054..e787c67 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.PipedInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedOutputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java
index 183606e..bf2f703 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.PipedInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedReaderTest.java b/luni/src/test/java/tests/api/java/io/PipedReaderTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedReaderTest.java
rename to luni/src/test/java/tests/api/java/io/PipedReaderTest.java
index 6802540..fb42069 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/PipedReaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.PipedReader;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedWriterTest.java b/luni/src/test/java/tests/api/java/io/PipedWriterTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedWriterTest.java
rename to luni/src/test/java/tests/api/java/io/PipedWriterTest.java
index 99827a1..eb66e86 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/PipedWriterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.PipedReader;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintStreamTest.java b/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintStreamTest.java
rename to luni/src/test/java/tests/api/java/io/PrintStreamTest.java
index 19a63af..1b74059 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintWriterTest.java b/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintWriterTest.java
rename to luni/src/test/java/tests/api/java/io/PrintWriterTest.java
index 9c60406..8866212 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackInputStreamTest.java b/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java
index 8c56934..683d6f7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackReaderTest.java b/luni/src/test/java/tests/api/java/io/PushbackReaderTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackReaderTest.java
rename to luni/src/test/java/tests/api/java/io/PushbackReaderTest.java
index d49ee53..973c029 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/PushbackReaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.CharArrayReader;
import java.io.FilterReader;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/RandomAccessFileTest.java b/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/RandomAccessFileTest.java
rename to luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java
index f6784fb..4b37616 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/RandomAccessFileTest.java
+++ b/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.EOFException;
import java.io.File;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ReaderTest.java b/luni/src/test/java/tests/api/java/io/ReaderTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ReaderTest.java
rename to luni/src/test/java/tests/api/java/io/ReaderTest.java
index f2b1439..34f2599 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/ReaderTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.Reader;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SequenceInputStreamTest.java b/luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SequenceInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java
index e4608db..8ee97f3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SequenceInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest.java
rename to luni/src/test/java/tests/api/java/io/SerializationStressTest.java
index c6371ea..ef0e2ff 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest1.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java
rename to luni/src/test/java/tests/api/java/io/SerializationStressTest1.java
index df5f792..3b1f210 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest1.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.NotSerializableException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest2.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest2.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest2.java
rename to luni/src/test/java/tests/api/java/io/SerializationStressTest2.java
index 359050e..c3a388d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest2.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest2.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest3.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest3.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest3.java
rename to luni/src/test/java/tests/api/java/io/SerializationStressTest3.java
index 8087761..0d37c84 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest3.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest3.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest4.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest4.java
rename to luni/src/test/java/tests/api/java/io/SerializationStressTest4.java
index 1e569e8..1fcfe57 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest4.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import tests.support.Support_Proxy_I1;
import java.io.File;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationTestClass.java b/luni/src/test/java/tests/api/java/io/SerializationTestClass.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationTestClass.java
rename to luni/src/test/java/tests/api/java/io/SerializationTestClass.java
index d5770e7..32c4d0b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationTestClass.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationTestClass.java
@@ -1,4 +1,4 @@
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
public class SerializationTestClass implements java.io.Serializable {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamCorruptedExceptionTest.java b/luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamCorruptedExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java
index e9e6a70..20fce7f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamCorruptedExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.ObjectInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamTokenizerTest.java b/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamTokenizerTest.java
rename to luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java
index f4d4401..472fd5a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamTokenizerTest.java
+++ b/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayInputStream;
import java.io.CharArrayReader;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringBufferInputStreamTest.java b/luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringBufferInputStreamTest.java
rename to luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java
index 8ca4ca5..9adce09 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringBufferInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.StringBufferInputStream;
import java.io.UnsupportedEncodingException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringReaderTest.java b/luni/src/test/java/tests/api/java/io/StringReaderTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringReaderTest.java
rename to luni/src/test/java/tests/api/java/io/StringReaderTest.java
index 4d44d98..2e2f4cf 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/StringReaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.StringReader;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringWriterTest.java b/luni/src/test/java/tests/api/java/io/StringWriterTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringWriterTest.java
rename to luni/src/test/java/tests/api/java/io/StringWriterTest.java
index c3db539..dcb9a25 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/StringWriterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.StringWriter;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SyncFailedExceptionTest.java b/luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SyncFailedExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java
index 409561a..481d3d3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SyncFailedExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.File;
import java.io.FileDescriptor;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UTFDataFormatExceptionTest.java b/luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UTFDataFormatExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java
index cf5aa82..ecaa5bc 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UTFDataFormatExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UnsupportedEncodingExceptionTest.java b/luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UnsupportedEncodingExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java
index 82b2dfb..44c2fd5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UnsupportedEncodingExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriteAbortedExceptionTest.java b/luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriteAbortedExceptionTest.java
rename to luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java
index 1c3f1e3..1d270f6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriteAbortedExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.WriteAbortedException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTest.java b/luni/src/test/java/tests/api/java/io/WriterTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTest.java
rename to luni/src/test/java/tests/api/java/io/WriterTest.java
index d4c33ea..b161030 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/WriterTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import java.io.IOException;
import java.io.Writer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTesterTest.java b/luni/src/test/java/tests/api/java/io/WriterTesterTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTesterTest.java
rename to luni/src/test/java/tests/api/java/io/WriterTesterTest.java
index 0995638..e087fac 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTesterTest.java
+++ b/luni/src/test/java/tests/api/java/io/WriterTesterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.io;
+package tests.api.java.io;
import junit.framework.TestSuite;
import org.apache.harmony.testframework.CharSinkTester;
@@ -46,8 +46,7 @@
*/
public class WriterTesterTest {
- // TODO: Rewrite this test so that id doesn't need a suite().
- private static junit.framework.Test suite() {
+ public static junit.framework.Test suite() {
TestSuite suite = new TestSuite();
// sink tests
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.java b/luni/src/test/java/tests/api/java/lang/AbstractMethodErrorTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/AbstractMethodErrorTest.java
index 596792e..c30e68f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/AbstractMethodErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import org.apache.harmony.testframework.serialization.SerializationTest;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArithmeticExceptionTest.java b/luni/src/test/java/tests/api/java/lang/ArithmeticExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArithmeticExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/ArithmeticExceptionTest.java
index 77e0671..6ecf6ac 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArithmeticExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ArithmeticExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayIndexOutOfBoundsExceptionTest.java b/luni/src/test/java/tests/api/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
index 3561dd9..90ba03e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayStoreExceptionTest.java b/luni/src/test/java/tests/api/java/lang/ArrayStoreExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayStoreExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/ArrayStoreExceptionTest.java
index 0379769..fc323d4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayStoreExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ArrayStoreExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AssertionErrorTest.java b/luni/src/test/java/tests/api/java/lang/AssertionErrorTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AssertionErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/AssertionErrorTest.java
index 8b6c80d..c0c968c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AssertionErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/AssertionErrorTest.java
@@ -15,7 +15,7 @@
* the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/BooleanTest.java b/luni/src/test/java/tests/api/java/lang/BooleanTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/BooleanTest.java
rename to luni/src/test/java/tests/api/java/lang/BooleanTest.java
index a6dda7a..6bc6e83 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/BooleanTest.java
+++ b/luni/src/test/java/tests/api/java/lang/BooleanTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ByteTest.java b/luni/src/test/java/tests/api/java/lang/ByteTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ByteTest.java
rename to luni/src/test/java/tests/api/java/lang/ByteTest.java
index bbff653..ed1bee7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ByteTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ByteTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterImplTest.java b/luni/src/test/java/tests/api/java/lang/CharacterImplTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterImplTest.java
rename to luni/src/test/java/tests/api/java/lang/CharacterImplTest.java
index 4db5b82..2963d41 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterImplTest.java
+++ b/luni/src/test/java/tests/api/java/lang/CharacterImplTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java b/luni/src/test/java/tests/api/java/lang/CharacterTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java
rename to luni/src/test/java/tests/api/java/lang/CharacterTest.java
index a8bbe26..776ebf07 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java
+++ b/luni/src/test/java/tests/api/java/lang/CharacterTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_SubsetTest.java b/luni/src/test/java/tests/api/java/lang/Character_SubsetTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_SubsetTest.java
rename to luni/src/test/java/tests/api/java/lang/Character_SubsetTest.java
index 41408ec..7a271da 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_SubsetTest.java
+++ b/luni/src/test/java/tests/api/java/lang/Character_SubsetTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java b/luni/src/test/java/tests/api/java/lang/Character_UnicodeBlockTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java
rename to luni/src/test/java/tests/api/java/lang/Character_UnicodeBlockTest.java
index 7a85a3c..bc40b2c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java
+++ b/luni/src/test/java/tests/api/java/lang/Character_UnicodeBlockTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCastExceptionTest.java b/luni/src/test/java/tests/api/java/lang/ClassCastExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCastExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/ClassCastExceptionTest.java
index 2863bd6..4ed7c9a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCastExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ClassCastExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCircularityErrorTest.java b/luni/src/test/java/tests/api/java/lang/ClassCircularityErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCircularityErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/ClassCircularityErrorTest.java
index 54c5c4d..91499b6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCircularityErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ClassCircularityErrorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassFormatErrorTest.java b/luni/src/test/java/tests/api/java/lang/ClassFormatErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassFormatErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/ClassFormatErrorTest.java
index f811c9a..d8b3c15 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassFormatErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ClassFormatErrorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassLoaderTest.java b/luni/src/test/java/tests/api/java/lang/ClassLoaderTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassLoaderTest.java
rename to luni/src/test/java/tests/api/java/lang/ClassLoaderTest.java
index 1dba613..ff42cf0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassLoaderTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ClassLoaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
import java.io.InputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassNotFoundExceptionTest.java b/luni/src/test/java/tests/api/java/lang/ClassNotFoundExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassNotFoundExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/ClassNotFoundExceptionTest.java
index e199aa2..9a56281 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassNotFoundExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ClassNotFoundExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassTest.java b/luni/src/test/java/tests/api/java/lang/ClassTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassTest.java
rename to luni/src/test/java/tests/api/java/lang/ClassTest.java
index 4d540c4..0c57dde 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ClassTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.FileInputStream;
import java.io.InputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CloneNotSupportedExceptionTest.java b/luni/src/test/java/tests/api/java/lang/CloneNotSupportedExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CloneNotSupportedExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/CloneNotSupportedExceptionTest.java
index 0af1dbc..ec6a9fa 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CloneNotSupportedExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/CloneNotSupportedExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CompilerTest.java b/luni/src/test/java/tests/api/java/lang/CompilerTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CompilerTest.java
rename to luni/src/test/java/tests/api/java/lang/CompilerTest.java
index 8584ce4..027c99b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CompilerTest.java
+++ b/luni/src/test/java/tests/api/java/lang/CompilerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/DoubleTest.java b/luni/src/test/java/tests/api/java/lang/DoubleTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/DoubleTest.java
rename to luni/src/test/java/tests/api/java/lang/DoubleTest.java
index 79d81e8..b61d345 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/DoubleTest.java
+++ b/luni/src/test/java/tests/api/java/lang/DoubleTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.util.Locale;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumConstantNotPresentExceptionTest.java b/luni/src/test/java/tests/api/java/lang/EnumConstantNotPresentExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumConstantNotPresentExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/EnumConstantNotPresentExceptionTest.java
index e1d8085..86a589e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumConstantNotPresentExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/EnumConstantNotPresentExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java b/luni/src/test/java/tests/api/java/lang/EnumTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java
rename to luni/src/test/java/tests/api/java/lang/EnumTest.java
index 558929d..a044afe 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java
+++ b/luni/src/test/java/tests/api/java/lang/EnumTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.util.HashMap;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ErrorTest.java b/luni/src/test/java/tests/api/java/lang/ErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/ErrorTest.java
index f11cc64..ff44056 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionInInitializerErrorTest.java b/luni/src/test/java/tests/api/java/lang/ExceptionInInitializerErrorTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionInInitializerErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/ExceptionInInitializerErrorTest.java
index b2b034e..4fa6e53 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionInInitializerErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ExceptionInInitializerErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
public class ExceptionInInitializerErrorTest extends junit.framework.TestCase {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionTest.java b/luni/src/test/java/tests/api/java/lang/ExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/ExceptionTest.java
index 1a0f1e4..e66bb97 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/FloatTest.java b/luni/src/test/java/tests/api/java/lang/FloatTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/FloatTest.java
rename to luni/src/test/java/tests/api/java/lang/FloatTest.java
index db61f1c..d703356 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/FloatTest.java
+++ b/luni/src/test/java/tests/api/java/lang/FloatTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessErrorTest.java b/luni/src/test/java/tests/api/java/lang/IllegalAccessErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/IllegalAccessErrorTest.java
index 052bca2..94f912a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/IllegalAccessErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessExceptionTest.java b/luni/src/test/java/tests/api/java/lang/IllegalAccessExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/IllegalAccessExceptionTest.java
index eb3b021..61d6054 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/IllegalAccessExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.java b/luni/src/test/java/tests/api/java/lang/IllegalArgumentExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/IllegalArgumentExceptionTest.java
index c126f86..6003c9e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/IllegalArgumentExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalMonitorStateExceptionTest.java b/luni/src/test/java/tests/api/java/lang/IllegalMonitorStateExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalMonitorStateExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/IllegalMonitorStateExceptionTest.java
index 065b466..994e591 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalMonitorStateExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/IllegalMonitorStateExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.java b/luni/src/test/java/tests/api/java/lang/IllegalStateExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/IllegalStateExceptionTest.java
index e02ae18..02100c0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/IllegalStateExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalThreadStateExceptionTest.java b/luni/src/test/java/tests/api/java/lang/IllegalThreadStateExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalThreadStateExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/IllegalThreadStateExceptionTest.java
index c1c3763..4497471 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalThreadStateExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/IllegalThreadStateExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IncompatibleClassChangeErrorTest.java b/luni/src/test/java/tests/api/java/lang/IncompatibleClassChangeErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IncompatibleClassChangeErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/IncompatibleClassChangeErrorTest.java
index a8ef32f..5bd8789 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IncompatibleClassChangeErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/IncompatibleClassChangeErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IndexOutOfBoundsExceptionTest.java b/luni/src/test/java/tests/api/java/lang/IndexOutOfBoundsExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IndexOutOfBoundsExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/IndexOutOfBoundsExceptionTest.java
index 7093d4e..3414838 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IndexOutOfBoundsExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/IndexOutOfBoundsExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InheritableThreadLocalTest.java b/luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InheritableThreadLocalTest.java
rename to luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java
index d693acd..2ea8dea 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InheritableThreadLocalTest.java
+++ b/luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationErrorTest.java b/luni/src/test/java/tests/api/java/lang/InstantiationErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/InstantiationErrorTest.java
index a069dba..8655dad 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/InstantiationErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationExceptionTest.java b/luni/src/test/java/tests/api/java/lang/InstantiationExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/InstantiationExceptionTest.java
index 757b209..1be39ab 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/InstantiationExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IntegerTest.java b/luni/src/test/java/tests/api/java/lang/IntegerTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IntegerTest.java
rename to luni/src/test/java/tests/api/java/lang/IntegerTest.java
index 3c7faa3..f80107f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IntegerTest.java
+++ b/luni/src/test/java/tests/api/java/lang/IntegerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.util.Properties;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InternalErrorTest.java b/luni/src/test/java/tests/api/java/lang/InternalErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InternalErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/InternalErrorTest.java
index d2ea2de..fff163a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InternalErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/InternalErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InterruptedExceptionTest.java b/luni/src/test/java/tests/api/java/lang/InterruptedExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InterruptedExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/InterruptedExceptionTest.java
index ecaac75..47066b7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InterruptedExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/InterruptedExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LinkageErrorTest.java b/luni/src/test/java/tests/api/java/lang/LinkageErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LinkageErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/LinkageErrorTest.java
index 33ecc16..efd27f5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LinkageErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/LinkageErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LongTest.java b/luni/src/test/java/tests/api/java/lang/LongTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LongTest.java
rename to luni/src/test/java/tests/api/java/lang/LongTest.java
index 9da75cf..2a1d082 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LongTest.java
+++ b/luni/src/test/java/tests/api/java/lang/LongTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.util.Properties;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MathTest.java b/luni/src/test/java/tests/api/java/lang/MathTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MathTest.java
rename to luni/src/test/java/tests/api/java/lang/MathTest.java
index cd38545..1920080 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MathTest.java
+++ b/luni/src/test/java/tests/api/java/lang/MathTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
public class MathTest extends junit.framework.TestCase {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum.java b/luni/src/test/java/tests/api/java/lang/MockEnum.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum.java
rename to luni/src/test/java/tests/api/java/lang/MockEnum.java
index 94260c4..ed6c69b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum.java
+++ b/luni/src/test/java/tests/api/java/lang/MockEnum.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.Serializable;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum2.java b/luni/src/test/java/tests/api/java/lang/MockEnum2.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum2.java
rename to luni/src/test/java/tests/api/java/lang/MockEnum2.java
index 1dc5341..229d106 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum2.java
+++ b/luni/src/test/java/tests/api/java/lang/MockEnum2.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.Serializable;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NegativeArraySizeExceptionTest.java b/luni/src/test/java/tests/api/java/lang/NegativeArraySizeExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NegativeArraySizeExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/NegativeArraySizeExceptionTest.java
index 1717f3a..3c5f124 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NegativeArraySizeExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/NegativeArraySizeExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoClassDefFoundErrorTest.java b/luni/src/test/java/tests/api/java/lang/NoClassDefFoundErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoClassDefFoundErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/NoClassDefFoundErrorTest.java
index 9421a73..98d66f2 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoClassDefFoundErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/NoClassDefFoundErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldErrorTest.java b/luni/src/test/java/tests/api/java/lang/NoSuchFieldErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/NoSuchFieldErrorTest.java
index e405599..21d4ff1 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/NoSuchFieldErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldExceptionTest.java b/luni/src/test/java/tests/api/java/lang/NoSuchFieldExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/NoSuchFieldExceptionTest.java
index 5562669..4d52601 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/NoSuchFieldExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodErrorTest.java b/luni/src/test/java/tests/api/java/lang/NoSuchMethodErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/NoSuchMethodErrorTest.java
index 1367e03..e47349a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/NoSuchMethodErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodExceptionTest.java b/luni/src/test/java/tests/api/java/lang/NoSuchMethodExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/NoSuchMethodExceptionTest.java
index 7bd9e0a..e500909 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/NoSuchMethodExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NullPointerExceptionTest.java b/luni/src/test/java/tests/api/java/lang/NullPointerExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NullPointerExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/NullPointerExceptionTest.java
index 9c4a72b..7a0fb82 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NullPointerExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/NullPointerExceptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberFormatExceptionTest.java b/luni/src/test/java/tests/api/java/lang/NumberFormatExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberFormatExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/NumberFormatExceptionTest.java
index 614c51b..329969b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberFormatExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/NumberFormatExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberTest.java b/luni/src/test/java/tests/api/java/lang/NumberTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberTest.java
rename to luni/src/test/java/tests/api/java/lang/NumberTest.java
index 809a31a..7ecdda4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberTest.java
+++ b/luni/src/test/java/tests/api/java/lang/NumberTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
public class NumberTest extends junit.framework.TestCase {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ObjectTest.java b/luni/src/test/java/tests/api/java/lang/ObjectTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ObjectTest.java
rename to luni/src/test/java/tests/api/java/lang/ObjectTest.java
index 9dca8e9..e3d0b19 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ObjectTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ObjectTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
public class ObjectTest extends junit.framework.TestCase {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/OutOfMemoryErrorTest.java b/luni/src/test/java/tests/api/java/lang/OutOfMemoryErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/OutOfMemoryErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/OutOfMemoryErrorTest.java
index b962455..3eb7562e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/OutOfMemoryErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/OutOfMemoryErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
public class OutOfMemoryErrorTest extends junit.framework.TestCase {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Process2Test.java b/luni/src/test/java/tests/api/java/lang/Process2Test.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Process2Test.java
rename to luni/src/test/java/tests/api/java/lang/Process2Test.java
index 649488c..5d18d61 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Process2Test.java
+++ b/luni/src/test/java/tests/api/java/lang/Process2Test.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import dalvik.annotation.AndroidOnly;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessBuilderTest.java b/luni/src/test/java/tests/api/java/lang/ProcessBuilderTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessBuilderTest.java
rename to luni/src/test/java/tests/api/java/lang/ProcessBuilderTest.java
index 87cf88c..74e51f4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessBuilderTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ProcessBuilderTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
import java.io.File;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java b/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java
rename to luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java
index 3930b59..99e1df3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import dalvik.annotation.BrokenTest;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java b/luni/src/test/java/tests/api/java/lang/ProcessTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java
rename to luni/src/test/java/tests/api/java/lang/ProcessTest.java
index b87105b..2a8e0bd 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ProcessTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.File;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeExceptionTest.java b/luni/src/test/java/tests/api/java/lang/RuntimeExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/RuntimeExceptionTest.java
index 748118a..9d073e3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/RuntimeExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeTest.java b/luni/src/test/java/tests/api/java/lang/RuntimeTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeTest.java
rename to luni/src/test/java/tests/api/java/lang/RuntimeTest.java
index 08a4fa9..5a75c73 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeTest.java
+++ b/luni/src/test/java/tests/api/java/lang/RuntimeTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.IOException;
import java.io.InputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SecurityExceptionTest.java b/luni/src/test/java/tests/api/java/lang/SecurityExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SecurityExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/SecurityExceptionTest.java
index a0d1cee..fb63ef8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SecurityExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/SecurityExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ShortTest.java b/luni/src/test/java/tests/api/java/lang/ShortTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ShortTest.java
rename to luni/src/test/java/tests/api/java/lang/ShortTest.java
index bf747e7..8cbe385 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ShortTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ShortTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StackOverflowErrorTest.java b/luni/src/test/java/tests/api/java/lang/StackOverflowErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StackOverflowErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/StackOverflowErrorTest.java
index b3f6f82..1e81ab6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StackOverflowErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/StackOverflowErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StrictMathTest.java b/luni/src/test/java/tests/api/java/lang/StrictMathTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StrictMathTest.java
rename to luni/src/test/java/tests/api/java/lang/StrictMathTest.java
index cce8935..8141b2c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StrictMathTest.java
+++ b/luni/src/test/java/tests/api/java/lang/StrictMathTest.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
-import static org.apache.harmony.tests.java.lang.MathTest.COPYSIGN_DD_CASES;
-import static org.apache.harmony.tests.java.lang.MathTest.COPYSIGN_FF_CASES;
-import static org.apache.harmony.tests.java.lang.MathTest.GETEXPONENT_D_CASES;
-import static org.apache.harmony.tests.java.lang.MathTest.GETEXPONENT_D_RESULTS;
-import static org.apache.harmony.tests.java.lang.MathTest.GETEXPONENT_F_CASES;
-import static org.apache.harmony.tests.java.lang.MathTest.GETEXPONENT_F_RESULTS;
-import static org.apache.harmony.tests.java.lang.MathTest.NEXTAFTER_DD_START_CASES;
-import static org.apache.harmony.tests.java.lang.MathTest.NEXTAFTER_DD_FD_DIRECTION_CASES;
-import static org.apache.harmony.tests.java.lang.MathTest.NEXTAFTER_FD_START_CASES;
+import static tests.api.java.lang.MathTest.COPYSIGN_DD_CASES;
+import static tests.api.java.lang.MathTest.COPYSIGN_FF_CASES;
+import static tests.api.java.lang.MathTest.GETEXPONENT_D_CASES;
+import static tests.api.java.lang.MathTest.GETEXPONENT_D_RESULTS;
+import static tests.api.java.lang.MathTest.GETEXPONENT_F_CASES;
+import static tests.api.java.lang.MathTest.GETEXPONENT_F_RESULTS;
+import static tests.api.java.lang.MathTest.NEXTAFTER_DD_START_CASES;
+import static tests.api.java.lang.MathTest.NEXTAFTER_DD_FD_DIRECTION_CASES;
+import static tests.api.java.lang.MathTest.NEXTAFTER_FD_START_CASES;
public class StrictMathTest extends junit.framework.TestCase {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/String2Test.java b/luni/src/test/java/tests/api/java/lang/String2Test.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/String2Test.java
rename to luni/src/test/java/tests/api/java/lang/String2Test.java
index eecc601..cb13954 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/String2Test.java
+++ b/luni/src/test/java/tests/api/java/lang/String2Test.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.UnsupportedEncodingException;
import java.util.Locale;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuffer2Test.java b/luni/src/test/java/tests/api/java/lang/StringBuffer2Test.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuffer2Test.java
rename to luni/src/test/java/tests/api/java/lang/StringBuffer2Test.java
index 7e8144b..1240ba8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuffer2Test.java
+++ b/luni/src/test/java/tests/api/java/lang/StringBuffer2Test.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
public class StringBuffer2Test extends junit.framework.TestCase {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBufferTest.java b/luni/src/test/java/tests/api/java/lang/StringBufferTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBufferTest.java
rename to luni/src/test/java/tests/api/java/lang/StringBufferTest.java
index 112e005..0cd8f63 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBufferTest.java
+++ b/luni/src/test/java/tests/api/java/lang/StringBufferTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.Serializable;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuilderTest.java b/luni/src/test/java/tests/api/java/lang/StringBuilderTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuilderTest.java
rename to luni/src/test/java/tests/api/java/lang/StringBuilderTest.java
index febdfc4..b634ddf 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuilderTest.java
+++ b/luni/src/test/java/tests/api/java/lang/StringBuilderTest.java
@@ -15,7 +15,7 @@
* the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.Serializable;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringIndexOutOfBoundsExceptionTest.java b/luni/src/test/java/tests/api/java/lang/StringIndexOutOfBoundsExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringIndexOutOfBoundsExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/StringIndexOutOfBoundsExceptionTest.java
index 6bdaa3a..1c26c7d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringIndexOutOfBoundsExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/StringIndexOutOfBoundsExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java b/luni/src/test/java/tests/api/java/lang/StringTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java
rename to luni/src/test/java/tests/api/java/lang/StringTest.java
index 1b3659d..1cd92b1 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java
+++ b/luni/src/test/java/tests/api/java/lang/StringTest.java
@@ -15,7 +15,7 @@
* the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Constructor;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SystemTest.java b/luni/src/test/java/tests/api/java/lang/SystemTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SystemTest.java
rename to luni/src/test/java/tests/api/java/lang/SystemTest.java
index 05a02c3..cb0d564 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SystemTest.java
+++ b/luni/src/test/java/tests/api/java/lang/SystemTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadDeathTest.java b/luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java
similarity index 95%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadDeathTest.java
rename to luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java
index 1d21dd3..0c7fff3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadDeathTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
public class ThreadDeathTest extends junit.framework.TestCase {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadGroupTest.java b/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadGroupTest.java
rename to luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java
index dbf2e22..a3c9761 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadGroupTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.util.Vector;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadLocalTest.java b/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadLocalTest.java
rename to luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java
index 400ff01..a0902d8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadLocalTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadTest.java b/luni/src/test/java/tests/api/java/lang/ThreadTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadTest.java
rename to luni/src/test/java/tests/api/java/lang/ThreadTest.java
index 956e1a4..67ab645 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ThreadTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.lang.Thread.UncaughtExceptionHandler;
import java.util.Map;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThrowableTest.java b/luni/src/test/java/tests/api/java/lang/ThrowableTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThrowableTest.java
rename to luni/src/test/java/tests/api/java/lang/ThrowableTest.java
index dbe656f..0a7f02d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThrowableTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ThrowableTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/TypeNotPresentExceptionTest.java b/luni/src/test/java/tests/api/java/lang/TypeNotPresentExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/TypeNotPresentExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/TypeNotPresentExceptionTest.java
index 3f14e34..4b93ab6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/TypeNotPresentExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/TypeNotPresentExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnknownErrorTest.java b/luni/src/test/java/tests/api/java/lang/UnknownErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnknownErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/UnknownErrorTest.java
index 8ec96a4..b6e3406 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnknownErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/UnknownErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsatisfiedLinkErrorTest.java b/luni/src/test/java/tests/api/java/lang/UnsatisfiedLinkErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsatisfiedLinkErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/UnsatisfiedLinkErrorTest.java
index d6e06db..c3e2c9b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsatisfiedLinkErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/UnsatisfiedLinkErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedClassVersionErrorTest.java b/luni/src/test/java/tests/api/java/lang/UnsupportedClassVersionErrorTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedClassVersionErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/UnsupportedClassVersionErrorTest.java
index dcf09b8..1b606ba 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedClassVersionErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/UnsupportedClassVersionErrorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.java b/luni/src/test/java/tests/api/java/lang/UnsupportedOperationExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/UnsupportedOperationExceptionTest.java
index 73cf5e6..6d52e7f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/UnsupportedOperationExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VerifyErrorTest.java b/luni/src/test/java/tests/api/java/lang/VerifyErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VerifyErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/VerifyErrorTest.java
index 874ac57..9de5e19 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VerifyErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/VerifyErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VirtualMachineErrorTest.java b/luni/src/test/java/tests/api/java/lang/VirtualMachineErrorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VirtualMachineErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/VirtualMachineErrorTest.java
index 60ed446..a49e481 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VirtualMachineErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/VirtualMachineErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package tests.api.java.lang;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/PhantomReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/PhantomReferenceTest.java
rename to luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java
index 5a80fde..6470579 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/PhantomReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.ref;
+package tests.api.java.lang.ref;
import java.lang.ref.PhantomReference;
import java.lang.ref.Reference;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java b/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java
rename to luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java
index ba28541..cad61b3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.ref;
+package tests.api.java.lang.ref;
import java.lang.ref.PhantomReference;
import java.lang.ref.Reference;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceTest.java
rename to luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java
index 031502d..7461b47 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.ref;
+package tests.api.java.lang.ref;
import java.lang.ref.PhantomReference;
import java.lang.ref.Reference;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/SoftReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/SoftReferenceTest.java
rename to luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java
index cfc5d0d..197d829 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/SoftReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.ref;
+package tests.api.java.lang.ref;
import dalvik.annotation.SideEffect;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/WeakReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/WeakReferenceTest.java
rename to luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java
index c881248..2bddc1b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/WeakReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.ref;
+package tests.api.java.lang.ref;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/AccessibleObjectTest.java b/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/AccessibleObjectTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java
index 60432d7..41c9798 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/AccessibleObjectTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ArrayTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ArrayTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
index 98dd034..d9e05fb 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ArrayTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.Array;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/BoundedGenericMethodsTests.java b/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/BoundedGenericMethodsTests.java
rename to luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java
index 130aa72..7949a30 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/BoundedGenericMethodsTests.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ConstructorTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ConstructorTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java
index ec133aa..932315c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ConstructorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
@@ -26,6 +26,7 @@
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@@ -164,13 +165,13 @@
.getConstructor(Object.class, Object.class);
assertEquals(
"Wrong generic string returned",
- "public org.apache.harmony.tests.java.lang.reflect.ConstructorTest$GenericConstructorTestHelper(T,S)",
+ "public tests.api.java.lang.reflect.ConstructorTest$GenericConstructorTestHelper(T,S)",
genericCtor.toGenericString());
Constructor<GenericConstructorTestHelper> ctor = GenericConstructorTestHelper.class
.getConstructor();
assertEquals(
"Wrong generic string returned",
- "public org.apache.harmony.tests.java.lang.reflect.ConstructorTest$GenericConstructorTestHelper() throws E",
+ "public tests.api.java.lang.reflect.ConstructorTest$GenericConstructorTestHelper() throws E",
ctor.toGenericString());
}
@@ -264,7 +265,7 @@
ctor
.getName()
.equals(
- "org.apache.harmony.tests.java.lang.reflect.ConstructorTest$ConstructorTestHelper"));
+ "tests.api.java.lang.reflect.ConstructorTest$ConstructorTestHelper"));
} catch (Exception e) {
fail("Exception obtaining contructor : " + e.getMessage());
}
@@ -404,7 +405,7 @@
ctor
.toString()
.equals(
- "public org.apache.harmony.tests.java.lang.reflect.ConstructorTest$ConstructorTestHelper(java.lang.Object)"));
+ "public tests.api.java.lang.reflect.ConstructorTest$ConstructorTestHelper(java.lang.Object)"));
}
public void test_getConstructor() throws Exception {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/FieldTest.java b/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/FieldTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java
index adff3bc..a1ca151 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/FieldTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import tests.support.Support_Field;
@@ -1752,7 +1752,7 @@
fail("Exception getting field : " + e.getMessage());
}
assertEquals("Field returned incorrect string",
- "private static final int org.apache.harmony.tests.java.lang.reflect.FieldTest$TestField.x",
+ "private static final int tests.api.java.lang.reflect.FieldTest$TestField.x",
f.toString());
}
@@ -1822,20 +1822,20 @@
public void test_toGenericString() throws Exception {
Field field = GenericField.class.getDeclaredField("field");
assertEquals("Wrong generic string returned",
- "S org.apache.harmony.tests.java.lang.reflect.FieldTest$GenericField.field",
+ "S tests.api.java.lang.reflect.FieldTest$GenericField.field",
field.toGenericString());
Field boundedField = GenericField.class
.getDeclaredField("boundedField");
assertEquals(
"Wrong generic string returned",
- "T org.apache.harmony.tests.java.lang.reflect.FieldTest$GenericField.boundedField",
+ "T tests.api.java.lang.reflect.FieldTest$GenericField.boundedField",
boundedField.toGenericString());
Field ordinary = GenericField.class.getDeclaredField("intField");
assertEquals(
"Wrong generic string returned",
- "int org.apache.harmony.tests.java.lang.reflect.FieldTest$GenericField.intField",
+ "int tests.api.java.lang.reflect.FieldTest$GenericField.intField",
ordinary.toGenericString());
}
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericArrayTypeTest.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericArrayTypeTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java
index 4888fd2..e48e584 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericArrayTypeTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.Field;
import java.lang.reflect.GenericArrayType;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericMethodsTests.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericMethodsTests.java
rename to luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java
index a209b21..0bfc188 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericMethodsTests.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.Method;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericReflectionTestsBase.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericReflectionTestsBase.java
rename to luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java
index c08fef4..095bb72 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericReflectionTestsBase.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.Method;
import java.lang.reflect.TypeVariable;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericSignatureFormatErrorTest.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java
similarity index 93%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericSignatureFormatErrorTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java
index 9cd4947..954073c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericSignatureFormatErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java
@@ -1,4 +1,4 @@
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import dalvik.annotation.AndroidOnly;
import dalvik.annotation.SideEffect;
@@ -27,7 +27,7 @@
// System.out.println("GenericSignatureFormatErrorTest:"
// +tf.getAbsolutePath()+", canRead: "+tf.canRead()
// +", canWrite: "+tf.canWrite());
- InputStream is = this.getClass().getResourceAsStream("/resources/dex1.bytes");
+ InputStream is = this.getClass().getResourceAsStream("dex1.bytes");
assertNotNull(is);
}
@@ -58,7 +58,7 @@
// System.out.println("GenericSignatureFormatErrorTest:" +
// tf.getAbsolutePath() + ", canRead: " + tf.canRead() +
// ", canWrite: "+tf.canWrite());
- InputStream is = this.getClass().getResourceAsStream("/resources/dex1.bytes");
+ InputStream is = this.getClass().getResourceAsStream("dex1.bytes");
assertNotNull(is);
OutputStream fos = new FileOutputStream(tf);
copy(is, fos);
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/InvocationTargetExceptionTest.java b/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/InvocationTargetExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java
index 3911447..5e699a9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/InvocationTargetExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.io.ByteArrayOutputStream;
import java.io.CharArrayWriter;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java b/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
similarity index 95%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
index 04266d5..91342dc 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.MalformedParameterizedTypeException;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java b/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
similarity index 93%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
rename to luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
index 79ce85e..f86403d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
@@ -1,4 +1,4 @@
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.Constructor;
import java.lang.reflect.MalformedParameterizedTypeException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MethodTest.java b/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MethodTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java
index 9f4f69e..e8288d6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MethodTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
@@ -183,7 +183,7 @@
static class GenericString<T> {
public static final String GENERIC =
- "T org.apache.harmony.tests.java.lang.reflect.MethodTest$GenericString.genericString(T)";
+ "T tests.api.java.lang.reflect.MethodTest$GenericString.genericString(T)";
T genericString(T t) {
return null;
}
@@ -862,7 +862,7 @@
mth
.toString()
.equals(
- "public static final void org.apache.harmony.tests.java.lang.reflect.MethodTest$TestMethod.printTest(int,short,java.lang.String,boolean,java.lang.Object,long,byte,char,double,float)"));
+ "public static final void tests.api.java.lang.reflect.MethodTest$TestMethod.printTest(int,short,java.lang.String,boolean,java.lang.Object,long,byte,char,double,float)"));
}
/**
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ModifierTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ModifierTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java
index 71c207f..6e844f6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ModifierTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.Modifier;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ParameterizedTypeTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ParameterizedTypeTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java
index 3b2614e..fcb9042 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ParameterizedTypeTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ProxyTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ProxyTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java
index 86383bd..5e5cc73 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ProxyTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import tests.support.Support_Proxy_I1;
import tests.support.Support_Proxy_I2;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/TypeVariableTest.java b/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/TypeVariableTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java
index d1c7ea9..cc22852 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/TypeVariableTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.io.Serializable;
import java.lang.reflect.Constructor;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTest.java b/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTest.java
index 9f3679e..b5ad350 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.UndeclaredThrowableException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTests.java b/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTests.java
rename to luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java
index 2112ed7..8fd2ff3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTests.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java
@@ -1,4 +1,4 @@
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/WildcardTypeTest.java b/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/WildcardTypeTest.java
rename to luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java
index e29fd47..9f8baeb 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/WildcardTypeTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang.reflect;
+package tests.api.java.lang.reflect;
import java.lang.reflect.Method;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/MathContextTest.java b/luni/src/test/java/tests/api/java/math/MathContextTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/math/MathContextTest.java
rename to luni/src/test/java/tests/api/java/math/MathContextTest.java
index d9942d3..9e04342 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/MathContextTest.java
+++ b/luni/src/test/java/tests/api/java/math/MathContextTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.math;
+package tests.api.java.math;
import java.math.BigDecimal;
import java.math.MathContext;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/OldBigIntegerTest.java b/luni/src/test/java/tests/api/java/math/OldBigIntegerTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/math/OldBigIntegerTest.java
rename to luni/src/test/java/tests/api/java/math/OldBigIntegerTest.java
index 7d1f1b4..167ebe8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/OldBigIntegerTest.java
+++ b/luni/src/test/java/tests/api/java/math/OldBigIntegerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.math;
+package tests.api.java.math;
import java.math.BigInteger;
import java.util.Random;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/RoundingModeTest.java b/luni/src/test/java/tests/api/java/math/RoundingModeTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/math/RoundingModeTest.java
rename to luni/src/test/java/tests/api/java/math/RoundingModeTest.java
index 4004ca3..50a77df 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/RoundingModeTest.java
+++ b/luni/src/test/java/tests/api/java/math/RoundingModeTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.math;
+package tests.api.java.math;
import java.math.BigDecimal;
import java.math.RoundingMode;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/AuthenticatorTest.java b/luni/src/test/java/tests/api/java/net/AuthenticatorTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/AuthenticatorTest.java
rename to luni/src/test/java/tests/api/java/net/AuthenticatorTest.java
index a0bd40f..3c5f92b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/AuthenticatorTest.java
+++ b/luni/src/test/java/tests/api/java/net/AuthenticatorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.io.InputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/BindExceptionTest.java b/luni/src/test/java/tests/api/java/net/BindExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/BindExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/BindExceptionTest.java
index 799211e..e1eb401 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/BindExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/BindExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.BindException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ConnectExceptionTest.java b/luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ConnectExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java
index 3c69890..12d37e3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ConnectExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.ConnectException;
import java.net.InetAddress;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieHandlerTest.java b/luni/src/test/java/tests/api/java/net/CookieHandlerTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieHandlerTest.java
rename to luni/src/test/java/tests/api/java/net/CookieHandlerTest.java
index 3cefc85..9f1f4fe 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieHandlerTest.java
+++ b/luni/src/test/java/tests/api/java/net/CookieHandlerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.net.CookieHandler;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieManagerTest.java b/luni/src/test/java/tests/api/java/net/CookieManagerTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieManagerTest.java
rename to luni/src/test/java/tests/api/java/net/CookieManagerTest.java
index c96a407..bbf699c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieManagerTest.java
+++ b/luni/src/test/java/tests/api/java/net/CookieManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import junit.framework.TestCase;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookiePolicyTest.java b/luni/src/test/java/tests/api/java/net/CookiePolicyTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookiePolicyTest.java
rename to luni/src/test/java/tests/api/java/net/CookiePolicyTest.java
index 61eff1e..b88d356 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookiePolicyTest.java
+++ b/luni/src/test/java/tests/api/java/net/CookiePolicyTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.CookiePolicy;
import java.net.HttpCookie;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieStoreTest.java b/luni/src/test/java/tests/api/java/net/CookieStoreTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieStoreTest.java
rename to luni/src/test/java/tests/api/java/net/CookieStoreTest.java
index d437802..13e0a0a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieStoreTest.java
+++ b/luni/src/test/java/tests/api/java/net/CookieStoreTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import junit.framework.TestCase;
import java.net.CookieManager;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramPacketTest.java b/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramPacketTest.java
rename to luni/src/test/java/tests/api/java/net/DatagramPacketTest.java
index 2730b85..e6ced7e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramPacketTest.java
+++ b/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.net.DatagramPacket;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketImplTest.java b/luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketImplTest.java
rename to luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java
index e94a963..57cafbf 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketImplTest.java
+++ b/luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.FileDescriptor;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java b/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java
rename to luni/src/test/java/tests/api/java/net/DatagramSocketTest.java
index 776b484..74c9042 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java
+++ b/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.io.InterruptedIOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java b/luni/src/test/java/tests/api/java/net/HttpCookieTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
rename to luni/src/test/java/tests/api/java/net/HttpCookieTest.java
index 172ef8e..3cd30f8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
+++ b/luni/src/test/java/tests/api/java/net/HttpCookieTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import junit.framework.TestCase;
import java.net.HttpCookie;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/IDNTest.java b/luni/src/test/java/tests/api/java/net/IDNTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/IDNTest.java
rename to luni/src/test/java/tests/api/java/net/IDNTest.java
index dfd4d66..534fb6e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/IDNTest.java
+++ b/luni/src/test/java/tests/api/java/net/IDNTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.IDN;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet4AddressTest.java b/luni/src/test/java/tests/api/java/net/Inet4AddressTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet4AddressTest.java
rename to luni/src/test/java/tests/api/java/net/Inet4AddressTest.java
index 94df634..87fb6df 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet4AddressTest.java
+++ b/luni/src/test/java/tests/api/java/net/Inet4AddressTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.Serializable;
import java.net.Inet4Address;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java b/luni/src/test/java/tests/api/java/net/Inet6AddressTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java
rename to luni/src/test/java/tests/api/java/net/Inet6AddressTest.java
index 77b8405..ee62fd9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java
+++ b/luni/src/test/java/tests/api/java/net/Inet6AddressTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.Serializable;
import java.net.Inet6Address;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java b/luni/src/test/java/tests/api/java/net/InetAddressTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java
rename to luni/src/test/java/tests/api/java/net/InetAddressTest.java
index 959f83c..520b795 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java
+++ b/luni/src/test/java/tests/api/java/net/InetAddressTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.io.Serializable;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressThreadTest.java b/luni/src/test/java/tests/api/java/net/InetAddressThreadTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressThreadTest.java
rename to luni/src/test/java/tests/api/java/net/InetAddressThreadTest.java
index 840f28e..0de7f23 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressThreadTest.java
+++ b/luni/src/test/java/tests/api/java/net/InetAddressThreadTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.InetAddress;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetSocketAddressTest.java b/luni/src/test/java/tests/api/java/net/InetSocketAddressTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetSocketAddressTest.java
rename to luni/src/test/java/tests/api/java/net/InetSocketAddressTest.java
index 916ee3e..bb04040 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetSocketAddressTest.java
+++ b/luni/src/test/java/tests/api/java/net/InetSocketAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.Serializable;
import java.net.InetSocketAddress;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InterfaceAddressTest.java b/luni/src/test/java/tests/api/java/net/InterfaceAddressTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InterfaceAddressTest.java
rename to luni/src/test/java/tests/api/java/net/InterfaceAddressTest.java
index c4c2b90..625283c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InterfaceAddressTest.java
+++ b/luni/src/test/java/tests/api/java/net/InterfaceAddressTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.Inet4Address;
import java.net.Inet6Address;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/JarURLConnectionTest.java b/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/JarURLConnectionTest.java
rename to luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
index 0b946c1a..3c904dd 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/JarURLConnectionTest.java
+++ b/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import tests.support.resource.Support_Resources;
import java.io.BufferedOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MalformedURLExceptionTest.java b/luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MalformedURLExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java
index d5c2287..1e8364b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MalformedURLExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java b/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java
rename to luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
index b8444a4..064b1d7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java
+++ b/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.net.BindException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NetworkInterfaceTest.java b/luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NetworkInterfaceTest.java
rename to luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java
index 2a93f12..e377083 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NetworkInterfaceTest.java
+++ b/luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.InetAddress;
import java.net.InterfaceAddress;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NoRouteToHostExceptionTest.java b/luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NoRouteToHostExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java
index 89fe4fd..bddd414 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NoRouteToHostExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.NoRouteToHostException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/PasswordAuthenticationTest.java b/luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/PasswordAuthenticationTest.java
rename to luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java
index bbb3011..732941c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/PasswordAuthenticationTest.java
+++ b/luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.PasswordAuthentication;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProtocolExceptionTest.java b/luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProtocolExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java
index d0fe2d9..fecf678 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProtocolExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.ProtocolException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxySelectorTest.java b/luni/src/test/java/tests/api/java/net/ProxySelectorTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxySelectorTest.java
rename to luni/src/test/java/tests/api/java/net/ProxySelectorTest.java
index 3a3bbfe..995ffef 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxySelectorTest.java
+++ b/luni/src/test/java/tests/api/java/net/ProxySelectorTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.net.InetSocketAddress;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxyTest.java b/luni/src/test/java/tests/api/java/net/ProxyTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxyTest.java
rename to luni/src/test/java/tests/api/java/net/ProxyTest.java
index 0487537..f004683 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxyTest.java
+++ b/luni/src/test/java/tests/api/java/net/ProxyTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.InetSocketAddress;
import java.net.Proxy;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ResponseCacheTest.java b/luni/src/test/java/tests/api/java/net/ResponseCacheTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ResponseCacheTest.java
rename to luni/src/test/java/tests/api/java/net/ResponseCacheTest.java
index 4e79e4a..51d7f6d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ResponseCacheTest.java
+++ b/luni/src/test/java/tests/api/java/net/ResponseCacheTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.net.CacheRequest;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SecureCacheResponseTest.java b/luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SecureCacheResponseTest.java
rename to luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java
index ab78d65..b7babe7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SecureCacheResponseTest.java
+++ b/luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.io.InputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ServerSocketTest.java b/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ServerSocketTest.java
rename to luni/src/test/java/tests/api/java/net/ServerSocketTest.java
index efec70f..c0e2496 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ServerSocketTest.java
+++ b/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import tests.support.Support_Configuration;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketExceptionTest.java b/luni/src/test/java/tests/api/java/net/SocketExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/SocketExceptionTest.java
index 32c9eb8..8f54494 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.SocketException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketImplTest.java b/luni/src/test/java/tests/api/java/net/SocketImplTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketImplTest.java
rename to luni/src/test/java/tests/api/java/net/SocketImplTest.java
index f6122e5..0be87b6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketImplTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketImplTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.FileDescriptor;
import java.io.IOException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTest.java b/luni/src/test/java/tests/api/java/net/SocketTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTest.java
rename to luni/src/test/java/tests/api/java/net/SocketTest.java
index 53cbab1..fafc80c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.io.InputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.java b/luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java
index 14b813c..76193e2 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.SocketTimeoutException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/TestServerSocketInit.java b/luni/src/test/java/tests/api/java/net/TestServerSocketInit.java
similarity index 95%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/TestServerSocketInit.java
rename to luni/src/test/java/tests/api/java/net/TestServerSocketInit.java
index 31aa5b6..5727d7e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/TestServerSocketInit.java
+++ b/luni/src/test/java/tests/api/java/net/TestServerSocketInit.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.IOException;
import java.net.ServerSocket;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URISyntaxExceptionTest.java b/luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URISyntaxExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java
index ff8ac40..9a06d06 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URISyntaxExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.URISyntaxException;
import java.util.Locale;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URITest.java b/luni/src/test/java/tests/api/java/net/URITest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URITest.java
rename to luni/src/test/java/tests/api/java/net/URITest.java
index f81c975..51ae52f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URITest.java
+++ b/luni/src/test/java/tests/api/java/net/URITest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.MalformedURLException;
import java.net.URI;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLDecoderTest.java b/luni/src/test/java/tests/api/java/net/URLDecoderTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLDecoderTest.java
rename to luni/src/test/java/tests/api/java/net/URLDecoderTest.java
index f0a8a6d..d0489d5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/net/URLDecoderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLTest.java b/luni/src/test/java/tests/api/java/net/URLTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLTest.java
rename to luni/src/test/java/tests/api/java/net/URLTest.java
index 3502e72..fb3ff2f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLTest.java
+++ b/luni/src/test/java/tests/api/java/net/URLTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import junit.framework.TestCase;
import tests.support.resource.Support_Resources;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownHostExceptionTest.java b/luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownHostExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java
index 6d881e7..d113e92 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownHostExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.UnknownHostException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownServiceExceptionTest.java b/luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownServiceExceptionTest.java
rename to luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java
index e141e88..416a9ff 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownServiceExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.net;
+package tests.api.java.net;
import java.net.UnknownServiceException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractCollectionTest.java b/luni/src/test/java/tests/api/java/util/AbstractCollectionTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractCollectionTest.java
rename to luni/src/test/java/tests/api/java/util/AbstractCollectionTest.java
index 9ea6efc..d38e1d9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractCollectionTest.java
+++ b/luni/src/test/java/tests/api/java/util/AbstractCollectionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.AbstractCollection;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractListTest.java b/luni/src/test/java/tests/api/java/util/AbstractListTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractListTest.java
rename to luni/src/test/java/tests/api/java/util/AbstractListTest.java
index efc196f..4775ebd 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractListTest.java
+++ b/luni/src/test/java/tests/api/java/util/AbstractListTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.AbstractList;
import java.util.ArrayList;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractMapTest.java b/luni/src/test/java/tests/api/java/util/AbstractMapTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractMapTest.java
rename to luni/src/test/java/tests/api/java/util/AbstractMapTest.java
index cd06680..df96d53 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/AbstractMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.AbstractMap;
import java.util.AbstractSet;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractQueueTest.java b/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractQueueTest.java
rename to luni/src/test/java/tests/api/java/util/AbstractQueueTest.java
index f123bcf..5ae490c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.AbstractQueue;
import java.util.ArrayList;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractSequentialListTest.java b/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractSequentialListTest.java
rename to luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java
index 80ca4fd..2068f1b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractSequentialListTest.java
+++ b/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.AbstractSequentialList;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayDequeTest.java b/luni/src/test/java/tests/api/java/util/ArrayDequeTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayDequeTest.java
rename to luni/src/test/java/tests/api/java/util/ArrayDequeTest.java
index 11e6cfc..bf28414 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayDequeTest.java
+++ b/luni/src/test/java/tests/api/java/util/ArrayDequeTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.ArrayDeque;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java b/luni/src/test/java/tests/api/java/util/ArrayListTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java
rename to luni/src/test/java/tests/api/java/util/ArrayListTest.java
index f2546e0..8ddf5b7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java
+++ b/luni/src/test/java/tests/api/java/util/ArrayListTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Arrays2Test.java b/luni/src/test/java/tests/api/java/util/Arrays2Test.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Arrays2Test.java
rename to luni/src/test/java/tests/api/java/util/Arrays2Test.java
index d6adbb5..bac98aa 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Arrays2Test.java
+++ b/luni/src/test/java/tests/api/java/util/Arrays2Test.java
@@ -15,7 +15,7 @@
* the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java b/luni/src/test/java/tests/api/java/util/ArraysTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java
rename to luni/src/test/java/tests/api/java/util/ArraysTest.java
index 277abce..9def233 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java
+++ b/luni/src/test/java/tests/api/java/util/ArraysTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import tests.support.Support_UnmodifiableCollectionTest;
import java.lang.reflect.Method;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/BitSetTest.java b/luni/src/test/java/tests/api/java/util/BitSetTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/BitSetTest.java
rename to luni/src/test/java/tests/api/java/util/BitSetTest.java
index 96ffccc..9e71582 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/BitSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/BitSetTest.java
@@ -15,7 +15,7 @@
* the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.BitSet;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CalendarTest.java b/luni/src/test/java/tests/api/java/util/CalendarTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CalendarTest.java
rename to luni/src/test/java/tests/api/java/util/CalendarTest.java
index 06a37c8..54524ad 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CalendarTest.java
+++ b/luni/src/test/java/tests/api/java/util/CalendarTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.text.DateFormatSymbols;
import java.util.ArrayList;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Collections2Test.java b/luni/src/test/java/tests/api/java/util/Collections2Test.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Collections2Test.java
rename to luni/src/test/java/tests/api/java/util/Collections2Test.java
index 899cd18..5a6c2dc 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Collections2Test.java
+++ b/luni/src/test/java/tests/api/java/util/Collections2Test.java
@@ -15,7 +15,7 @@
* the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import junit.framework.TestCase;
import org.apache.harmony.testframework.serialization.SerializationTest;
@@ -414,47 +414,47 @@
public void test_checkedCollectionSerializationCompatability() throws Exception {
Collection<String> c = Collections.emptySet();
c = Collections.checkedCollection(c, String.class);
- SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedCollection.golden.ser");
+ SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedCollection.golden.ser");
}
public void test_checkedListRandomAccessSerializationCompatability() throws Exception {
List<String> c = new ArrayList<String>();
assertTrue(c instanceof RandomAccess);
c = Collections.checkedList(c, String.class);
- SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedListRandomAccess.golden.ser");
+ SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedListRandomAccess.golden.ser");
}
public void test_checkedListSerializationCompatability() throws Exception {
List<String> c = new LinkedList<String>();
assertFalse(c instanceof RandomAccess);
c = Collections.checkedList(c, String.class);
- SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedList.golden.ser");
+ SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedList.golden.ser");
}
public void test_checkedSetSerializationCompatability() throws Exception {
Set<String> c = new HashSet<String>();
assertFalse(c instanceof SortedSet);
c = Collections.checkedSet(c, String.class);
- SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedSet.golden.ser");
+ SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedSet.golden.ser");
}
public void test_checkedMapSerializationCompatability() throws Exception {
Map<String, String> c = new HashMap<String, String>();
assertFalse(c instanceof SortedMap);
c = Collections.checkedMap(c, String.class, String.class);
- SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedMap.golden.ser");
+ SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedMap.golden.ser");
}
public void test_checkedSortedSetSerializationCompatability() throws Exception {
SortedSet<String> c = new TreeSet<String>();
c = Collections.checkedSortedSet(c, String.class);
- SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedSet.golden.ser");
+ SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedSortedSet.golden.ser");
}
public void test_checkedSortedMapSerializationCompatability() throws Exception {
SortedMap<String, String> c = new TreeMap<String, String>();
c = Collections.checkedSortedMap(c, String.class, String.class);
- SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedMap.golden.ser");
+ SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedSortedMap.golden.ser");
}
public void test_emptyList() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CollectionsTest.java b/luni/src/test/java/tests/api/java/util/CollectionsTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CollectionsTest.java
rename to luni/src/test/java/tests/api/java/util/CollectionsTest.java
index ed25241..58e4ba7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CollectionsTest.java
+++ b/luni/src/test/java/tests/api/java/util/CollectionsTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import org.apache.harmony.testframework.serialization.SerializationTest;
import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModTest.java b/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModTest.java
rename to luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
index 2e2553d..3750e81 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModTest.java
+++ b/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.AbstractList;
import java.util.ArrayList;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModificationExceptionTest.java b/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModificationExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java
index 2bbcd1e..0cd4076 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModificationExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Collection;
import java.util.ConcurrentModificationException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ControlTest.java b/luni/src/test/java/tests/api/java/util/ControlTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ControlTest.java
rename to luni/src/test/java/tests/api/java/util/ControlTest.java
index d0b236d..3619ea7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ControlTest.java
+++ b/luni/src/test/java/tests/api/java/util/ControlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import junit.framework.TestCase;
import tests.support.resource.Support_Resources;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java b/luni/src/test/java/tests/api/java/util/CurrencyTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java
rename to luni/src/test/java/tests/api/java/util/CurrencyTest.java
index 092cc54..82fd7cf 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java
+++ b/luni/src/test/java/tests/api/java/util/CurrencyTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DateTest.java b/luni/src/test/java/tests/api/java/util/DateTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DateTest.java
rename to luni/src/test/java/tests/api/java/util/DateTest.java
index 0ce971d..f7133d4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DateTest.java
+++ b/luni/src/test/java/tests/api/java/util/DateTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Calendar;
import java.util.Date;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.java b/luni/src/test/java/tests/api/java/util/DuplicateFormatFlagsExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/DuplicateFormatFlagsExceptionTest.java
index d59decb..0fd0005 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/DuplicateFormatFlagsExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.DuplicateFormatFlagsException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EmptyStackExceptionTest.java b/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EmptyStackExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java
index fdba5bf..31ee1e2 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EmptyStackExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.EmptyStackException;
import java.util.Stack;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumMapTest.java b/luni/src/test/java/tests/api/java/util/EnumMapTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumMapTest.java
rename to luni/src/test/java/tests/api/java/util/EnumMapTest.java
index 2a37a18..05826d1 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/EnumMapTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import dalvik.annotation.AndroidOnly;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java b/luni/src/test/java/tests/api/java/util/EnumSetTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java
rename to luni/src/test/java/tests/api/java/util/EnumSetTest.java
index 612c9f1..2b33877 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/EnumSetTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EventObjectTest.java b/luni/src/test/java/tests/api/java/util/EventObjectTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EventObjectTest.java
rename to luni/src/test/java/tests/api/java/util/EventObjectTest.java
index bea2a44..0f00a81 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EventObjectTest.java
+++ b/luni/src/test/java/tests/api/java/util/EventObjectTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.EventObject;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java b/luni/src/test/java/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.java
index bc9c480..decf452 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.FormatFlagsConversionMismatchException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormattableFlagsTest.java b/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java
similarity index 95%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormattableFlagsTest.java
rename to luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java
index dc51e86..4dcd7db 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormattableFlagsTest.java
+++ b/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.FormattableFlags;
import junit.framework.TestCase;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.java b/luni/src/test/java/tests/api/java/util/FormatterClosedExceptionTest.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/FormatterClosedExceptionTest.java
index e89576a..9d11f70 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/FormatterClosedExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.FormatterClosedException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterTest.java b/luni/src/test/java/tests/api/java/util/FormatterTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterTest.java
rename to luni/src/test/java/tests/api/java/util/FormatterTest.java
index c0e814e..c6f7577 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterTest.java
+++ b/luni/src/test/java/tests/api/java/util/FormatterTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.BufferedOutputStream;
import java.io.Closeable;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java
rename to luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
index 2c5f308..8b943ed 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java
+++ b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.BitSet;
import java.util.Calendar;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashMapTest.java b/luni/src/test/java/tests/api/java/util/HashMapTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashMapTest.java
rename to luni/src/test/java/tests/api/java/util/HashMapTest.java
index 26d0a8e..5a68adb 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/HashMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import org.apache.harmony.testframework.serialization.SerializationTest;
import tests.support.Support_MapTest2;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashSetTest.java b/luni/src/test/java/tests/api/java/util/HashSetTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashSetTest.java
rename to luni/src/test/java/tests/api/java/util/HashSetTest.java
index ed9c596..e4a65b7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/HashSetTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Arrays;
import java.util.HashSet;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashtableTest.java b/luni/src/test/java/tests/api/java/util/HashtableTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashtableTest.java
rename to luni/src/test/java/tests/api/java/util/HashtableTest.java
index d71decd..2457398 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashtableTest.java
+++ b/luni/src/test/java/tests/api/java/util/HashtableTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import tests.support.Support_MapTest2;
import tests.support.Support_UnmodifiableCollectionTest;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMap2Test.java b/luni/src/test/java/tests/api/java/util/IdentityHashMap2Test.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMap2Test.java
rename to luni/src/test/java/tests/api/java/util/IdentityHashMap2Test.java
index 7882077..4718d1d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMap2Test.java
+++ b/luni/src/test/java/tests/api/java/util/IdentityHashMap2Test.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import org.apache.harmony.testframework.serialization.SerializationTest;
import tests.support.Support_MapTest2;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMapTest.java b/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMapTest.java
rename to luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java
index 4ddaf65..c6e3635 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import org.apache.harmony.testframework.serialization.SerializationTest;
import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.java b/luni/src/test/java/tests/api/java/util/IllegalFormatCodePointExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/IllegalFormatCodePointExceptionTest.java
index ac67e81..d223c8c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/IllegalFormatCodePointExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.IllegalFormatCodePointException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.java b/luni/src/test/java/tests/api/java/util/IllegalFormatConversionExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/IllegalFormatConversionExceptionTest.java
index 2277825..14475fe 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/IllegalFormatConversionExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.IllegalFormatConversionException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.java b/luni/src/test/java/tests/api/java/util/IllegalFormatFlagsExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/IllegalFormatFlagsExceptionTest.java
index 1611028..c0f6b31 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/IllegalFormatFlagsExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.IllegalFormatFlagsException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.java b/luni/src/test/java/tests/api/java/util/IllegalFormatPrecisionExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/IllegalFormatPrecisionExceptionTest.java
index b290b48..06863fa 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/IllegalFormatPrecisionExceptionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.IllegalFormatPrecisionException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.java b/luni/src/test/java/tests/api/java/util/IllegalFormatWidthExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/IllegalFormatWidthExceptionTest.java
index 8d5ed0e..49cd632 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/IllegalFormatWidthExceptionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.IllegalFormatWidthException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.java b/luni/src/test/java/tests/api/java/util/InputMismatchExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/InputMismatchExceptionTest.java
index 30291b3..47232b9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/InputMismatchExceptionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.InputMismatchException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InvalidPropertiesFormatExceptionTest.java b/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InvalidPropertiesFormatExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
index 10bb50e..e9a0495 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InvalidPropertiesFormatExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.NotSerializableException;
import java.util.InvalidPropertiesFormatException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashMapTest.java b/luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashMapTest.java
rename to luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java
index 8565b8e..eff9493 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.AbstractMap;
import java.util.ArrayList;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashSetTest.java b/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashSetTest.java
rename to luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java
index 721a879..f54d01d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Arrays;
import java.util.Collection;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java b/luni/src/test/java/tests/api/java/util/LinkedListTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java
rename to luni/src/test/java/tests/api/java/util/LinkedListTest.java
index 79607f1..ed742bc 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java
+++ b/luni/src/test/java/tests/api/java/util/LinkedListTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ListResourceBundleTest.java b/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ListResourceBundleTest.java
rename to luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java
index 6a85161..9c5707c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ListResourceBundleTest.java
+++ b/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Enumeration;
import java.util.ListResourceBundle;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LocaleTest.java b/luni/src/test/java/tests/api/java/util/LocaleTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LocaleTest.java
rename to luni/src/test/java/tests/api/java/util/LocaleTest.java
index 426e52c..6580da8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LocaleTest.java
+++ b/luni/src/test/java/tests/api/java/util/LocaleTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Arrays;
import java.util.HashSet;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.java b/luni/src/test/java/tests/api/java/util/MissingFormatArgumentExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/MissingFormatArgumentExceptionTest.java
index 464960a..f3887f5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/MissingFormatArgumentExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.MissingFormatArgumentException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.java b/luni/src/test/java/tests/api/java/util/MissingFormatWidthExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/MissingFormatWidthExceptionTest.java
index cf3d25f..ffca1c9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/MissingFormatWidthExceptionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.MissingFormatWidthException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingResourceExceptionTest.java b/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingResourceExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java
index 3eb9bac..fc7189e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingResourceExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Locale;
import java.util.MissingResourceException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/NoSuchElementExceptionTest.java b/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/NoSuchElementExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java
index 7727f3f..cfda941 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/NoSuchElementExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.NoSuchElementException;
import java.util.Vector;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ObservableTest.java b/luni/src/test/java/tests/api/java/util/ObservableTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ObservableTest.java
rename to luni/src/test/java/tests/api/java/util/ObservableTest.java
index b13a876..3a0d31c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ObservableTest.java
+++ b/luni/src/test/java/tests/api/java/util/ObservableTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Observable;
import java.util.Observer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PriorityQueueTest.java b/luni/src/test/java/tests/api/java/util/PriorityQueueTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PriorityQueueTest.java
rename to luni/src/test/java/tests/api/java/util/PriorityQueueTest.java
index 9c9d4fe..d0209a5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PriorityQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/PriorityQueueTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,7 +32,7 @@
public class PriorityQueueTest extends TestCase {
- private static final String SERIALIZATION_FILE_NAME = "serialization/org/apache/harmony/tests/java/util/PriorityQueue.golden.ser";
+ private static final String SERIALIZATION_FILE_NAME = "serialization/tests/api/java/util/PriorityQueue.golden.ser";
/**
* java.util.PriorityQueue#iterator()
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertiesTest.java b/luni/src/test/java/tests/api/java/util/PropertiesTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertiesTest.java
rename to luni/src/test/java/tests/api/java/util/PropertiesTest.java
index 5b546bb..5d2ba7b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertiesTest.java
+++ b/luni/src/test/java/tests/api/java/util/PropertiesTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import tests.support.resource.Support_Resources;
import java.io.BufferedReader;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertyResourceBundleTest.java b/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertyResourceBundleTest.java
rename to luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java
index 2306ec1..085b165 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertyResourceBundleTest.java
+++ b/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.ByteArrayInputStream;
import java.io.CharArrayReader;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RandomTest.java b/luni/src/test/java/tests/api/java/util/RandomTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RandomTest.java
rename to luni/src/test/java/tests/api/java/util/RandomTest.java
index d51d8abf..a30fcb6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RandomTest.java
+++ b/luni/src/test/java/tests/api/java/util/RandomTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.Random;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RefSortedMap.java b/luni/src/test/java/tests/api/java/util/RefSortedMap.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RefSortedMap.java
rename to luni/src/test/java/tests/api/java/util/RefSortedMap.java
index 4b829af0f..aa4eaa8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RefSortedMap.java
+++ b/luni/src/test/java/tests/api/java/util/RefSortedMap.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.IOException;
import java.io.ObjectInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ResourceBundleTest.java b/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ResourceBundleTest.java
rename to luni/src/test/java/tests/api/java/util/ResourceBundleTest.java
index 11be2fe..587a549 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ResourceBundleTest.java
+++ b/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import dalvik.annotation.KnownFailure;
import java.io.File;
@@ -28,7 +28,7 @@
import java.util.ResourceBundle;
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.harmony.tests.java.util.support.B;
+import tests.api.java.util.support.B;
import tests.support.resource.Support_Resources;
public class ResourceBundleTest extends junit.framework.TestCase {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SampleBundleClass.java b/luni/src/test/java/tests/api/java/util/SampleBundleClass.java
similarity index 96%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SampleBundleClass.java
rename to luni/src/test/java/tests/api/java/util/SampleBundleClass.java
index 394291b..ceb0901 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SampleBundleClass.java
+++ b/luni/src/test/java/tests/api/java/util/SampleBundleClass.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.java b/luni/src/test/java/tests/api/java/util/ServiceConfigurationErrorTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.java
rename to luni/src/test/java/tests/api/java/util/ServiceConfigurationErrorTest.java
index 870ef1e..51a0527 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.java
+++ b/luni/src/test/java/tests/api/java/util/ServiceConfigurationErrorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.ServiceConfigurationError;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleEntryTest.java b/luni/src/test/java/tests/api/java/util/SimpleEntryTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleEntryTest.java
rename to luni/src/test/java/tests/api/java/util/SimpleEntryTest.java
index 3f0847f..5f8c13d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleEntryTest.java
+++ b/luni/src/test/java/tests/api/java/util/SimpleEntryTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import junit.framework.TestCase;
import org.apache.harmony.testframework.serialization.SerializationTest;
@@ -128,6 +128,6 @@
@SuppressWarnings({ "unchecked", "boxing" })
public void testSerializationCompatibility_SimpleEntry() throws Exception {
SimpleEntry e = new AbstractMap.SimpleEntry<Integer, String>(1, "test");
- SerializationTester.assertCompabilityEquals(e, "serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleEntry.golden.ser");
+ SerializationTester.assertCompabilityEquals(e, "serialization/tests/api/java/util/AbstractMapTest_SimpleEntry.golden.ser");
}
}
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleImmutableEntryTest.java b/luni/src/test/java/tests/api/java/util/SimpleImmutableEntryTest.java
similarity index 94%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleImmutableEntryTest.java
rename to luni/src/test/java/tests/api/java/util/SimpleImmutableEntryTest.java
index b83468e..f2469b6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleImmutableEntryTest.java
+++ b/luni/src/test/java/tests/api/java/util/SimpleImmutableEntryTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import junit.framework.TestCase;
import org.apache.harmony.testframework.serialization.SerializationTest;
@@ -138,9 +138,9 @@
@SuppressWarnings({ "unchecked", "boxing" })
public void testSerializationCompatibility_SimpleImmutableEntry() throws Exception {
SimpleImmutableEntry e = new AbstractMap.SimpleImmutableEntry<Integer, String>(1, "test");
- if (!(SerializationTester.readObject(e, "serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser") instanceof SimpleImmutableEntry)) {
+ if (!(SerializationTester.readObject(e, "serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser") instanceof SimpleImmutableEntry)) {
fail("should be SimpleImmutableEntry");
}
- SerializationTester.assertCompabilityEquals(e, "serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser");
+ SerializationTester.assertCompabilityEquals(e, "serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser");
}
}
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleTimeZoneTest.java b/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleTimeZoneTest.java
rename to luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java
index 0fbe7ac..eeb5b30 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleTimeZoneTest.java
+++ b/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Calendar;
import java.util.Date;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SortedMapTestBase.java b/luni/src/test/java/tests/api/java/util/SortedMapTestBase.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SortedMapTestBase.java
rename to luni/src/test/java/tests/api/java/util/SortedMapTestBase.java
index f1fb1e4..fbf2646 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SortedMapTestBase.java
+++ b/luni/src/test/java/tests/api/java/util/SortedMapTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StackTest.java b/luni/src/test/java/tests/api/java/util/StackTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StackTest.java
rename to luni/src/test/java/tests/api/java/util/StackTest.java
index 7be5a56..5bcd231 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StackTest.java
+++ b/luni/src/test/java/tests/api/java/util/StackTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.EmptyStackException;
import java.util.Stack;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StringTokenizerTest.java b/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StringTokenizerTest.java
rename to luni/src/test/java/tests/api/java/util/StringTokenizerTest.java
index eeed19f..d32a466 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StringTokenizerTest.java
+++ b/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java b/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java
rename to luni/src/test/java/tests/api/java/util/TimeZoneTest.java
index 7e6cade..a159113 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import tests.support.Support_TimeZone;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTaskTest.java b/luni/src/test/java/tests/api/java/util/TimerTaskTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTaskTest.java
rename to luni/src/test/java/tests/api/java/util/TimerTaskTest.java
index 3e072e7..97ff8ea 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTaskTest.java
+++ b/luni/src/test/java/tests/api/java/util/TimerTaskTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Timer;
import java.util.TimerTask;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTest.java b/luni/src/test/java/tests/api/java/util/TimerTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTest.java
rename to luni/src/test/java/tests/api/java/util/TimerTest.java
index 85e7c6a..739c018 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTest.java
+++ b/luni/src/test/java/tests/api/java/util/TimerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.lang.Thread.UncaughtExceptionHandler;
import java.util.Date;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TooManyListenersExceptionTest.java b/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TooManyListenersExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java
index 6683e96..48df5fd 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TooManyListenersExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.TooManyListenersException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapExtendTest.java b/luni/src/test/java/tests/api/java/util/TreeMapExtendTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapExtendTest.java
rename to luni/src/test/java/tests/api/java/util/TreeMapExtendTest.java
index 5754468..3927840 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapExtendTest.java
+++ b/luni/src/test/java/tests/api/java/util/TreeMapExtendTest.java
@@ -1,4 +1,4 @@
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
*/
import junit.framework.TestCase;
-import org.apache.harmony.tests.java.util.TreeMapTest.MockComparator;
+import tests.api.java.util.TreeMapTest.MockComparator;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapRndTest.java b/luni/src/test/java/tests/api/java/util/TreeMapRndTest.java
similarity index 95%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapRndTest.java
rename to luni/src/test/java/tests/api/java/util/TreeMapRndTest.java
index bec75a4..7c57689 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapRndTest.java
+++ b/luni/src/test/java/tests/api/java/util/TreeMapRndTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.TreeMap;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapTest.java b/luni/src/test/java/tests/api/java/util/TreeMapTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapTest.java
rename to luni/src/test/java/tests/api/java/util/TreeMapTest.java
index 58ffaf6..2bc2ea2 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/TreeMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import org.apache.harmony.testframework.serialization.SerializationTest;
import tests.support.Support_MapTest2;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeSetTest.java b/luni/src/test/java/tests/api/java/util/TreeSetTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeSetTest.java
rename to luni/src/test/java/tests/api/java/util/TreeSetTest.java
index 265f5b9..6ad00ee 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/TreeSetTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.Arrays;
import java.util.Comparator;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.java b/luni/src/test/java/tests/api/java/util/UnknownFormatConversionExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/UnknownFormatConversionExceptionTest.java
index a265887..4880275 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/UnknownFormatConversionExceptionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.UnknownFormatConversionException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.java b/luni/src/test/java/tests/api/java/util/UnknownFormatFlagsExceptionTest.java
similarity index 98%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.java
rename to luni/src/test/java/tests/api/java/util/UnknownFormatFlagsExceptionTest.java
index 667ff98..9d08f0b1 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/UnknownFormatFlagsExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.io.Serializable;
import java.util.UnknownFormatFlagsException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java b/luni/src/test/java/tests/api/java/util/VectorTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
rename to luni/src/test/java/tests/api/java/util/VectorTest.java
index e32ca94..4ea3949 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
+++ b/luni/src/test/java/tests/api/java/util/VectorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import tests.support.Support_ListTest;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/WeakHashMapTest.java b/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/WeakHashMapTest.java
rename to luni/src/test/java/tests/api/java/util/WeakHashMapTest.java
index 0d34f72..067abc0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/WeakHashMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.util;
+package tests.api.java.util;
import java.util.AbstractMap;
import java.util.Arrays;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/A.java b/luni/src/test/java/tests/api/java/util/support/A.java
similarity index 79%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/A.java
rename to luni/src/test/java/tests/api/java/util/support/A.java
index a03935a..c2b43b5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/A.java
+++ b/luni/src/test/java/tests/api/java/util/support/A.java
@@ -1,4 +1,4 @@
-package org.apache.harmony.tests.java.util.support;
+package tests.api.java.util.support;
public class A implements I {
private static P pp = new P();
diff --git a/luni/src/test/java/tests/api/java/util/support/B.java b/luni/src/test/java/tests/api/java/util/support/B.java
new file mode 100644
index 0000000..baafdbe
--- /dev/null
+++ b/luni/src/test/java/tests/api/java/util/support/B.java
@@ -0,0 +1,4 @@
+package tests.api.java.util.support;
+
+public class B extends A {
+}
diff --git a/luni/src/test/java/tests/api/java/util/support/I.java b/luni/src/test/java/tests/api/java/util/support/I.java
new file mode 100644
index 0000000..a1cd73a
--- /dev/null
+++ b/luni/src/test/java/tests/api/java/util/support/I.java
@@ -0,0 +1,5 @@
+package tests.api.java.util.support;
+
+public interface I {
+ String find(String key);
+}
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/P.java b/luni/src/test/java/tests/api/java/util/support/P.java
similarity index 92%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/P.java
rename to luni/src/test/java/tests/api/java/util/support/P.java
index bba2537..6883936 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/P.java
+++ b/luni/src/test/java/tests/api/java/util/support/P.java
@@ -1,4 +1,4 @@
-package org.apache.harmony.tests.java.util.support;
+package tests.api.java.util.support;
import java.util.ResourceBundle;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ServerSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ServerSocketFactoryTest.java
rename to luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/SocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/SocketFactoryTest.java
rename to luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java b/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertificatesToPlayWith.java b/luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertificatesToPlayWith.java
rename to luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HttpsURLConnectionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HttpsURLConnectionTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory1Test.java
rename to luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory2Test.java
rename to luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactorySpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactorySpiTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext1Test.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext2Test.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContextSpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContextSpiTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultStatusTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultStatusTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLExceptionTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLHandshakeExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLHandshakeExceptionTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLKeyExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLKeyExceptionTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLProtocolExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLProtocolExceptionTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketFactoryTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingEventTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingEventTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingListenerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingListenerTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionContextTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionContextTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketFactoryTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory1Test.java
rename to luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory2Test.java
rename to luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactorySpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactorySpiTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509ExtendedKeyManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509ExtendedKeyManagerTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509KeyManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509KeyManagerTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509TrustManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509TrustManagerTest.java
rename to luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/CallbackHandlerTest.java b/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/CallbackHandlerTest.java
rename to luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyFailedExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyFailedExceptionTest.java
rename to luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyableTest.java b/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyableTest.java
rename to luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/LoginExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/LoginExceptionTest.java
rename to luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/PasswordCallbackTest.java b/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/PasswordCallbackTest.java
rename to luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/SubjectTest.java b/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/SubjectTest.java
rename to luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/UnsupportedCallbackExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/UnsupportedCallbackExceptionTest.java
rename to luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/X500PrincipalTest.java b/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/X500PrincipalTest.java
rename to luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateEncodingExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateEncodingExceptionTest.java
rename to luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExceptionTest.java
rename to luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExpiredExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExpiredExceptionTest.java
rename to luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateNotYetValidExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateNotYetValidExceptionTest.java
rename to luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateParsingExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateParsingExceptionTest.java
rename to luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateTest.java
rename to luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/X509CertificateTest.java b/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/X509CertificateTest.java
rename to luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderFactoryTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderFactoryTest.java
rename to luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderTest.java
rename to luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/FactoryConfigurationErrorTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/FactoryConfigurationErrorTest.java
rename to luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/ParserConfigurationExceptionTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/ParserConfigurationExceptionTest.java
rename to luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserFactoryTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserFactoryTest.java
rename to luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTest.java
rename to luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTestSupport.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTestSupport.java
rename to luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java
rename to luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/HandlerBaseTest.java b/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/HandlerBaseTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/InputSourceTest.java b/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/InputSourceTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXExceptionTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotRecognizedExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotRecognizedExceptionTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotSupportedExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotSupportedExceptionTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXParseExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXParseExceptionTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Attributes2ImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Attributes2ImplTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/DefaultHandler2Test.java b/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/DefaultHandler2Test.java
rename to luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Locator2ImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Locator2ImplTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributeListImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributeListImplTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributesImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributesImplTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/DefaultHandlerTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/DefaultHandlerTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/LocatorImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/LocatorImplTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/NamespaceSupportTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/NamespaceSupportTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserAdapterTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserAdapterTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserFactoryTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserFactoryTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLFilterImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLFilterImplTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderAdapterTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderAdapterTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderFactoryTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderFactoryTest.java
rename to luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/BrokenInputStream.java b/luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/BrokenInputStream.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingParser.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingXMLReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingXMLReader.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingXMLReader.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/DoNothingXMLReader.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MethodLogger.java b/luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MethodLogger.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockFilter.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockFilter.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockHandler.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockHandler.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockParser.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockReader.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockResolver.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockResolver.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessParser.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessXMLReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessXMLReader.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessXMLReader.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/NoAccessXMLReader.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceParser.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceXMLReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceXMLReader.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassParser.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassXMLReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassXMLReader.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassXMLReader.java
rename to luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassXMLReader.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/pkg1/TestClass.java b/luni/src/test/java/tests/api/pkg1/TestClass.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/pkg1/TestClass.java
rename to luni/src/test/java/tests/api/pkg1/TestClass.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/pkg2/TestClass.java b/luni/src/test/java/tests/api/pkg2/TestClass.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/pkg2/TestClass.java
rename to luni/src/test/java/tests/api/pkg2/TestClass.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/support/A.java b/luni/src/test/java/tests/api/support/A.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/support/A.java
rename to luni/src/test/java/tests/api/support/A.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/support/B.java b/luni/src/test/java/tests/api/support/B.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/support/B.java
rename to luni/src/test/java/tests/api/support/B.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/support/I.java b/luni/src/test/java/tests/api/support/I.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/support/I.java
rename to luni/src/test/java/tests/api/support/I.java
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/support/P.java b/luni/src/test/java/tests/api/support/P.java
similarity index 100%
rename from harmony-tests/src/test/java/org/apache/harmony/tests/support/P.java
rename to luni/src/test/java/tests/api/support/P.java
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UUIDTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UUIDTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UUIDTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UUIDTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDClass.ser b/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDClass.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDClass.ser
rename to luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDClass.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDConstructors.ser b/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDConstructors.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDConstructors.ser
rename to luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDConstructors.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDFields.ser b/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDFields.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDFields.ser
rename to luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDFields.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDInterfaces.ser b/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDInterfaces.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDInterfaces.ser
rename to luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDInterfaces.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDMethods.ser b/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDMethods.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDMethods.ser
rename to luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDMethods.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/resources/dex1.bytes b/luni/src/test/resources/tests/api/java/lang/reflect/dex1.bytes
similarity index 100%
rename from harmony-tests/src/test/resources/resources/dex1.bytes
rename to luni/src/test/resources/tests/api/java/lang/reflect/dex1.bytes
Binary files differ