diff options
author | Narayan Kamath <narayan@google.com> | 2013-11-15 11:02:26 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2013-11-15 13:09:22 +0000 |
commit | e5fea3d504609d22337a5311d3ce0e72314bceee (patch) | |
tree | 6a133d630dc0714c00f982d1817c7cde9fcf31c6 /harmony-tests/src/test/resources | |
parent | 1069c4d7fbfc70f3c4ba4cbb36f36817672ceecf (diff) | |
download | libcore-e5fea3d504609d22337a5311d3ce0e72314bceee.zip libcore-e5fea3d504609d22337a5311d3ce0e72314bceee.tar.gz libcore-e5fea3d504609d22337a5311d3ce0e72314bceee.tar.bz2 |
Use a consistent package path for harmony tests.
Harmony was never consistent about where they put their
tests. There's no reason we have to be the same.
Also, there's no need to have separate subtrees for nio,
nio_char etc. etc.
This change makes all existing apache harmony tests
subpackages of "org.apache.harmony.tests" and put them under
libcore/harmony-tests.
We somehow managed to end up with two vastly different
copies of CharsetDecoderTest & CharsetEncoderTest. I've
renamed the copies CharsetDecoder2Test & CharsetEncoder2Test
to avoid having to go in and resolve the complicated
diffs or speculate about the reasons for their
divergence.
Change-Id: Ic34e69c2faab8893edd54e05eccd7091f4a09abd
Diffstat (limited to 'harmony-tests/src/test/resources')
32 files changed, 2 insertions, 0 deletions
diff --git a/harmony-tests/src/test/resources/META-INF/services/java.nio.charset.spi.CharsetProvider b/harmony-tests/src/test/resources/META-INF/services/java.nio.charset.spi.CharsetProvider new file mode 100644 index 0000000..9cc124a --- /dev/null +++ b/harmony-tests/src/test/resources/META-INF/services/java.nio.charset.spi.CharsetProvider @@ -0,0 +1,2 @@ +org.apache.harmony.tests.java.nio.charset.CharsetTest$MockCharsetProvider +org.apache.harmony.tests.java.nio.charset.CharsetTest$MockCharsetProviderASCII diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferOverflowExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferOverflowExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..80e8f7c --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferOverflowExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferUnderflowExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferUnderflowExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..2e0fc6d --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferUnderflowExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/InvalidMarkExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/InvalidMarkExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..c29debf --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/InvalidMarkExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..fbbc876 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..9bd539c --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..6dbac7d --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..40288df --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..1f1e73b --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..ea5b80a --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..1831746 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..9e17263 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..4024191 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..c15c66b --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..89ed091 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..022d3bc --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..5cf767c --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..34a42e9 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..69d1a57 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..b5cc027 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..9c0e175 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..2a24deb --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..1dd6a01 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..a95c4e4 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser Binary files differnew file mode 100644 index 0000000..6f4a4e3 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..59e4d0b --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..e2f0dec --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..7933fb9 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..07c63bb --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormat.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormat.ser Binary files differnew file mode 100644 index 0000000..c20fa78 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormat.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbols.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbols.ser Binary files differnew file mode 100644 index 0000000..6e086af --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbols.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.golden.ser Binary files differnew file mode 100644 index 0000000..c8e3948 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.golden.ser |