You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2008/01/07 16:12:56 UTC
svn commit: r609632 [1/2] - in
/harmony/enhanced/classlib/trunk/modules/luni/src/test:
api/common/org/apache/harmony/luni/tests/java/lang/
api/common/org/apache/harmony/luni/tests/java/util/
api/common/tests/api/java/lang/ api/common/tests/api/java/uti...
Author: tellison
Date: Mon Jan 7 07:12:45 2008
New Revision: 609632
URL: http://svn.apache.org/viewvc?rev=609632&view=rev
Log:
Restructure some LUNI tests from tests.api package to o.a.h.l.tests,
including regenerating a few golden serialization files, and merging
some test cases.
Added:
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/Process2Test.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/Process2Test.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ProcessTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/ProcessTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractListTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractListTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractQueueTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractQueueTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractSequentialListTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractSequentialListTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArrayListTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Arrays2Test.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArraysTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CalendarTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Collections2Test.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CollectionsTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModificationExceptionTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModificationExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CurrencyTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/DateTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EmptyStackExceptionTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EmptyStackExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumMapTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumSetTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumSetTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EventObjectTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EventObjectTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormattableFlagsTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormattableFlagsTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormatterTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormatterTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashSetTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashSetTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashtableTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashtableTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java (with props)
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashSetTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashSetTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedListTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedListTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ListResourceBundleTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ListResourceBundleTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LocaleTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/MissingResourceExceptionTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/MissingResourceExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/NoSuchElementExceptionTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/NoSuchElementExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ObservableTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ObservableTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PriorityQueueTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PriorityQueueTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertiesTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyPermissionTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyPermissionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyResourceBundleTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/RandomTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/RandomTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ResourceBundleTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SampleBundleClass.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SampleBundleClass.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ScannerTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SimpleTimeZoneTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SimpleTimeZoneTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/StackTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StackTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/StringTokenizerTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StringTokenizerTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimeZoneTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTaskTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTaskTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TooManyListenersExceptionTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TooManyListenersExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeMapTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeSetTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeSetTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/VectorTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/VectorTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/WeakHashMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/BitSetTest.golden.ser
- copied unchanged from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/api/java/util/BitSetTest.golden.ser
harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumMapTest.golden.ser
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser
harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumSetTest.golden.ser
- copied, changed from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser
harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/HashSetTest.golden.ser
- copied unchanged from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser
harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/PropertyPermissionTest.golden.ser
- copied unchanged from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/api/java/util/PropertyPermissionTest.golden.ser
Removed:
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/Process2Test.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/ProcessTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractListTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractQueueTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractSequentialListTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AllTests.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArrayListTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArraysTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/BitSetTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CollectionsTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModificationExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CurrencyTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/DateTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EmptyStackExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumSetTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EventObjectTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormattableFlagsTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormatterTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashSetTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashtableTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/IdentityHashMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashSetTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedListTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ListResourceBundleTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/MissingResourceExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/NoSuchElementExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ObservableTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PriorityQueueTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertiesTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyPermissionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyResourceBundleTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/RandomTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ResourceBundleTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SampleBundleClass.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ScannerTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SimpleTimeZoneTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StackTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StringTokenizerTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimeZoneTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTaskTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TooManyListenersExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeSetTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/VectorTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/WeakHashMapTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/Process2Test.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/Process2Test.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/Process2Test.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/Process2Test.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/Process2Test.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/Process2Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/Process2Test.java Mon Jan 7 07:12:45 2008
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ProcessTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/ProcessTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ProcessTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ProcessTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/ProcessTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/lang/ProcessTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ProcessTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import java.io.IOException;
import java.io.InputStream;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractListTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractListTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractListTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractListTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractListTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractListTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractListTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.AbstractList;
import java.util.ArrayList;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractMapTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractMapTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractMapTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.AbstractMap;
import java.util.AbstractSet;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractQueueTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractQueueTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractQueueTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractQueueTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractQueueTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractQueueTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractQueueTest.java Mon Jan 7 07:12:45 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.AbstractQueue;
import java.util.ArrayList;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractSequentialListTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractSequentialListTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractSequentialListTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractSequentialListTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractSequentialListTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/AbstractSequentialListTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractSequentialListTest.java Mon Jan 7 07:12:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.AbstractSequentialList;
import java.util.Arrays;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArrayListTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArrayListTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArrayListTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java Mon Jan 7 07:12:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.ArrayList;
import java.util.Arrays;
@@ -156,6 +156,22 @@
}
}
+ public void test_addAllCollectionOfQextendsE() {
+ // Regression for HARMONY-539
+ // https://issues.apache.org/jira/browse/HARMONY-539
+ ArrayList<String> alist = new ArrayList<String>();
+ ArrayList<String> blist = new ArrayList<String>();
+ alist.add("a");
+ alist.add("b");
+ blist.add("c");
+ blist.add("d");
+ blist.remove(0);
+ blist.addAll(0, alist);
+ assertEquals("a", blist.get(0));
+ assertEquals("b", blist.get(1));
+ assertEquals("d", blist.get(2));
+ }
+
/**
* @tests java.util.ArrayList#addAll(java.util.Collection)
*/
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Arrays2Test.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Arrays2Test.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Arrays2Test.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Arrays2Test.java Mon Jan 7 07:12:45 2008
@@ -27,7 +27,7 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
-public class ArraysTest extends TestCase {
+public class Arrays2Test extends TestCase {
/**
* @tests java.util.Arrays#binarySearch(double[], double)
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArraysTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArraysTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ArraysTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java Mon Jan 7 07:12:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.lang.reflect.Method;
import java.util.Arrays;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CalendarTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CalendarTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CalendarTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CalendarTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.Calendar;
import java.util.Date;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Collections2Test.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Collections2Test.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Collections2Test.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/Collections2Test.java Mon Jan 7 07:12:45 2008
@@ -42,7 +42,7 @@
import junit.framework.TestCase;
import tests.util.SerializationTester;
-public class CollectionsTest extends TestCase {
+public class Collections2Test extends TestCase {
private static final SerializableAssert comparator = new SerializableAssert() {
public void assertDeserialized(Serializable reference, Serializable test) {
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CollectionsTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CollectionsTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CollectionsTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.AbstractList;
import java.util.ArrayList;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModificationExceptionTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModificationExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModificationExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModificationExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModificationExceptionTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ConcurrentModificationExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ConcurrentModificationExceptionTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.Collection;
import java.util.ConcurrentModificationException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CurrencyTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CurrencyTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/CurrencyTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.Currency;
import java.util.Locale;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/DateTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/DateTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/DateTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.Calendar;
import java.util.Date;
@@ -322,6 +322,12 @@
} catch (IllegalArgumentException e) {
// expected
}
+
+ // Regression for HARMONY-102
+ assertEquals("Assert 0: parse failure",
+ -5400000, Date.parse("Sat, 1 Jan 1970 +0130 00:00:00"));
+ assertEquals("Assert 1: parse failure",
+ 858600000, Date.parse("00:00:00 GMT +0130 Sat, 11 Jan 1970"));
}
/**
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EmptyStackExceptionTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EmptyStackExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EmptyStackExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EmptyStackExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EmptyStackExceptionTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EmptyStackExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EmptyStackExceptionTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.EmptyStackException;
import java.util.Stack;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumMapTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumMapTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumMapTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumMapTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumMapTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumMapTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumMapTest.java Mon Jan 7 07:12:45 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -1154,21 +1154,5 @@
enumColorMap.put(Color.Red, 1);
enumColorMap.put(Color.Blue, 3);
SerializationTest.verifyGolden(this, enumColorMap);
- }
-
- /**
- * Sets up the fixture.
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- /**
- * Tears down the fixture.
- */
- @Override
- protected void tearDown() throws Exception{
- super.tearDown();
}
}
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumSetTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumSetTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumSetTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumSetTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumSetTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EnumSetTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumSetTest.java Mon Jan 7 07:12:45 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.ArrayList;
import java.util.Collection;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EventObjectTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EventObjectTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EventObjectTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EventObjectTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EventObjectTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/EventObjectTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EventObjectTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.EventObject;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormattableFlagsTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormattableFlagsTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormattableFlagsTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormattableFlagsTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormattableFlagsTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormattableFlagsTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormattableFlagsTest.java Mon Jan 7 07:12:45 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.FormattableFlags;
import junit.framework.TestCase;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormatterTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormatterTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormatterTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormatterTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormatterTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/FormatterTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormatterTest.java Mon Jan 7 07:12:45 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.io.BufferedOutputStream;
import java.io.Closeable;
@@ -51,6 +51,7 @@
import java.util.MissingFormatWidthException;
import java.util.TimeZone;
import java.util.UnknownFormatConversionException;
+import java.util.Formatter.BigDecimalLayoutForm;
import junit.framework.TestCase;
@@ -4214,6 +4215,27 @@
f = new Formatter(Locale.UK);
f.format("% .5A", (BigDecimal) null);
assertEquals("NULL", f.toString());
+ }
+
+ /**
+ * @tests java.util.Formatter.BigDecimalLayoutForm#values()
+ */
+ public void test_values() {
+ BigDecimalLayoutForm[] vals = BigDecimalLayoutForm.values();
+ assertEquals("Invalid length of enum values", 2, vals.length);
+ assertEquals("Wrong scientific value in enum", BigDecimalLayoutForm.SCIENTIFIC, vals[0]);
+ assertEquals("Wrong dec float value in enum", BigDecimalLayoutForm.DECIMAL_FLOAT, vals[1]);
+ }
+
+ /**
+ * @tests java.util.Formatter.BigDecimalLayoutForm#valueOf(String)
+ */
+ public void test_valueOfLjava_lang_String() {
+ BigDecimalLayoutForm sci = BigDecimalLayoutForm.valueOf("SCIENTIFIC");
+ assertEquals("Wrong scientific value in enum", BigDecimalLayoutForm.SCIENTIFIC, sci);
+
+ BigDecimalLayoutForm decFloat = BigDecimalLayoutForm.valueOf("DECIMAL_FLOAT");
+ assertEquals("Wrong dec float value from valueOf ", BigDecimalLayoutForm.DECIMAL_FLOAT, decFloat);
}
/**
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.BitSet;
import java.util.Calendar;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashMapTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashMapTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashMapTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.AbstractMap;
import java.util.ArrayList;
@@ -27,6 +27,8 @@
import java.util.Set;
import java.util.TreeMap;
+import org.apache.harmony.testframework.serialization.SerializationTest;
+
import tests.support.Support_MapTest2;
import tests.support.Support_UnmodifiableCollectionTest;
@@ -139,6 +141,12 @@
} catch (NullPointerException e) {
//empty
}
+
+ HashMap map = new HashMap();
+ map.put("a", "a");
+ SubMap map2 = new SubMap(map);
+ assertTrue(map2.containsKey("a"));
+ assertTrue(map2.containsValue("a"));
}
/**
@@ -547,10 +555,39 @@
hm.put(null, "test");
}
- /**
- * Tears down the fixture, for example, close a network connection. This
- * method is called after a test is executed.
- */
- protected void tearDown() {
- }
+
+ class SubMap<K, V> extends HashMap<K, V> {
+ public SubMap(Map<? extends K, ? extends V> m) {
+ super(m);
+ }
+
+ public V put(K key, V value) {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ /**
+ * @tests serialization/deserialization.
+ */
+ public void testSerializationSelf() throws Exception {
+ HashMap<String, String> hm = new HashMap<String, String>();
+ hm.put("key", "value");
+
+ SerializationTest.verifySelf(hm);
+
+ // regression for HARMONY-1583
+ hm.put(null, "null");
+ SerializationTest.verifySelf(hm);
+ }
+
+ /**
+ * @tests serialization/deserialization compatibility with RI.
+ */
+ public void testSerializationCompatibility() throws Exception {
+ HashMap<String, String> hm = new HashMap<String, String>();
+ hm.put("key", "value");
+
+ SerializationTest.verifyGolden(this, hm);
+ }
+
}
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashSetTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashSetTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashSetTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashSetTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashSetTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashSetTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashSetTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.Arrays;
import java.util.HashSet;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashtableTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashtableTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashtableTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashtableTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashtableTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/HashtableTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashtableTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,7 +31,6 @@
import java.util.TreeMap;
import java.util.Vector;
-import tests.api.java.util.HashMapTest.ReusableKey;
import tests.support.Support_MapTest2;
import tests.support.Support_UnmodifiableCollectionTest;
@@ -682,10 +681,25 @@
htfull.put("FKey " + i, "FVal " + i);
}
- /**
- * Tears down the fixture, for example, close a network connection. This
- * method is called after a test is executed.
- */
- protected void tearDown() {
- }
+ static class ReusableKey {
+ private int key = 0;
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public int hashCode() {
+ return key;
+ }
+
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (!(o instanceof ReusableKey)) {
+ return false;
+ }
+ return key == ((ReusableKey) o).key;
+ }
+ }
}
Added: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java?rev=609632&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java Mon Jan 7 07:12:45 2008
@@ -0,0 +1,456 @@
+/*
+ * 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.util;
+
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import tests.support.Support_MapTest2;
+
+import org.apache.harmony.testframework.serialization.SerializationTest;
+
+public class IdentityHashMap2Test extends junit.framework.TestCase {
+ private static final String ID = "hello";
+
+ class MockMap extends AbstractMap {
+ public Set entrySet() {
+ return null;
+ }
+ public int size(){
+ return 0;
+ }
+ }
+ /*
+ * TODO: change all the statements testing the keys and values with equals()
+ * method to check for reference equality instead
+ */
+
+ IdentityHashMap hm;
+
+ final static int hmSize = 1000;
+
+ static Object[] objArray;
+
+ static Object[] objArray2;
+ {
+ objArray = new Object[hmSize];
+ objArray2 = new Object[hmSize];
+ for (int i = 0; i < objArray.length; i++) {
+ objArray[i] = new Integer(i);
+ objArray2[i] = objArray[i].toString();
+ }
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#IdentityHashMap()
+ */
+ public void test_Constructor() {
+ // Test for method java.util.IdentityHashMap()
+ new Support_MapTest2(new IdentityHashMap()).runTest();
+
+ IdentityHashMap hm2 = new IdentityHashMap();
+ assertEquals("Created incorrect IdentityHashMap", 0, hm2.size());
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#IdentityHashMap(int)
+ */
+ public void test_ConstructorI() {
+ // Test for method java.util.IdentityHashMap(int)
+ IdentityHashMap hm2 = new IdentityHashMap(5);
+ assertEquals("Created incorrect IdentityHashMap", 0, hm2.size());
+ try {
+ new IdentityHashMap(-1);
+ } catch (IllegalArgumentException e) {
+ return;
+ }
+ fail(
+ "Failed to throw IllegalArgumentException for initial capacity < 0");
+
+ IdentityHashMap empty = new IdentityHashMap(0);
+ assertNull("Empty IdentityHashMap access", empty.get("nothing"));
+ empty.put("something", "here");
+ assertTrue("cannot get element", empty.get("something") == "here");
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#IdentityHashMap(java.util.Map)
+ */
+ public void test_ConstructorLjava_util_Map() {
+ // Test for method java.util.IdentityHashMap(java.util.Map)
+ Map myMap = new TreeMap();
+ for (int counter = 0; counter < hmSize; counter++)
+ myMap.put(objArray2[counter], objArray[counter]);
+ IdentityHashMap hm2 = new IdentityHashMap(myMap);
+ for (int counter = 0; counter < hmSize; counter++)
+ assertTrue("Failed to construct correct IdentityHashMap", hm
+ .get(objArray2[counter]) == hm2.get(objArray2[counter]));
+
+ Map mockMap = new MockMap();
+ hm2 = new IdentityHashMap(mockMap);
+ assertEquals("Size should be 0", 0, hm2.size());
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#clear()
+ */
+ public void test_clear() {
+ // Test for method void java.util.IdentityHashMap.clear()
+ hm.clear();
+ assertEquals("Clear failed to reset size", 0, hm.size());
+ for (int i = 0; i < hmSize; i++)
+ assertNull("Failed to clear all elements",
+ hm.get(objArray2[i]));
+
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#clone()
+ */
+ public void test_clone() {
+ // Test for method java.lang.Object java.util.IdentityHashMap.clone()
+ IdentityHashMap hm2 = (IdentityHashMap) hm.clone();
+ assertTrue("Clone answered equivalent IdentityHashMap", hm2 != hm);
+ for (int counter = 0; counter < hmSize; counter++)
+ assertTrue("Clone answered unequal IdentityHashMap", hm
+ .get(objArray2[counter]) == hm2.get(objArray2[counter]));
+
+ IdentityHashMap map = new IdentityHashMap();
+ map.put("key", "value");
+ // get the keySet() and values() on the original Map
+ Set keys = map.keySet();
+ Collection values = map.values();
+ assertEquals("values() does not work",
+ "value", values.iterator().next());
+ assertEquals("keySet() does not work",
+ "key", keys.iterator().next());
+ AbstractMap map2 = (AbstractMap) map.clone();
+ map2.put("key", "value2");
+ Collection values2 = map2.values();
+ assertTrue("values() is identical", values2 != values);
+ // values() and keySet() on the cloned() map should be different
+ assertEquals("values() was not cloned",
+ "value2", values2.iterator().next());
+ map2.clear();
+ map2.put("key2", "value3");
+ Set key2 = map2.keySet();
+ assertTrue("keySet() is identical", key2 != keys);
+ assertEquals("keySet() was not cloned",
+ "key2", key2.iterator().next());
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#containsKey(java.lang.Object)
+ */
+ public void test_containsKeyLjava_lang_Object() {
+ // Test for method boolean
+ // java.util.IdentityHashMap.containsKey(java.lang.Object)
+ assertTrue("Returned false for valid key", hm
+ .containsKey(objArray2[23]));
+ assertTrue("Returned true for copy of valid key", !hm
+ .containsKey(new Integer(23).toString()));
+ assertTrue("Returned true for invalid key", !hm.containsKey("KKDKDKD"));
+
+ IdentityHashMap m = new IdentityHashMap();
+ m.put(null, "test");
+ assertTrue("Failed with null key", m.containsKey(null));
+ assertTrue("Failed with missing key matching null hash", !m
+ .containsKey(new Integer(0)));
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#containsValue(java.lang.Object)
+ */
+ public void test_containsValueLjava_lang_Object() {
+ // Test for method boolean
+ // java.util.IdentityHashMap.containsValue(java.lang.Object)
+ assertTrue("Returned false for valid value", hm
+ .containsValue(objArray[19]));
+ assertTrue("Returned true for invalid valie", !hm
+ .containsValue(new Integer(-9)));
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#entrySet()
+ */
+ public void test_entrySet() {
+ // Test for method java.util.Set java.util.IdentityHashMap.entrySet()
+ Set s = hm.entrySet();
+ Iterator i = s.iterator();
+ assertTrue("Returned set of incorrect size", hm.size() == s.size());
+ while (i.hasNext()) {
+ Map.Entry m = (Map.Entry) i.next();
+ assertTrue("Returned incorrect entry set", hm.containsKey(m
+ .getKey())
+ && hm.containsValue(m.getValue()));
+ }
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#get(java.lang.Object)
+ */
+ public void test_getLjava_lang_Object() {
+ // Test for method java.lang.Object
+ // java.util.IdentityHashMap.get(java.lang.Object)
+ assertNull("Get returned non-null for non existent key",
+ hm.get("T"));
+ hm.put("T", "HELLO");
+ assertEquals("Get returned incorecct value for existing key", "HELLO", hm.get("T")
+ );
+
+ IdentityHashMap m = new IdentityHashMap();
+ m.put(null, "test");
+ assertEquals("Failed with null key", "test", m.get(null));
+ assertNull("Failed with missing key matching null hash", m
+ .get(new Integer(0)));
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#isEmpty()
+ */
+ public void test_isEmpty() {
+ // Test for method boolean java.util.IdentityHashMap.isEmpty()
+ assertTrue("Returned false for new map", new IdentityHashMap()
+ .isEmpty());
+ assertTrue("Returned true for non-empty", !hm.isEmpty());
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#keySet()
+ */
+ public void test_keySet() {
+ // Test for method java.util.Set java.util.IdentityHashMap.keySet()
+ Set s = hm.keySet();
+ assertTrue("Returned set of incorrect size()", s.size() == hm.size());
+ for (int i = 0; i < objArray.length; i++) {
+ assertTrue("Returned set does not contain all keys", s
+ .contains(objArray2[i]));
+ }
+
+ IdentityHashMap m = new IdentityHashMap();
+ m.put(null, "test");
+ assertTrue("Failed with null key", m.keySet().contains(null));
+ assertNull("Failed with null key", m.keySet().iterator().next());
+
+ Map map = new IdentityHashMap(101);
+ map.put(new Integer(1), "1");
+ map.put(new Integer(102), "102");
+ map.put(new Integer(203), "203");
+ Iterator it = map.keySet().iterator();
+ Integer remove1 = (Integer) it.next();
+ it.hasNext();
+ it.remove();
+ Integer remove2 = (Integer) it.next();
+ it.remove();
+ ArrayList list = new ArrayList(Arrays.asList(new Integer[] {
+ new Integer(1), new Integer(102), new Integer(203) }));
+ list.remove(remove1);
+ list.remove(remove2);
+ assertTrue("Wrong result", it.next().equals(list.get(0)));
+ assertEquals("Wrong size", 1, map.size());
+ assertTrue("Wrong contents", map.keySet().iterator().next().equals(
+ list.get(0)));
+
+ Map map2 = new IdentityHashMap(101);
+ map2.put(new Integer(1), "1");
+ map2.put(new Integer(4), "4");
+ Iterator it2 = map2.keySet().iterator();
+ Integer remove3 = (Integer) it2.next();
+ Integer next;
+ if (remove3.intValue() == 1)
+ next = new Integer(4);
+ else
+ next = new Integer(1);
+ it2.hasNext();
+ it2.remove();
+ assertTrue("Wrong result 2", it2.next().equals(next));
+ assertEquals("Wrong size 2", 1, map2.size());
+ assertTrue("Wrong contents 2", map2.keySet().iterator().next().equals(
+ next));
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#put(java.lang.Object, java.lang.Object)
+ */
+ public void test_putLjava_lang_ObjectLjava_lang_Object() {
+ // Test for method java.lang.Object
+ // java.util.IdentityHashMap.put(java.lang.Object, java.lang.Object)
+ hm.put("KEY", "VALUE");
+ assertEquals("Failed to install key/value pair",
+ "VALUE", hm.get("KEY"));
+
+ IdentityHashMap m = new IdentityHashMap();
+ Short s0 = new Short((short) 0);
+ m.put(s0, "short");
+ m.put(null, "test");
+ Integer i0 = new Integer(0);
+ m.put(i0, "int");
+ assertEquals("Failed adding to bucket containing null",
+ "short", m.get(s0));
+ assertEquals("Failed adding to bucket containing null2", "int", m.get(i0)
+ );
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#putAll(java.util.Map)
+ */
+ public void test_putAllLjava_util_Map() {
+ // Test for method void java.util.IdentityHashMap.putAll(java.util.Map)
+ IdentityHashMap hm2 = new IdentityHashMap();
+ hm2.putAll(hm);
+ for (int i = 0; i < 1000; i++)
+ assertTrue("Failed to clear all elements", hm2.get(objArray2[i])
+ .equals((new Integer(i))));
+
+ hm2 = new IdentityHashMap();
+ Map mockMap = new MockMap();
+ hm2.putAll(mockMap);
+ assertEquals("Size should be 0", 0, hm2.size());
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#remove(java.lang.Object)
+ */
+ public void test_removeLjava_lang_Object() {
+ // Test for method java.lang.Object
+ // java.util.IdentityHashMap.remove(java.lang.Object)
+ int size = hm.size();
+ Integer x = ((Integer) hm.remove(objArray2[9]));
+ assertTrue("Remove returned incorrect value", x.equals(new Integer(9)));
+ assertNull("Failed to remove given key", hm.get(objArray2[9]));
+ assertTrue("Failed to decrement size", hm.size() == (size - 1));
+ assertNull("Remove of non-existent key returned non-null", hm
+ .remove("LCLCLC"));
+
+ IdentityHashMap m = new IdentityHashMap();
+ m.put(null, "test");
+ assertNull("Failed with same hash as null",
+ m.remove(objArray[0]));
+ assertEquals("Failed with null key", "test", m.remove(null));
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#size()
+ */
+ public void test_size() {
+ // Test for method int java.util.IdentityHashMap.size()
+ assertEquals("Returned incorrect size, ", (objArray.length + 2), hm
+ .size());
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#equals(java.lang.Object)
+ */
+ public void test_equalsLjava_lang_Object() {
+ IdentityHashMap mapOne = new IdentityHashMap();
+ IdentityHashMap mapTwo = new IdentityHashMap();
+ IdentityHashMap mapThree = new IdentityHashMap();
+ IdentityHashMap mapFour = new IdentityHashMap();
+
+ String one = "one";
+ String alsoOne = new String(one); // use the new operator to ensure a
+ // new reference is constructed
+ String two = "two";
+ String alsoTwo = new String(two); // use the new operator to ensure a
+ // new reference is constructed
+
+ mapOne.put(one, two);
+ mapFour.put(one, two);
+
+ // these two are not equal to the above two
+ mapTwo.put(alsoOne, two);
+ mapThree.put(one, alsoTwo);
+
+ assertEquals("failure of equality of IdentityHashMaps", mapOne, mapFour);
+ assertTrue("failure of non-equality of IdentityHashMaps one and two",
+ !mapOne.equals(mapTwo));
+ assertTrue("failure of non-equality of IdentityHashMaps one and three",
+ !mapOne.equals(mapThree));
+ assertTrue("failure of non-equality of IdentityHashMaps two and three",
+ !mapTwo.equals(mapThree));
+
+ HashMap hashMapTwo = new HashMap();
+ HashMap hashMapThree = new HashMap();
+ hashMapTwo.put(alsoOne, two);
+ hashMapThree.put(one, alsoTwo);
+
+ assertTrue(
+ "failure of non-equality of IdentityHashMaps one and Hashmap two",
+ !mapOne.equals(hashMapTwo));
+ assertTrue(
+ "failure of non-equality of IdentityHashMaps one and Hashmap three",
+ !mapOne.equals(hashMapThree));
+ }
+
+ /**
+ * @tests java.util.IdentityHashMap#values()
+ */
+ public void test_values() {
+ // Test for method java.util.Collection
+ // java.util.IdentityHashMap.values()
+ Collection c = hm.values();
+ assertTrue("Returned collection of incorrect size()", c.size() == hm
+ .size());
+ for (int i = 0; i < objArray.length; i++)
+ assertTrue("Returned collection does not contain all keys", c
+ .contains(objArray[i]));
+
+ IdentityHashMap myIdentityHashMap = new IdentityHashMap();
+ for (int i = 0; i < 100; i++)
+ myIdentityHashMap.put(objArray2[i], objArray[i]);
+ Collection values = myIdentityHashMap.values();
+ values.remove(objArray[0]);
+ assertTrue(
+ "Removing from the values collection should remove from the original map",
+ !myIdentityHashMap.containsValue(objArray2[0]));
+
+ }
+
+ /**
+ * Sets up the fixture, for example, open a network connection. This method
+ * is called before a test is executed.
+ */
+ protected void setUp() {
+ hm = new IdentityHashMap();
+ for (int i = 0; i < objArray.length; i++)
+ hm.put(objArray2[i], objArray[i]);
+ hm.put("test", null);
+ hm.put(null, "test");
+ }
+
+
+ private static final SerializationTest.SerializableAssert comparator = new
+ SerializationTest.SerializableAssert() {
+
+ public void assertDeserialized(Serializable initial, Serializable deserialized) {
+ IdentityHashMap<String, String> initialMap = (IdentityHashMap<String, String>) initial;
+ IdentityHashMap<String, String> deseriaMap = (IdentityHashMap<String, String>) deserialized;
+ assertEquals("should be equal", initialMap.size(), deseriaMap.size());
+ }
+
+ };
+}
Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java Mon Jan 7 07:12:45 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.io.NotSerializableException;
import java.util.InvalidPropertiesFormatException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashMapTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashMapTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashMapTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.AbstractMap;
import java.util.ArrayList;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashSetTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashSetTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashSetTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashSetTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashSetTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedHashSetTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedHashSetTest.java Mon Jan 7 07:12:45 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.Arrays;
import java.util.Iterator;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedListTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedListTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedListTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedListTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedListTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LinkedListTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LinkedListTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.ArrayList;
import java.util.Arrays;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ListResourceBundleTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ListResourceBundleTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ListResourceBundleTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ListResourceBundleTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ListResourceBundleTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ListResourceBundleTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ListResourceBundleTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.Enumeration;
import java.util.Locale;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LocaleTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LocaleTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LocaleTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LocaleTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.Arrays;
import java.util.HashSet;
@@ -91,23 +91,23 @@
}
/**
- * @tests java.util.Locale#getAvailableLocales()
- */
- public void test_getAvailableLocales() {
- // Test for method java.util.Locale []
- // java.util.Locale.getAvailableLocales()
- // Assumes there will generally be about 100+ available locales...
- Locale[] locales = Locale.getAvailableLocales();
- assertTrue("Wrong number of locales: ", locales.length > 100);
- // regression test for HARMONY-1514
- // HashSet can filter duplicate locales
- Set<Locale> localesSet = new HashSet<Locale>(Arrays.asList(locales));
- assertEquals(localesSet.size(), locales.length);
- }
+ * @tests java.util.Locale#getAvailableLocales()
+ */
+ public void test_getAvailableLocales() {
+ // Test for method java.util.Locale []
+ // java.util.Locale.getAvailableLocales()
+ // Assumes there will generally be about 100+ available locales...
+ Locale[] locales = Locale.getAvailableLocales();
+ assertTrue("Wrong number of locales: ", locales.length > 100);
+ // regression test for HARMONY-1514
+ // HashSet can filter duplicate locales
+ Set<Locale> localesSet = new HashSet<Locale>(Arrays.asList(locales));
+ assertEquals(localesSet.size(), locales.length);
+ }
/**
- * @tests java.util.Locale#getCountry()
- */
+ * @tests java.util.Locale#getCountry()
+ */
public void test_getCountry() {
// Test for method java.lang.String java.util.Locale.getCountry()
assertTrue("Returned incorrect country: " + testLocale.getCountry(),
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/MissingResourceExceptionTest.java (from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/MissingResourceExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/MissingResourceExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/MissingResourceExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/MissingResourceExceptionTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/MissingResourceExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/MissingResourceExceptionTest.java Mon Jan 7 07:12:45 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.util;
+package org.apache.harmony.luni.tests.java.util;
import java.util.Locale;
import java.util.MissingResourceException;