From 3e316838d93c6988e8497e8c2a82218adcdd2ea0 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 3 May 2019 09:54:20 +0100 Subject: Remove more classes and resources that collide with those in libcore Bug: 131738612 Test: atest CtsLibcoreTestCases Change-Id: I6d19c73447833ac1e679d623ed3c8efcbac16e5f --- .../bundles/java/util/logging/res.properties | 12 --------- .../bundles/java/util/logging/res2.properties | 13 --------- .../bundles/java/util/logging/res3.properties | 13 --------- .../bundles/java/util/logging/res_en_US.properties | 12 --------- .../bundles/java/util/logging/res_zh_CN.properties | 13 --------- .../config/java/util/logging/logging.config | 3 --- .../tests/java/util/logging/LevelTest.golden.ser | Bin 377 -> 0 bytes .../java/util/logging/LogRecordTest.golden.ser | Bin 2139 -> 0 bytes .../luni/tests/java/net/test_protocol/Handler.java | 30 --------------------- .../apache/harmony/luni/tests/pkg1/TestClass.java | 30 --------------------- .../apache/harmony/luni/tests/pkg2/TestClass.java | 29 -------------------- .../harmony/luni/tests/ObjectStreamClassTest.jar | Bin 2295 -> 0 bytes .../org/apache/harmony/luni/tests/key_store.bks | Bin 1212 -> 0 bytes .../util/AbstractMapTest_SimpleEntry.golden.ser | Bin 178 -> 0 bytes ...AbstractMapTest_SimpleImmutableEntry.golden.ser | Bin 187 -> 0 bytes .../util/Collections_CheckedCollection.golden.ser | Bin 246 -> 0 bytes .../java/util/Collections_CheckedList.golden.ser | Bin 320 -> 0 bytes .../Collections_CheckedListRandomAccess.golden.ser | Bin 390 -> 0 bytes .../java/util/Collections_CheckedMap.golden.ser | Bin 311 -> 0 bytes .../java/util/Collections_CheckedSet.golden.ser | Bin 293 -> 0 bytes .../util/Collections_CheckedSortedMap.golden.ser | Bin 400 -> 0 bytes .../util/Collections_CheckedSortedSet.golden.ser | Bin 373 -> 0 bytes .../java/util/Collections_asLifoQueue.golden.ser | Bin 1189 -> 0 bytes .../java/util/Collections_newSetFromMap.golden.ser | Bin 1758 -> 0 bytes .../java/util/PriorityQueue.golden.ser | Bin 278 -> 0 bytes .../harmony/luni/tests/java/io/FileTest.golden.ser | Bin 88 -> 0 bytes .../luni/tests/java/io/IOErrorTest.golden.ser | Bin 2047 -> 0 bytes .../luni/tests/java/io/test_array_integers.ser | Bin 226 -> 0 bytes .../luni/tests/java/io/test_array_strings.ser | Bin 150 -> 0 bytes .../java/lang/AbstractMethodErrorTest.golden.ser | Bin 1605 -> 0 bytes .../lang/IllegalArgumentExceptionTest.golden.ser | Bin 1356 -> 0 bytes .../java/lang/IllegalStateExceptionTest.golden.ser | Bin 1347 -> 0 bytes .../java/lang/SecurityExceptionTest.golden.ser | Bin 1335 -> 0 bytes .../tests/java/lang/StringBufferTest.golden.ser | Bin 154 -> 0 bytes .../tests/java/lang/StringBuilderTest.golden.ser | Bin 126 -> 0 bytes .../UnsupportedOperationExceptionTest.golden.ser | Bin 1371 -> 0 bytes .../java/net/HttpRetryExceptionTest.golden.ser | Bin 1279 -> 0 bytes .../tests/java/net/Inet4AddressTest.golden.ser | Bin 112 -> 0 bytes .../tests/java/net/Inet6AddressTest.golden.0.ser | Bin 260 -> 0 bytes .../tests/java/net/Inet6AddressTest.golden.1.ser | Bin 261 -> 0 bytes .../luni/tests/java/net/InetAddressTest.golden.ser | Bin 112 -> 0 bytes .../java/net/InetSocketAddressTest.golden.0.ser | Bin 170 -> 0 bytes .../java/net/InetSocketAddressTest.golden.1.ser | Bin 252 -> 0 bytes .../java/net/SocketTimeoutExceptionTest.golden.ser | Bin 1628 -> 0 bytes .../luni/tests/java/util/ArrayDequeTest.golden.ser | Bin 165 -> 0 bytes .../luni/tests/java/util/BitSetTest.golden.ser | Bin 137 -> 0 bytes .../DuplicateFormatFlagsExceptionTest.golden.ser | Bin 1490 -> 0 bytes .../luni/tests/java/util/EnumMapTest.golden.ser | Bin 290 -> 0 bytes .../luni/tests/java/util/EnumSetTest.golden.ser | Bin 917 -> 0 bytes ...FlagsConversionMismatchExceptionTest.golden.ser | Bin 1522 -> 0 bytes .../util/FormatterClosedExceptionTest.golden.ser | Bin 1401 -> 0 bytes .../luni/tests/java/util/HashMapTest.golden.ser | Bin 96 -> 0 bytes .../luni/tests/java/util/HashSetTest.golden.ser | Bin 69 -> 0 bytes .../tests/java/util/IdentityHashMapTest.golden.ser | Bin 112 -> 0 bytes .../IllegalFormatCodePointExceptionTest.golden.ser | Bin 1481 -> 0 bytes ...IllegalFormatConversionExceptionTest.golden.ser | Bin 1541 -> 0 bytes .../IllegalFormatFlagsExceptionTest.golden.ser | Bin 1486 -> 0 bytes .../IllegalFormatPrecisionExceptionTest.golden.ser | Bin 1481 -> 0 bytes .../IllegalFormatWidthExceptionTest.golden.ser | Bin 1469 -> 0 bytes .../util/InputMismatchExceptionTest.golden.ser | Bin 1644 -> 0 bytes .../luni/tests/java/util/LinkedListTest.golden.ser | Bin 1165 -> 0 bytes .../MissingFormatArgumentExceptionTest.golden.ser | Bin 1494 -> 0 bytes .../MissingFormatWidthExceptionTest.golden.ser | Bin 1485 -> 0 bytes .../util/ServiceConfigurationErrorTest.golden.ser | Bin 2180 -> 0 bytes ...UnknownFormatConversionExceptionTest.golden.ser | Bin 1500 -> 0 bytes .../UnknownFormatFlagsExceptionTest.golden.ser | Bin 1489 -> 0 bytes .../java/sql/BatchUpdateExceptionTest.golden.ser | Bin 1724 -> 0 bytes .../tests/java/sql/DataTruncationTest.golden.ser | Bin 1754 -> 0 bytes .../sql/tests/java/sql/SQLExceptionTest.golden.ser | Bin 2716 -> 0 bytes .../sql/tests/java/sql/SQLWarningTest.golden.ser | Bin 2146 -> 0 bytes .../sql/tests/java/sql/TimestampTest.golden.ser | Bin 91 -> 0 bytes .../tests/javax/sql/ConnectionEventTest.golden.ser | Bin 2229 -> 0 bytes support/src/test/resources/hyts_Foo.c | 1 - .../resources/tests/resources/hyts_compDiction.bin | Bin 501 -> 0 bytes .../resources/tests/resources/hyts_compressD.bin | Bin 500 -> 0 bytes .../resources/tests/resources/hyts_construOD.bin | Bin 13 -> 0 bytes .../resources/tests/resources/hyts_construODI.bin | Bin 18 -> 0 bytes 77 files changed, 156 deletions(-) delete mode 100644 logging/src/test/resources/bundles/java/util/logging/res.properties delete mode 100644 logging/src/test/resources/bundles/java/util/logging/res2.properties delete mode 100644 logging/src/test/resources/bundles/java/util/logging/res3.properties delete mode 100644 logging/src/test/resources/bundles/java/util/logging/res_en_US.properties delete mode 100644 logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties delete mode 100644 logging/src/test/resources/config/java/util/logging/logging.config delete mode 100644 logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LevelTest.golden.ser delete mode 100644 logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.golden.ser delete mode 100644 luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/test_protocol/Handler.java delete mode 100644 luni/src/test/api/common/org/apache/harmony/luni/tests/pkg1/TestClass.java delete mode 100644 luni/src/test/api/common/org/apache/harmony/luni/tests/pkg2/TestClass.java delete mode 100644 luni/src/test/resources/org/apache/harmony/luni/tests/ObjectStreamClassTest.jar delete mode 100644 luni/src/test/resources/org/apache/harmony/luni/tests/key_store.bks delete mode 100644 luni/src/test/resources/serialization/java/util/AbstractMapTest_SimpleEntry.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/Collections_CheckedCollection.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/Collections_CheckedList.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/Collections_CheckedListRandomAccess.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/Collections_CheckedMap.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/Collections_CheckedSet.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/Collections_CheckedSortedMap.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/Collections_CheckedSortedSet.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/Collections_asLifoQueue.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/Collections_newSetFromMap.golden.ser delete mode 100644 luni/src/test/resources/serialization/java/util/PriorityQueue.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/FileTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/IOErrorTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_integers.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_strings.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/IllegalArgumentExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/IllegalStateExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/SecurityExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/StringBufferTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/StringBuilderTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.golden.0.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.golden.1.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetAddressTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.golden.0.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.golden.1.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/SocketTimeoutExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/ArrayDequeTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/BitSetTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumMapTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumSetTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/HashMapTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/HashSetTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/LinkedListTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/ServiceConfigurationErrorTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser delete mode 100644 luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser delete mode 100644 sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser delete mode 100644 sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser delete mode 100644 sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser delete mode 100644 sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser delete mode 100644 sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser delete mode 100644 sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser delete mode 100644 support/src/test/resources/hyts_Foo.c delete mode 100644 support/src/test/resources/tests/resources/hyts_compDiction.bin delete mode 100644 support/src/test/resources/tests/resources/hyts_compressD.bin delete mode 100644 support/src/test/resources/tests/resources/hyts_construOD.bin delete mode 100644 support/src/test/resources/tests/resources/hyts_construODI.bin diff --git a/logging/src/test/resources/bundles/java/util/logging/res.properties b/logging/src/test/resources/bundles/java/util/logging/res.properties deleted file mode 100644 index db455b0..0000000 --- a/logging/src/test/resources/bundles/java/util/logging/res.properties +++ /dev/null @@ -1,12 +0,0 @@ -level1=en_US_level1 -SEVERE=US_SEVERE -WARNING=US_WARNING -CONFIG=US_CONFIG -FINE=US_FINE -FINER=US_FINER -FINEST=US_FINEST -ALL=US_ALL -OFF=US_OFF -msg=US_MSG -pattern=US_pattern {0, number} -pattern{0,number}=US \ No newline at end of file diff --git a/logging/src/test/resources/bundles/java/util/logging/res2.properties b/logging/src/test/resources/bundles/java/util/logging/res2.properties deleted file mode 100644 index 66f02eb..0000000 --- a/logging/src/test/resources/bundles/java/util/logging/res2.properties +++ /dev/null @@ -1,13 +0,0 @@ -level1=level1 -SEVERE=SEVERE2 -WARNING=WARNING2 -CONFIG=CONFIG2 -FINE=FINE2 -FINER=FINER2 -FINEST=FINEST2 -ALL=ALL2 -OFF=OFF2 -msg=MSG2 -pattern=pattern {0, number}2 -pattern{0,number}=NOLOCALE2 -LOGGERTEST=Test_NoLocale2 \ No newline at end of file diff --git a/logging/src/test/resources/bundles/java/util/logging/res3.properties b/logging/src/test/resources/bundles/java/util/logging/res3.properties deleted file mode 100644 index f7b4b29..0000000 --- a/logging/src/test/resources/bundles/java/util/logging/res3.properties +++ /dev/null @@ -1,13 +0,0 @@ -level1=level13 -SEVERE=SEVERE3 -WARNING=WARNING3 -CONFIG=CONFIG3 -FINE=FINE3 -FINER=FINER3 -FINEST=FINEST3 -ALL=ALL3 -OFF=OFF3 -msg=MSG3 -pattern=pattern {0, number}3 -pattern{0,number}=NOLOCALE3 -LOGGERTEST=Test_NoLocale3 \ No newline at end of file diff --git a/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties b/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties deleted file mode 100644 index db455b0..0000000 --- a/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties +++ /dev/null @@ -1,12 +0,0 @@ -level1=en_US_level1 -SEVERE=US_SEVERE -WARNING=US_WARNING -CONFIG=US_CONFIG -FINE=US_FINE -FINER=US_FINER -FINEST=US_FINEST -ALL=US_ALL -OFF=US_OFF -msg=US_MSG -pattern=US_pattern {0, number} -pattern{0,number}=US \ No newline at end of file diff --git a/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties b/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties deleted file mode 100644 index e96803d..0000000 --- a/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties +++ /dev/null @@ -1,13 +0,0 @@ -level1=zh_CN_level1 -SEVERE=zh_CN_SEVERE -WARNING=zh_CN_WARNING -CONFIG=ZH_CN_CONFIG -FINE=ZH_CN_FINE -FINER=ZH_CN_FINER -FINEST=ZH_CN_FINEST -ALL=ZH_CN_ALL -OFF=ZH_CN_OFF -msg=ZH_CN_MSG -pattern=ZH_CN_pattern {0, number} -pattern{0,number}=ZH_CN -LOGGERTEST=Test_ZH_CN \ No newline at end of file diff --git a/logging/src/test/resources/config/java/util/logging/logging.config b/logging/src/test/resources/config/java/util/logging/logging.config deleted file mode 100644 index c67dadd..0000000 --- a/logging/src/test/resources/config/java/util/logging/logging.config +++ /dev/null @@ -1,3 +0,0 @@ -handlers=com.android.org.apache.harmony.logging.tests.java.util.logging.LogManagerTest$MockHandler , java.util.logging.ConsoleHandler -.level=ALL -com.android.org.apache.harmony.logging.tests.java.util.logging.LogManagerTest$MockHandler.level=OFF \ No newline at end of file diff --git a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LevelTest.golden.ser b/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LevelTest.golden.ser deleted file mode 100644 index 721a368..0000000 Binary files a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LevelTest.golden.ser and /dev/null differ diff --git a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.golden.ser b/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.golden.ser deleted file mode 100644 index 955c6fb..0000000 Binary files a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.golden.ser and /dev/null differ diff --git a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/test_protocol/Handler.java b/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/test_protocol/Handler.java deleted file mode 100644 index e868391..0000000 --- a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/test_protocol/Handler.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.harmony.luni.tests.java.net.test_protocol; - -import java.io.IOException; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLStreamHandler; - -public class Handler extends URLStreamHandler { - protected URLConnection openConnection(URL u) throws IOException { - return null; - } -} - diff --git a/luni/src/test/api/common/org/apache/harmony/luni/tests/pkg1/TestClass.java b/luni/src/test/api/common/org/apache/harmony/luni/tests/pkg1/TestClass.java deleted file mode 100644 index 5bef9b9..0000000 --- a/luni/src/test/api/common/org/apache/harmony/luni/tests/pkg1/TestClass.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.harmony.luni.tests.pkg1; - -import java.io.Serializable; - -/** - * Used for a serialization test, must have different package and same base name - * as the TestClass in o.a.h.l.tests.pkg2 - */ -public class TestClass implements Serializable { - private static final long serialVersionUID = 11111L; - - public int i = 0; -} diff --git a/luni/src/test/api/common/org/apache/harmony/luni/tests/pkg2/TestClass.java b/luni/src/test/api/common/org/apache/harmony/luni/tests/pkg2/TestClass.java deleted file mode 100644 index c1a9a4e..0000000 --- a/luni/src/test/api/common/org/apache/harmony/luni/tests/pkg2/TestClass.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.harmony.luni.tests.pkg2; - -import java.io.Serializable; - -/** - * Used for a serialization test, must have different package and same base name - * as the TestClass in o.a.h.l.tests.pkg1 - */ -public class TestClass implements Serializable { - private static final long serialVersionUID = 11111L; - public int i = 0; -} diff --git a/luni/src/test/resources/org/apache/harmony/luni/tests/ObjectStreamClassTest.jar b/luni/src/test/resources/org/apache/harmony/luni/tests/ObjectStreamClassTest.jar deleted file mode 100644 index 7ba6034..0000000 Binary files a/luni/src/test/resources/org/apache/harmony/luni/tests/ObjectStreamClassTest.jar and /dev/null differ diff --git a/luni/src/test/resources/org/apache/harmony/luni/tests/key_store.bks b/luni/src/test/resources/org/apache/harmony/luni/tests/key_store.bks deleted file mode 100644 index 9aa43d8..0000000 Binary files a/luni/src/test/resources/org/apache/harmony/luni/tests/key_store.bks and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/AbstractMapTest_SimpleEntry.golden.ser b/luni/src/test/resources/serialization/java/util/AbstractMapTest_SimpleEntry.golden.ser deleted file mode 100644 index 0b5d815..0000000 Binary files a/luni/src/test/resources/serialization/java/util/AbstractMapTest_SimpleEntry.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser b/luni/src/test/resources/serialization/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser deleted file mode 100644 index a85543d..0000000 Binary files a/luni/src/test/resources/serialization/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/Collections_CheckedCollection.golden.ser b/luni/src/test/resources/serialization/java/util/Collections_CheckedCollection.golden.ser deleted file mode 100644 index eec840e..0000000 Binary files a/luni/src/test/resources/serialization/java/util/Collections_CheckedCollection.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/Collections_CheckedList.golden.ser b/luni/src/test/resources/serialization/java/util/Collections_CheckedList.golden.ser deleted file mode 100644 index e9a4122..0000000 Binary files a/luni/src/test/resources/serialization/java/util/Collections_CheckedList.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/Collections_CheckedListRandomAccess.golden.ser b/luni/src/test/resources/serialization/java/util/Collections_CheckedListRandomAccess.golden.ser deleted file mode 100644 index dfa2d43..0000000 Binary files a/luni/src/test/resources/serialization/java/util/Collections_CheckedListRandomAccess.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/Collections_CheckedMap.golden.ser b/luni/src/test/resources/serialization/java/util/Collections_CheckedMap.golden.ser deleted file mode 100644 index 13415f6..0000000 Binary files a/luni/src/test/resources/serialization/java/util/Collections_CheckedMap.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/Collections_CheckedSet.golden.ser b/luni/src/test/resources/serialization/java/util/Collections_CheckedSet.golden.ser deleted file mode 100644 index ed1f305..0000000 Binary files a/luni/src/test/resources/serialization/java/util/Collections_CheckedSet.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/Collections_CheckedSortedMap.golden.ser b/luni/src/test/resources/serialization/java/util/Collections_CheckedSortedMap.golden.ser deleted file mode 100644 index eca8ffa..0000000 Binary files a/luni/src/test/resources/serialization/java/util/Collections_CheckedSortedMap.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/Collections_CheckedSortedSet.golden.ser b/luni/src/test/resources/serialization/java/util/Collections_CheckedSortedSet.golden.ser deleted file mode 100644 index 4520ed4..0000000 Binary files a/luni/src/test/resources/serialization/java/util/Collections_CheckedSortedSet.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/Collections_asLifoQueue.golden.ser b/luni/src/test/resources/serialization/java/util/Collections_asLifoQueue.golden.ser deleted file mode 100644 index 73134df..0000000 Binary files a/luni/src/test/resources/serialization/java/util/Collections_asLifoQueue.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/Collections_newSetFromMap.golden.ser b/luni/src/test/resources/serialization/java/util/Collections_newSetFromMap.golden.ser deleted file mode 100644 index 88f97e5..0000000 Binary files a/luni/src/test/resources/serialization/java/util/Collections_newSetFromMap.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/java/util/PriorityQueue.golden.ser b/luni/src/test/resources/serialization/java/util/PriorityQueue.golden.ser deleted file mode 100644 index d716dda..0000000 Binary files a/luni/src/test/resources/serialization/java/util/PriorityQueue.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/FileTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/FileTest.golden.ser deleted file mode 100644 index 0a15a61..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/FileTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/IOErrorTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/IOErrorTest.golden.ser deleted file mode 100644 index cd0e319..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/IOErrorTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_integers.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_integers.ser deleted file mode 100644 index 3c5a5e1..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_integers.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_strings.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_strings.ser deleted file mode 100644 index ee2de1c..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_strings.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.golden.ser deleted file mode 100644 index 255e965..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/IllegalArgumentExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/IllegalArgumentExceptionTest.golden.ser deleted file mode 100644 index a94e8bf..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/IllegalArgumentExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/IllegalStateExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/IllegalStateExceptionTest.golden.ser deleted file mode 100644 index 14b902b..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/IllegalStateExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/SecurityExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/SecurityExceptionTest.golden.ser deleted file mode 100644 index 76abfd1..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/SecurityExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/StringBufferTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/StringBufferTest.golden.ser deleted file mode 100644 index 861b4ab..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/StringBufferTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/StringBuilderTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/StringBuilderTest.golden.ser deleted file mode 100644 index fb54290..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/StringBuilderTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser deleted file mode 100644 index 9197188..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.golden.ser deleted file mode 100644 index 40413eb..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.golden.ser deleted file mode 100644 index bc70d04..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.golden.0.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.golden.0.ser deleted file mode 100644 index 4607c20..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.golden.0.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.golden.1.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.golden.1.ser deleted file mode 100644 index 5d55693..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.golden.1.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetAddressTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetAddressTest.golden.ser deleted file mode 100644 index bc70d04..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetAddressTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.golden.0.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.golden.0.ser deleted file mode 100644 index 94fe222..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.golden.0.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.golden.1.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.golden.1.ser deleted file mode 100644 index 1672d5f..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.golden.1.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/SocketTimeoutExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/SocketTimeoutExceptionTest.golden.ser deleted file mode 100644 index a6e7680..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/SocketTimeoutExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/ArrayDequeTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/ArrayDequeTest.golden.ser deleted file mode 100644 index 794419a..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/ArrayDequeTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/BitSetTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/BitSetTest.golden.ser deleted file mode 100644 index 1f38d8d..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/BitSetTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser deleted file mode 100644 index f26eade..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumMapTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumMapTest.golden.ser deleted file mode 100644 index 8ab8303..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumMapTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumSetTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumSetTest.golden.ser deleted file mode 100644 index 6859db8..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumSetTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser deleted file mode 100644 index ff1afb2..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.golden.ser deleted file mode 100644 index 02e8dbc..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/HashMapTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/HashMapTest.golden.ser deleted file mode 100644 index 529512a..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/HashMapTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/HashSetTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/HashSetTest.golden.ser deleted file mode 100644 index 5d76a32..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/HashSetTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.golden.ser deleted file mode 100644 index a1d8844..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser deleted file mode 100644 index 23db2c6..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser deleted file mode 100644 index 52c8817..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser deleted file mode 100644 index b14987f..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser deleted file mode 100644 index e822aec..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser deleted file mode 100644 index 8e1a25b..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.golden.ser deleted file mode 100644 index 5b76933..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/LinkedListTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/LinkedListTest.golden.ser deleted file mode 100644 index c94e6dc..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/LinkedListTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser deleted file mode 100644 index ea6797d..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.golden.ser deleted file mode 100644 index 19773a5..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/ServiceConfigurationErrorTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/ServiceConfigurationErrorTest.golden.ser deleted file mode 100644 index d43a064..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/ServiceConfigurationErrorTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser deleted file mode 100644 index 20a59cc..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser and /dev/null differ diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser deleted file mode 100644 index e4b2278..0000000 Binary files a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser and /dev/null differ diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser b/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser deleted file mode 100644 index d20eed1..0000000 Binary files a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser and /dev/null 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/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser deleted file mode 100644 index 9ecd6e1..0000000 Binary files a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser and /dev/null 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/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser deleted file mode 100644 index 6e58660..0000000 Binary files a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser and /dev/null 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/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser deleted file mode 100644 index be37cb8..0000000 Binary files a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser and /dev/null 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/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser deleted file mode 100644 index 4e51a0a..0000000 Binary files a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser and /dev/null 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/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser deleted file mode 100644 index 642e2fc..0000000 Binary files a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser and /dev/null differ diff --git a/support/src/test/resources/hyts_Foo.c b/support/src/test/resources/hyts_Foo.c deleted file mode 100644 index 907de59..0000000 --- a/support/src/test/resources/hyts_Foo.c +++ /dev/null @@ -1 +0,0 @@ -/* Some random file for it to look at. */ \ No newline at end of file diff --git a/support/src/test/resources/tests/resources/hyts_compDiction.bin b/support/src/test/resources/tests/resources/hyts_compDiction.bin deleted file mode 100644 index f0478c8..0000000 Binary files a/support/src/test/resources/tests/resources/hyts_compDiction.bin and /dev/null differ diff --git a/support/src/test/resources/tests/resources/hyts_compressD.bin b/support/src/test/resources/tests/resources/hyts_compressD.bin deleted file mode 100644 index 36c89f2..0000000 Binary files a/support/src/test/resources/tests/resources/hyts_compressD.bin and /dev/null differ diff --git a/support/src/test/resources/tests/resources/hyts_construOD.bin b/support/src/test/resources/tests/resources/hyts_construOD.bin deleted file mode 100644 index 035d12e..0000000 Binary files a/support/src/test/resources/tests/resources/hyts_construOD.bin and /dev/null differ diff --git a/support/src/test/resources/tests/resources/hyts_construODI.bin b/support/src/test/resources/tests/resources/hyts_construODI.bin deleted file mode 100644 index 1e5d284..0000000 Binary files a/support/src/test/resources/tests/resources/hyts_construODI.bin and /dev/null differ -- cgit v1.2.3 From 67dd5eb502c254798add303344ab429566782a54 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 3 May 2019 12:47:34 +0100 Subject: Avoid conflict with libcore.java.util.logging.OldLoggerTest If the LoggerTest#testGetLogger_WithParentNormal is run too close in time to the OldLoggerTest#testGetLogger_WithParent then the second one will fail. That's because they both use the same name for a logger, check that logger does not exist before starting and then create the logger. The only way for the tests to be run successfully is for the logger that was created to be garbage collected between the runs. This was detected when investigating another conflict between logging tests from libcore and external/apache-harmony. The fix is simply to use a different name for the logger. Bug: 131738612 Test: atest libcore.java.util.logging \ org.apache.harmony.logging.tests.java.util.logging Change-Id: I188e77ecd344e1d33b5c3cf65ad7f15bb87e067c --- .../logging/tests/java/util/logging/LoggerTest.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java index d7bd352..bf5e01c 100644 --- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java +++ b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java @@ -332,9 +332,9 @@ public class LoggerTest extends TestCase { */ public void testGetLogger_WithParentNormal() { assertNull(LogManager.getLogManager().getLogger( - "testGetLogger_WithParent_ParentLogger")); + "testGetLogger_WithParentNormal_ParentLogger")); // create the parent logger - Logger pLog = Logger.getLogger("testGetLogger_WithParent_ParentLogger", + Logger pLog = Logger.getLogger("testGetLogger_WithParentNormal_ParentLogger", VALID_RESOURCE_BUNDLE); pLog.setLevel(Level.CONFIG); pLog.addHandler(new MockHandler()); @@ -342,14 +342,14 @@ public class LoggerTest extends TestCase { pLog.setUseParentHandlers(false); assertNull(LogManager.getLogManager().getLogger( - "testGetLogger_WithParent_ParentLogger.child")); + "testGetLogger_WithParentNormal_ParentLogger.child")); // create the child logger Logger log = Logger - .getLogger("testGetLogger_WithParent_ParentLogger.child"); + .getLogger("testGetLogger_WithParentNormal_ParentLogger.child"); assertNull(log.getFilter()); assertEquals(0, log.getHandlers().length); assertNull(log.getLevel()); - assertEquals("testGetLogger_WithParent_ParentLogger.child", log + assertEquals("testGetLogger_WithParentNormal_ParentLogger.child", log .getName()); assertSame(log.getParent(), pLog); assertNull(log.getResourceBundle()); @@ -532,25 +532,25 @@ public class LoggerTest extends TestCase { */ public void testGetLoggerWithRes_WithParentNormal() { assertNull(LogManager.getLogManager().getLogger( - "testGetLoggerWithRes_WithParent_ParentLogger")); + "testGetLoggerWithRes_WithParentNormal_ParentLogger")); // create the parent logger Logger pLog = Logger - .getLogger("testGetLoggerWithRes_WithParent_ParentLogger"); + .getLogger("testGetLoggerWithRes_WithParentNormal_ParentLogger"); pLog.setLevel(Level.CONFIG); pLog.addHandler(new MockHandler()); pLog.setFilter(new MockFilter()); pLog.setUseParentHandlers(false); assertNull(LogManager.getLogManager().getLogger( - "testGetLoggerWithRes_WithParent_ParentLogger.child")); + "testGetLoggerWithRes_WithParentNormal_ParentLogger.child")); // create the child logger Logger log = Logger.getLogger( - "testGetLoggerWithRes_WithParent_ParentLogger.child", + "testGetLoggerWithRes_WithParentNormal_ParentLogger.child", VALID_RESOURCE_BUNDLE); assertNull(log.getFilter()); assertEquals(0, log.getHandlers().length); assertNull(log.getLevel()); - assertEquals("testGetLoggerWithRes_WithParent_ParentLogger.child", log + assertEquals("testGetLoggerWithRes_WithParentNormal_ParentLogger.child", log .getName()); assertSame(log.getParent(), pLog); assertEquals(VALID_VALUE, log.getResourceBundle().getString(VALID_KEY)); -- cgit v1.2.3