harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r772652 - in /harmony/enhanced/classlib/trunk: modules/text/META-INF/ modules/text/src/test/java/org/apache/harmony/text/tests/java/text/ support/src/test/java/tests/support/
Date Thu, 07 May 2009 14:09:55 GMT
Author: tellison
Date: Thu May  7 14:09:54 2009
New Revision: 772652

URL: http://svn.apache.org/viewvc?rev=772652&view=rev
Log:
Refactor TEXT test support classes.
 - Move TEXT-specific support classes into the TEXT module
 - Delete Support_BitSet and replace its use with a regular util BitSet

Added:
    harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java
      - copied, changed from r772637, harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_DecimalFormat.java
    harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java
      - copied, changed from r772637, harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_Format.java
    harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java
      - copied, changed from r772637, harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_MessageFormat.java
    harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java
      - copied, changed from r772637, harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_SimpleDateFormat.java
Removed:
    harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_BitSet.java
    harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_DecimalFormat.java
    harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_Format.java
    harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_MessageFormat.java
    harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_SimpleDateFormat.java
Modified:
    harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
    harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
    harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java

Modified: harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF?rev=772652&r1=772651&r2=772652&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF Thu May  7 14:09:54
2009
@@ -25,6 +25,5 @@
  org.apache.harmony.kernel.vm,
  org.apache.harmony.luni.util,
  org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional,
- tests.support;hy_usage=test;resolution:=optional,
  tests.util;hy_usage=test;resolution:=optional
 Export-Package: java.text

Modified: harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java?rev=772652&r1=772651&r2=772652&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
Thu May  7 14:09:54 2009
@@ -26,6 +26,7 @@
 import java.text.FieldPosition;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
+import java.util.BitSet;
 import java.util.Currency;
 import java.util.Locale;
 
@@ -33,8 +34,6 @@
 
 import org.apache.harmony.testframework.serialization.SerializationTest;
 
-import tests.support.Support_BitSet;
-import tests.support.Support_DecimalFormat;
 
 public class DecimalFormatTest extends TestCase {
 
@@ -798,7 +797,7 @@
                 .t_format_with_FieldPosition();
 
         int failCount = 0;
-        Support_BitSet failures = new Support_BitSet();
+        BitSet failures = new BitSet();
 
         final DecimalFormatSymbols dfs = new DecimalFormatSymbols(Locale.US);
 
@@ -1027,7 +1026,7 @@
     //FIXME This test fails on Harmony ClassLibrary
     public void test_formatJLjava_lang_StringBufferLjava_text_FieldPosition() {
         int failCount = 0;
-        Support_BitSet failures = new Support_BitSet();
+        BitSet failures = new BitSet();
 
         final DecimalFormatSymbols dfs = new DecimalFormatSymbols(Locale.US);
 

Modified: harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java?rev=772652&r1=772651&r2=772652&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
Thu May  7 14:09:54 2009
@@ -38,7 +38,6 @@
 import java.util.TimeZone;
 
 import junit.framework.TestCase;
-import tests.support.Support_MessageFormat;
 
 public class MessageFormatTest extends TestCase {
 

Modified: harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java?rev=772652&r1=772651&r2=772652&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
Thu May  7 14:09:54 2009
@@ -29,7 +29,6 @@
 import java.util.SimpleTimeZone;
 import java.util.TimeZone;
 
-import tests.support.Support_SimpleDateFormat;
 
 public class SimpleDateFormatTest extends junit.framework.TestCase {
 

Copied: harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java
(from r772637, harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_DecimalFormat.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java?p2=harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java&p1=harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_DecimalFormat.java&r1=772637&r2=772652&rev=772652&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_DecimalFormat.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java
Thu May  7 14:09:54 2009
@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 
-package tests.support;
+package org.apache.harmony.text.tests.java.text;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.Locale;
 import java.util.Vector;
 
+
 public class Support_DecimalFormat extends Support_Format {
 
 	public Support_DecimalFormat(String p1) {

Copied: harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java
(from r772637, harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_Format.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java?p2=harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java&p1=harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_Format.java&r1=772637&r2=772652&rev=772652&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_Format.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java
Thu May  7 14:09:54 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tests.support;
+package org.apache.harmony.text.tests.java.text;
 
 import java.text.AttributedCharacterIterator;
 import java.text.FieldPosition;

Copied: harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java
(from r772637, harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_MessageFormat.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java?p2=harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java&p1=harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_MessageFormat.java&r1=772637&r2=772652&rev=772652&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_MessageFormat.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java
Thu May  7 14:09:54 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tests.support;
+package org.apache.harmony.text.tests.java.text;
 
 import java.text.DateFormat;
 import java.text.MessageFormat;
@@ -26,6 +26,7 @@
 import java.util.Locale;
 import java.util.Vector;
 
+
 public class Support_MessageFormat extends Support_Format {
 
 	public Support_MessageFormat(String p1) {

Copied: harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java
(from r772637, harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_SimpleDateFormat.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java?p2=harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java&p1=harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_SimpleDateFormat.java&r1=772637&r2=772652&rev=772652&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Support_SimpleDateFormat.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java
Thu May  7 14:09:54 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tests.support;
+package org.apache.harmony.text.tests.java.text;
 
 import java.text.DateFormat;
 import java.text.NumberFormat;
@@ -28,6 +28,9 @@
 import java.util.TimeZone;
 import java.util.Vector;
 
+import org.apache.harmony.text.tests.java.text.Support_Format.FieldContainer;
+
+
 public class Support_SimpleDateFormat extends Support_Format {
 
 	public Support_SimpleDateFormat(String p1) {



Mime
View raw message