6a68248 - platform/external/apache-harmony

commit	6a68248ccc39a819a1566eeb6532ce3fdb7b8e01	[log] [tgz]
author	Neil Fuller <nfuller@google.com>	Mon Sep 01 09:57:25 2014 +0100
committer	The Android Automerger <android-build@google.com>	Wed Sep 03 12:13:37 2014 -0700
tree	3f1f5dce68beb3ddf7f45502b4331dbd7d08b308
parent	ad8beef7613513eec615e17ec3f2aaedaf125d73 [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

Android.mk[diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLClientInfoExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLClientInfoExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLDataExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLDataExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLFeatureNotSupportedExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLFeatureNotSupportedExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLIntegrityConstraintViolationExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLIntegrityConstraintViolationExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLInvalidAuthorizationSpecExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLInvalidAuthorizationSpecExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLNonTransientConnectionExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLNonTransientConnectionExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLNonTransientExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLNonTransientExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLRecoverableExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLRecoverableExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLSyntaxErrorExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLSyntaxErrorExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTimeoutExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTimeoutExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTransactionRollbackExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTransactionRollbackExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTransientConnectionExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTransientConnectionExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLTransientExceptionTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLTransientExceptionTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser - diff]
sql/src/test/resources/serialization/com/android/org/apache/harmony/sql/tests/javax/sql/StatementEventTest.golden.ser[Renamed from sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/StatementEventTest.golden.ser - diff]
support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java[diff]

22 files changed

tree: 3f1f5dce68beb3ddf7f45502b4331dbd7d08b308