harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r765125 - in /harmony/enhanced/classlib/trunk/modules/luni: make/exclude.common src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java
Date Wed, 15 Apr 2009 10:44:07 GMT
Author: tellison
Date: Wed Apr 15 10:44:07 2009
New Revision: 765125

URL: http://svn.apache.org/viewvc?rev=765125&view=rev
Log:
Apply modified patch for HARMONY-6150 ([classlib][luni] Move ScannerTest out of the exclude
list)

Remove scanner tests from exclude list, with some specific tests still commented out for the
moment.

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common?rev=765125&r1=765124&r2=765125&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common Wed Apr 15 10:44:07 2009
@@ -1,4 +1,3 @@
 org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java
 org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java
 org/apache/harmony/luni/tests/java/util/FormatterTest.java
-org/apache/harmony/luni/tests/java/util/ScannerTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/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?rev=765125&r1=765124&r2=765125&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java
Wed Apr 15 10:44:07 2009
@@ -1560,9 +1560,10 @@
 
         s = new Scanner("-123.4 123.4- -123.4-");
         s.useLocale(new Locale("ar", "AE"));
-        assertEquals((float)-123.4, s.nextFloat());
-        //The following test case fails on RI
-        assertEquals((float)-123.4, s.nextFloat());
+        // FIXME
+//        assertEquals((float)-123.4, s.nextFloat());
+//        //The following test case fails on RI
+//        assertEquals((float)-123.4, s.nextFloat());
         try {
             s.nextFloat();
             fail("Should throw InputMismatchException");
@@ -3756,19 +3757,20 @@
         assertTrue(s.hasNextFloat());
         assertEquals((float)23456.7, s.nextFloat());
 
-        s = new Scanner("-123.4 123.4- -123.4-");
-        s.useLocale(new Locale("ar", "AE"));
-        assertTrue(s.hasNextFloat());
-        assertEquals((float)-123.4, s.nextFloat());
-        //The following test case fails on RI
-        assertTrue(s.hasNextFloat());
-        assertEquals((float)-123.4, s.nextFloat());
-        try {
-            s.nextFloat();
-            fail("Should throw InputMismatchException");
-        } catch (InputMismatchException e) {
-            // Expected
-        }
+        //FIXME
+//        s = new Scanner("-123.4 123.4- -123.4-");
+//        s.useLocale(new Locale("ar", "AE"));
+//        assertTrue(s.hasNextFloat());
+//        assertEquals((float)-123.4, s.nextFloat());
+//        //The following test case fails on RI
+//        assertTrue(s.hasNextFloat());
+//        assertEquals((float)-123.4, s.nextFloat());
+//        try {
+//            s.nextFloat();
+//            fail("Should throw InputMismatchException");
+//        } catch (InputMismatchException e) {
+//            // Expected
+//        }
 
         s = new Scanner("(123) 123- -123");
         s.useLocale(new Locale("mk", "MK"));



Mime
View raw message