This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

FYI: Properties fixlet


Hi,

The following fixes the last real Mauve failure.

2003-03-02  Mark Wielaard  <mark at klomp dot org>

       * java/util/Properties.java (load): Only skip line if the first
       character is a comment, whitespaces don't count.

I also cleaned up the Mauve Properties test and with the above we now
pass them all. Which also cleans up out mauve xfails file.

2003-03-02  Mark Wielaard  <mark at klomp dot org>

	* libjava.mauve/xfails: Remove all AcuniaPropertiesTest
	failures

I am committing these to branch and mainline.

Cheers,

Mark
Index: java/util/Properties.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/Properties.java,v
retrieving revision 1.16
diff -u -r1.16 Properties.java
--- java/util/Properties.java	17 Feb 2003 19:05:56 -0000	1.16
+++ java/util/Properties.java	2 Mar 2003 22:28:52 -0000
@@ -188,13 +188,17 @@
       {
         char c = 0;
         int pos = 0;
+        // If empty line or begins with a comment character, skip this line.
+        if (line.length() == 0
+	    || line.charAt(0) == '#' || line.charAt(0) == '!')
+          continue;
+
         while (pos < line.length()
                && Character.isWhitespace(c = line.charAt(pos)))
           pos++;
 
-        // If line is empty or begins with a comment character,
-        // skip this line.
-        if (pos == line.length() || c == '#' || c == '!')
+        // If line is empty skip this line.
+        if (pos == line.length())
           continue;
 
         // The characters up to the next Whitespace, ':', or '='
Index: libjava.mauve/xfails
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.mauve/xfails,v
retrieving revision 1.13
diff -u -r1.13 xfails
--- libjava.mauve/xfails	16 Feb 2003 14:47:03 -0000	1.13
+++ libjava.mauve/xfails	2 Mar 2003 22:29:42 -0000
@@ -100,10 +100,3 @@
 FAIL: gnu.testlet.java.net.URL.URLTest: new URL(protocol, host, file) (number 26)
 FAIL: gnu.testlet.java.net.URL.URLTest: new URL(protocol, host, file) (number 54)
 FAIL: gnu.testlet.java.net.MulticastSocket.MulticastSocketTest: joinGroup() twice. (number 1)
-FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: should throw NullPointerException -- 1 (number 1)
-FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: v does not contain:$longvalue=I'mtryingtogiveavaluelongerthen40characters$ (number 1)
-FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: should throw NullPointerException -- 1 (number 1)
-FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: all elements are the same (number 1)
-FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: checkvalue -- got:$ents=$ (number 1)
-FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: checkvalue -- got:$dog=nocat   $ (number 1)
-FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: check if all elements were found -- got: [dog=no\cat   ] (number 1)

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]