harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r609632 [2/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...
Date Mon, 07 Jan 2008 15:12:56 GMT
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/NoSuchElementExceptionTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/NoSuchElementExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/NoSuchElementExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/NoSuchElementExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/NoSuchElementExceptionTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/NoSuchElementExceptionTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/NoSuchElementExceptionTest.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.NoSuchElementException;
 import java.util.Vector;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ObservableTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ObservableTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ObservableTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ObservableTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ObservableTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ObservableTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ObservableTest.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.Observable;
 import java.util.Observer;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PriorityQueueTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PriorityQueueTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PriorityQueueTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PriorityQueueTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PriorityQueueTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PriorityQueueTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PriorityQueueTest.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.Arrays;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertiesTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertiesTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertiesTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.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.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyPermissionTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyPermissionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyPermissionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyPermissionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyPermissionTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyPermissionTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyPermissionTest.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.io.Serializable;
 import java.util.Enumeration;
@@ -133,20 +133,6 @@
         SerializationTest.verifySelf(pp, comparator);
         SerializationTest.verifyGolden(this, pp, comparator);
     }
-
-	/**
-	 * Sets up the fixture, for example, open a network connection. This method
-	 * is called before a test is executed.
-	 */
-	protected void setUp() {
-	}
-
-	/**
-	 * Tears down the fixture, for example, close a network connection. This
-	 * method is called after a test is executed.
-	 */
-	protected void tearDown() {
-	}
     
     private static final SerializableAssert comparator = new SerializableAssert() {
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyResourceBundleTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyResourceBundleTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/PropertyResourceBundleTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.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.MissingResourceException;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/RandomTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/RandomTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/RandomTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/RandomTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/RandomTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/RandomTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/RandomTest.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.Random;
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ResourceBundleTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ResourceBundleTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ResourceBundleTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.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.io.File;
 import java.net.MalformedURLException;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SampleBundleClass.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SampleBundleClass.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SampleBundleClass.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SampleBundleClass.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SampleBundleClass.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SampleBundleClass.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SampleBundleClass.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.MissingResourceException;
 import java.util.ResourceBundle;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ScannerTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ScannerTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/ScannerTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.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.Closeable;
 import java.io.EOFException;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SimpleTimeZoneTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SimpleTimeZoneTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SimpleTimeZoneTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SimpleTimeZoneTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SimpleTimeZoneTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/SimpleTimeZoneTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SimpleTimeZoneTest.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/StackTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StackTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/StackTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/StackTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StackTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StackTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/StackTest.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/StringTokenizerTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StringTokenizerTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/StringTokenizerTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/StringTokenizerTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StringTokenizerTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/StringTokenizerTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/StringTokenizerTest.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.NoSuchElementException;
 import java.util.StringTokenizer;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimeZoneTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimeZoneTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimeZoneTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.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.GregorianCalendar;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTaskTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTaskTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTaskTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTaskTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTaskTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTaskTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTaskTest.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.Timer;
 import java.util.TimerTask;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TimerTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTest.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.Date;
 import java.util.Timer;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TooManyListenersExceptionTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TooManyListenersExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TooManyListenersExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TooManyListenersExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TooManyListenersExceptionTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TooManyListenersExceptionTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TooManyListenersExceptionTest.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.TooManyListenersException;
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeMapTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeMapTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeMapTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeMapTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeMapTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeMapTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeMapTest.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.io.Serializable;
 import java.text.CollationKey;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeSetTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeSetTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeSetTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeSetTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeSetTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/TreeSetTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeSetTest.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.Comparator;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/VectorTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/VectorTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/VectorTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/VectorTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/VectorTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/VectorTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/VectorTest.java
Mon Jan  7 07:12:45 2008
@@ -15,9 +15,8 @@
  *  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;
 import java.util.Collection;
 import java.util.Enumeration;
@@ -27,7 +26,6 @@
 import java.util.NoSuchElementException;
 import java.util.Vector;
 
-import tests.api.java.util.ArrayListTest.MockArrayList;
 import tests.support.Support_ListTest;
 
 public class VectorTest extends junit.framework.TestCase {
@@ -892,10 +890,49 @@
 			assertTrue("Returned incorrect array", tVector.elementAt(i) == o[i]);
 	}
 
-	/**
-	 * @tests java.util.Vector#toString()
-	 */
-	public void test_toString() {
+
+
+    class SubVector<E> extends Vector<E> {
+
+        private static final long serialVersionUID = 1L;
+
+        public SubVector() {
+            super();
+        }
+
+        public synchronized boolean add(E obj) {
+            super.addElement(obj);
+            return true;
+        }
+
+        public synchronized void addElement(E obj) {
+            super.add(obj);
+        }
+
+        /**
+         * @tests java.util.Vector#add(Object)
+         */
+        @SuppressWarnings("nls")
+        public void test_add() {
+            SubVector<String> subvector = new SubVector<String>();
+            subvector.add("foo");
+            subvector.addElement("bar");
+            assertEquals("Expected two elements in vector", 2, subvector.size());
+        }
+
+    }
+
+    /**
+     * @tests java.util.Vector#toString()
+     */
+    public void test_toString() {
+        // Ensure toString works with self-referencing elements.
+        Vector<Object> vec = new Vector<Object>(3);
+        vec.add(null);
+        vec.add(new Object());
+        vec.add(vec);
+        assertNotNull(vec.toString());
+
 		// Test for method java.lang.String java.util.Vector.toString()
 		assertTrue("Incorrect String returned", tVector.toString().equals(
 				vString));

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/WeakHashMapTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/WeakHashMapTest.java&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/util/WeakHashMapTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.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.Arrays;
@@ -43,6 +43,10 @@
 	Object[] valueArray = new Object[100];
 
 	WeakHashMap whm;
+	
+    Object[] KEY_ARRAY;
+
+    Object[] VALUE_ARRAY;
 
 	/**
 	 * @tests java.util.WeakHashMap#WeakHashMap()
@@ -151,10 +155,99 @@
 		keyArray[50] = null;
 	}
 
+    /**
+     * @tests java.util.WeakHashMap#entrySet()
+     */
+    public void test_entrySet() {
+        WeakHashMap<Object, Object> weakMap = new WeakHashMap<Object, Object>();
+        KEY_ARRAY = new Object[100];
+        VALUE_ARRAY = new Object[100];
+        for (int i = 0; i < 100; i++) {
+            KEY_ARRAY[i] = new Integer(i);
+            VALUE_ARRAY[i] = new Long(i);
+            weakMap.put(KEY_ARRAY[i], VALUE_ARRAY[i]);
+        }
+
+        List<Object> keys = Arrays.asList(KEY_ARRAY);
+        List<Object> values = Arrays.asList(VALUE_ARRAY);
+
+        // Check the entry set has correct size & content
+        Set<Map.Entry<Object, Object>> entrySet = weakMap.entrySet();
+        assertEquals("Assert 0: Incorrect number of entries returned", 100,
+                entrySet.size());
+        Iterator<Map.Entry<Object, Object>> it = entrySet.iterator();
+        while (it.hasNext()) {
+            Map.Entry<Object, Object> entry = it.next();
+            assertTrue("Assert 1: Invalid map entry key returned", keys
+                    .contains(entry.getKey()));
+            assertTrue("Assert 2: Invalid map entry value returned", values
+                    .contains(entry.getValue()));
+            assertTrue("Assert 3: Entry not in entry set", entrySet
+                    .contains(entry));
+        }
+
+        // Dereference list of key/value objects
+        keys = values = null;
+
+        // Dereference a single key, then try to
+        // force a collection of the weak ref'd obj
+        KEY_ARRAY[50] = null;
+        int count = 0;
+        do {
+            System.gc();
+            System.gc();
+            Runtime.getRuntime().runFinalization();
+            count++;
+        } while (count <= 5 && entrySet.size() == 100);
+
+        if ((count == 5) && (entrySet.size() == 100)) {
+            // We failed (or entrySet broken), so further tests not valid.
+            return;
+        }
+
+        assertEquals("Assert 4: Incorrect number of entries after gc", 99,
+                entrySet.size());
+        assertSame("Assert 5: Entries not identical", entrySet.iterator()
+                .next(), entrySet.iterator().next());
+
+        // remove alternate entries using the iterator, and ensure the
+        // iteration count is consistent
+        int size = entrySet.size();
+        it = entrySet.iterator();
+        while (it.hasNext()) {
+            it.next();
+            it.remove();
+            size--;
+            if (it.hasNext()) {
+                it.next();
+            }
+
+        }
+        assertEquals("Assert 6: entry set count mismatch", size, entrySet
+                .size());
+
+        int entries = 0;
+        it = entrySet.iterator();
+        while (it.hasNext()) {
+            it.next();
+            entries++;
+        }
+        assertEquals("Assert 6: count mismatch", size, entries);
+
+        it = entrySet.iterator();
+        while (it.hasNext()) {
+            it.next();
+            it.remove();
+        }
+        assertEquals("Assert 7: entry set not empty", 0, entrySet.size());
+        assertTrue("Assert 8:  iterator not empty", !entrySet.iterator()
+                .hasNext());
+    }
+    
 	/**
 	 * @tests java.util.WeakHashMap#entrySet()
 	 */
-	public void test_entrySet() {
+	public void test_entrySet_2() {
 		// Test for method java.util.Set java.util.WeakHashMap.entrySet()
 		whm = new WeakHashMap();
 		for (int i = 0; i < 100; i++)

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumMapTest.golden.ser
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumMapTest.golden.ser?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumMapTest.golden.ser&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
Binary files - no diff available.

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumSetTest.golden.ser
(from r609562, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumSetTest.golden.ser?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/EnumSetTest.golden.ser&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser&r1=609562&r2=609632&rev=609632&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message