Google Git
Sign in
android / platform / external / apache-harmony / 6a68248^! / .
commit6a68248ccc39a819a1566eeb6532ce3fdb7b8e01[log] [tgz]
authorNeil Fuller <nfuller@google.com>Mon Sep 01 09:57:25 2014 +0100
committerThe Android Automerger <android-build@google.com>Wed Sep 03 12:13:37 2014 -0700
tree3f1f5dce68beb3ddf7f45502b4331dbd7d08b308
parentad8beef7613513eec615e17ec3f2aaedaf125d73 [diff]
Fixing serialization compatibility tests for sql tests

The resources files were being loaded using the System
classloader, which is not useful for instrumentation CTS
tests: the app classloader is a direct child of the
boot classloader.

Also moving all sql resources beneath
com.android.org.apache instead of just org.apache.
The resource names used during tests are derived from the
fully-qualified names of the test classes. At build time
we re-package the test code by prepending "com.android."
to the "org.apache" using jarjar. This is probably to
avoid conflicts with other tests / support code that have
been moved to libcore/harmony-tests but retain their
original package name.

Also a small change to the .mk file to remove references
to packages that no longer exist.

Bug: 17342415

(cherry picked from commit 15d1c074b73c8d2b67404ff87c7096f43a60d7f3)

Change-Id: I952b9fa2f772384e41d968d117fb1ae115f8d3cc

diff --git a/Android.mk b/Android.mk
index 5fc15e2..d7e9f60 100644
--- a/Android.mk
+++ b/Android.mk

@@ -10,13 +10,10 @@
     beans \
     logging \
     luni \
-    prefs \
     sql \
     support \
-    text \
 
 # TODO: get these working too!
-#    auth \
 #    crypto \
 #    security \
 #    x-net

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLClientInfoExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLClientInfoExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLClientInfoExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLClientInfoExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLDataExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLDataExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLDataExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLDataExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLFeatureNotSupportedExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLFeatureNotSupportedExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLFeatureNotSupportedExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLFeatureNotSupportedExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLIntegrityConstraintViolationExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLIntegrityConstraintViolationExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLIntegrityConstraintViolationExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLIntegrityConstraintViolationExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLInvalidAuthorizationSpecExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLInvalidAuthorizationSpecExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLInvalidAuthorizationSpecExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLInvalidAuthorizationSpecExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLNonTransientConnectionExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLNonTransientConnectionExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLNonTransientConnectionExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLNonTransientConnectionExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLNonTransientExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLNonTransientExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLNonTransientExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLNonTransientExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLRecoverableExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLRecoverableExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLRecoverableExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLRecoverableExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLSyntaxErrorExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLSyntaxErrorExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLSyntaxErrorExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLSyntaxErrorExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTimeoutExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTimeoutExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTimeoutExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTimeoutExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTransactionRollbackExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTransactionRollbackExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTransactionRollbackExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTransactionRollbackExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTransientConnectionExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTransientConnectionExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTransientConnectionExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTransientConnectionExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTransientExceptionTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTransientExceptionTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTransientExceptionTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTransientExceptionTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser
Binary files differ

diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/StatementEventTest.golden.ser b/sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/javax/sql/StatementEventTest.golden.ser
similarity index 100%
rename from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/StatementEventTest.golden.ser
rename to sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/javax/sql/StatementEventTest.golden.ser
Binary files differ

diff --git a/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java b/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
index 0b9025a..44b807f 100644
--- a/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
+++ b/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java

@@ -594,14 +594,13 @@
     private static Serializable getObject(TestCase test, String toAppend)
             throws Exception {
 
-        StringBuilder path = new StringBuilder("serialization");
+        StringBuilder path = new StringBuilder("/serialization");
 
         path.append(File.separatorChar);
         path.append(test.getClass().getName().replace('.', File.separatorChar));
         path.append(toAppend);
 
-        InputStream in = ClassLoader.getSystemClassLoader()
-                .getResourceAsStream(path.toString());
+        InputStream in = SerializationTest.class.getResourceAsStream(path.toString());
 
         Assert.assertNotNull("Failed to load serialization resource file: "
                 + path, in);