[kaffe] CVS kaffe (robilad): Fixed regression test output to match output from jikes 1.21

Kaffe CVS cvs-commits at kaffe.org
Thu Jan 20 14:44:16 PST 2005


PatchSet 5878 
Date: 2005/01/20 22:39:19
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fixed regression test output to match output from jikes 1.21

2005-01-20  Dalibor Topic  <robilad at kaffe.org>

* test/regression/InnerTest.java,
test/regression/TestSerialFields.java,
test/regression/TestSerialPersistent.java,
test/regression/TestSerialVersions.java:
Adapated expected output to match the one from jikes.

Members: 
	ChangeLog:1.3419->1.3420 
	test/regression/InnerTest.java:1.4->1.5 
	test/regression/TestSerialFields.java:1.1->1.2 
	test/regression/TestSerialPersistent.java:1.1->1.2 
	test/regression/TestSerialVersions.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3419 kaffe/ChangeLog:1.3420
--- kaffe/ChangeLog:1.3419	Thu Jan 20 21:38:05 2005
+++ kaffe/ChangeLog	Thu Jan 20 22:39:19 2005
@@ -1,5 +1,13 @@
 2005-01-20  Dalibor Topic  <robilad at kaffe.org>
 
+	* test/regression/InnerTest.java, 
+	test/regression/TestSerialFields.java,
+	test/regression/TestSerialPersistent.java,
+	test/regression/TestSerialVersions.java:
+	Adapated expected output to match the one from jikes.
+
+2005-01-20  Dalibor Topic  <robilad at kaffe.org>
+
 	* test/regression/TestScript.in, 
 	Makefile.am (BUILD_ENVIRONMENT-make): Removed JAVAX_CRYPTO_JAR.	
 
Index: kaffe/test/regression/InnerTest.java
diff -u kaffe/test/regression/InnerTest.java:1.4 kaffe/test/regression/InnerTest.java:1.5
--- kaffe/test/regression/InnerTest.java:1.4	Thu Nov  7 16:46:46 2002
+++ kaffe/test/regression/InnerTest.java	Thu Jan 20 22:39:21 2005
@@ -154,10 +154,6 @@
 InnerBase: get: class InnerBase$publicStaticClass [9] public static
 InnerBase: get: interface InnerBase$publicInstanceInterface [609] public abstract static interface
 InnerBase: get: interface InnerBase$publicStaticInterface [609] public abstract static interface
-InnerTest: declared: class InnerTest$1 [10] final
-InnerTest: declared: class InnerTest$2 [10] final
-InnerTest: declared: class InnerTest$3 [10] final
-InnerTest: declared: class InnerTest$4 [10] final
 InnerTest: declared: class InnerTest$Inner [9] public static
 InnerTest: declaring: <null>
 InnerTest: get: class InnerBase$publicInstanceClass [1] public
Index: kaffe/test/regression/TestSerialFields.java
diff -u kaffe/test/regression/TestSerialFields.java:1.1 kaffe/test/regression/TestSerialFields.java:1.2
--- kaffe/test/regression/TestSerialFields.java:1.1	Thu Oct 31 17:32:05 2002
+++ kaffe/test/regression/TestSerialFields.java	Thu Jan 20 22:39:21 2005
@@ -641,46 +641,36 @@
     put x: int=42 
     put y: int=42 
     OK: 132 bytes
-TestSerialFields$Test0001:
+TestSerialFields$Test0016:
   Deserializing from Test0001 stream...
-    x: int=42
-    y: int=42
-    OK. Got: TestSerialFields$Test0001 x=0; y=0; foo=0
-  Serializing TestSerialFields$Test0001
-    put x: int=42 
-    put y: int=42 
-    OK: 132 bytes
+    OK. Got: TestSerialFields$Test0016: 42,42
+  Serializing TestSerialFields$Test0016
+    OK: 63 bytes
 
-TestSerialFields$Test0002:
+TestSerialFields$Test0015:
   Deserializing from Test0001 stream...
-    x: int=42
-    y: int=42
-    xd: (defaulted) double=0.0 
-    yd: (defaulted) double=0.0 
-    OK. Got: TestSerialFields$Test0002 instance
-  Serializing TestSerialFields$Test0002
-    put xd: double=6.9 
-    put yd: double=6.9 
-    OK: 73 bytes
+    OK. Got: TestSerialFields$Test0015: 0,0
+  Serializing TestSerialFields$Test0015
+    OK: 108 bytes
 
-TestSerialFields$Test0005:
+TestSerialFields$Test0014:
   Deserializing from Test0001 stream...
-    x: int=42
-    y: int=42
-    OK. Got: TestSerialFields$Test0005 instance
-  Serializing TestSerialFields$Test0005
-    OK: 47 bytes
+    Exception: java.lang.IllegalArgumentException
+  Serializing TestSerialFields$Test0014
+    Exception: java.lang.IllegalArgumentException
 
-TestSerialFields$Test0008:
+TestSerialFields$Test0012:
   Deserializing from Test0001 stream...
-    x: int=42
-    y: int=42
-    OK. Got: TestSerialFields$Test0008 instance
-  Serializing TestSerialFields$Test0008
-    put x: int=42 
-    put y: int=42 
+    OK. Got: TestSerialFields$Test0012: 42,42
+  Serializing TestSerialFields$Test0012
     OK: 63 bytes
 
+TestSerialFields$Test0011:
+  Deserializing from Test0001 stream...
+    OK. Got: TestSerialFields$Test0011 instance
+  Serializing TestSerialFields$Test0011
+    Exception: java.io.NotActiveException
+
 TestSerialFields$Test0010:
   Deserializing from Test0001 stream...
     x: int=42
@@ -693,34 +683,44 @@
     put yodd: string='putfield test string' 
     OK: 133 bytes
 
-TestSerialFields$Test0011:
-  Deserializing from Test0001 stream...
-    OK. Got: TestSerialFields$Test0011 instance
-  Serializing TestSerialFields$Test0011
-    Exception: java.io.NotActiveException
-
-TestSerialFields$Test0012:
+TestSerialFields$Test0008:
   Deserializing from Test0001 stream...
-    OK. Got: TestSerialFields$Test0012: 42,42
-  Serializing TestSerialFields$Test0012
+    x: int=42
+    y: int=42
+    OK. Got: TestSerialFields$Test0008 instance
+  Serializing TestSerialFields$Test0008
+    put x: int=42 
+    put y: int=42 
     OK: 63 bytes
 
-TestSerialFields$Test0014:
+TestSerialFields$Test0005:
   Deserializing from Test0001 stream...
-    Exception: java.lang.IllegalArgumentException
-  Serializing TestSerialFields$Test0014
-    Exception: java.lang.IllegalArgumentException
+    x: int=42
+    y: int=42
+    OK. Got: TestSerialFields$Test0005 instance
+  Serializing TestSerialFields$Test0005
+    OK: 47 bytes
 
-TestSerialFields$Test0015:
+TestSerialFields$Test0002:
   Deserializing from Test0001 stream...
-    OK. Got: TestSerialFields$Test0015: 0,0
-  Serializing TestSerialFields$Test0015
-    OK: 108 bytes
+    x: int=42
+    y: int=42
+    xd: (defaulted) double=0.0 
+    yd: (defaulted) double=0.0 
+    OK. Got: TestSerialFields$Test0002 instance
+  Serializing TestSerialFields$Test0002
+    put xd: double=6.9 
+    put yd: double=6.9 
+    OK: 73 bytes
 
-TestSerialFields$Test0016:
+TestSerialFields$Test0001:
   Deserializing from Test0001 stream...
-    OK. Got: TestSerialFields$Test0016: 42,42
-  Serializing TestSerialFields$Test0016
-    OK: 63 bytes
+    x: int=42
+    y: int=42
+    OK. Got: TestSerialFields$Test0001 x=0; y=0; foo=0
+  Serializing TestSerialFields$Test0001
+    put x: int=42 
+    put y: int=42 
+    OK: 132 bytes
 
 */
Index: kaffe/test/regression/TestSerialPersistent.java
diff -u kaffe/test/regression/TestSerialPersistent.java:1.1 kaffe/test/regression/TestSerialPersistent.java:1.2
--- kaffe/test/regression/TestSerialPersistent.java:1.1	Thu Oct 31 17:32:05 2002
+++ kaffe/test/regression/TestSerialPersistent.java	Thu Jan 20 22:39:21 2005
@@ -337,93 +337,93 @@
 }
 
 /* Expected Output:
-Checking TestSerialPersistent$Default:
+Checking TestSerialPersistent$Overlap2:
    [0]: int i
-   [1]: java.lang.String s
+   [1]: java.lang.String i
  Serialization:
-  Ok: 83 bytes.
-Checking TestSerialPersistent$DefaultTransient:
+   THREW: java.io.InvalidClassException
+Checking TestSerialPersistent$Overlap1:
    [0]: int i
-   [1]: java.lang.String s
+   [1]: java.lang.String i
  Serialization:
-  Ok: 92 bytes.
-Checking TestSerialPersistent$Subset:
+   THREW: java.io.InvalidClassException
+Checking TestSerialPersistent$Duplicates:
    [0]: int i
-   [1]: java.lang.String s
- Serialization:
-  Ok: 82 bytes.
-Checking TestSerialPersistent$Subclass:
-   [0]: int xi
-   [1]: java.lang.String xs
+   [1]: int i
+   [2]: int i
  Serialization:
-  Ok: 146 bytes.
-Checking TestSerialPersistent$FieldSort:
-   [0]: int ia
-   [1]: int ib
-   [2]: int ic
-   [3]: java.lang.String sa
-   [4]: java.lang.String sb
+  Ok: 76 bytes.
+Checking TestSerialPersistent$TypesMismatch:
+   [0]: int s
+   [1]: java.lang.String i
  Serialization:
-  Ok: 116 bytes.
-Checking TestSerialPersistent$TransientOverlap:
+   THREW: java.io.InvalidClassException
+Checking TestSerialPersistent$SubtypeSpec:
    [0]: int i
-   [1]: java.lang.String s
+   [1]: java.lang.Object s
  Serialization:
-  Ok: 92 bytes.
-Checking TestSerialPersistent$ContainsNull:
-   THREW: java.lang.NullPointerException
-Checking TestSerialPersistent$IsNull:
-   [0]: int i
-   [1]: java.lang.String s
+   THREW: java.io.InvalidClassException
+Checking TestSerialPersistent$NamesMismatch:
+   [0]: long l
+   [1]: java.lang.Class c
  Serialization:
-  Ok: 82 bytes.
-Checking TestSerialPersistent$IsNoFieldsMagic:
+   THREW: java.io.InvalidClassException
+Checking TestSerialPersistent$Empty:
  Serialization:
-  Ok: 57 bytes.
-Checking TestSerialPersistent$NonPrivate:
+  Ok: 47 bytes.
+Checking TestSerialPersistent$ReallyWrongType:
    [0]: int expected
  Serialization:
-  Ok: 67 bytes.
+  Ok: 72 bytes.
 Checking TestSerialPersistent$WrongType:
    [0]: int expected
  Serialization:
   Ok: 66 bytes.
-Checking TestSerialPersistent$ReallyWrongType:
+Checking TestSerialPersistent$NonPrivate:
    [0]: int expected
  Serialization:
-  Ok: 72 bytes.
-Checking TestSerialPersistent$Empty:
+  Ok: 67 bytes.
+Checking TestSerialPersistent$IsNoFieldsMagic:
  Serialization:
-  Ok: 47 bytes.
-Checking TestSerialPersistent$NamesMismatch:
-   [0]: long l
-   [1]: java.lang.Class c
+  Ok: 57 bytes.
+Checking TestSerialPersistent$IsNull:
+   [0]: int i
+   [1]: java.lang.String s
  Serialization:
-   THREW: java.io.InvalidClassException
-Checking TestSerialPersistent$SubtypeSpec:
+  Ok: 82 bytes.
+Checking TestSerialPersistent$ContainsNull:
+   THREW: java.lang.NullPointerException
+Checking TestSerialPersistent$TransientOverlap:
    [0]: int i
-   [1]: java.lang.Object s
+   [1]: java.lang.String s
  Serialization:
-   THREW: java.io.InvalidClassException
-Checking TestSerialPersistent$TypesMismatch:
-   [0]: int s
-   [1]: java.lang.String i
+  Ok: 92 bytes.
+Checking TestSerialPersistent$FieldSort:
+   [0]: int ia
+   [1]: int ib
+   [2]: int ic
+   [3]: java.lang.String sa
+   [4]: java.lang.String sb
  Serialization:
-   THREW: java.io.InvalidClassException
-Checking TestSerialPersistent$Duplicates:
+  Ok: 116 bytes.
+Checking TestSerialPersistent$Subclass:
+   [0]: int xi
+   [1]: java.lang.String xs
+ Serialization:
+  Ok: 146 bytes.
+Checking TestSerialPersistent$Subset:
    [0]: int i
-   [1]: int i
-   [2]: int i
+   [1]: java.lang.String s
  Serialization:
-  Ok: 76 bytes.
-Checking TestSerialPersistent$Overlap1:
+  Ok: 82 bytes.
+Checking TestSerialPersistent$DefaultTransient:
    [0]: int i
-   [1]: java.lang.String i
+   [1]: java.lang.String s
  Serialization:
-   THREW: java.io.InvalidClassException
-Checking TestSerialPersistent$Overlap2:
+  Ok: 92 bytes.
+Checking TestSerialPersistent$Default:
    [0]: int i
-   [1]: java.lang.String i
+   [1]: java.lang.String s
  Serialization:
-   THREW: java.io.InvalidClassException
+  Ok: 83 bytes.
 */
Index: kaffe/test/regression/TestSerialVersions.java
diff -u kaffe/test/regression/TestSerialVersions.java:1.1 kaffe/test/regression/TestSerialVersions.java:1.2
--- kaffe/test/regression/TestSerialVersions.java:1.1	Thu Oct 31 17:32:05 2002
+++ kaffe/test/regression/TestSerialVersions.java	Thu Jan 20 22:39:21 2005
@@ -405,50 +405,69 @@
 Generating canonical stream
   Serializing TestSerialVersions$Test0001
     OK.
-TestSerialVersions$Test0001:
-  OK. Got: TestSerialVersions$Test0001: 66, 105
+TestSerialVersions$Test0014:
+  Deserialize exception: java.io.InvalidClassException
+  Ser Fields:
+    [x:[I]
+    [y:[I]
+  Serializing TestSerialVersions$Test0014
+    OK.
+
+TestSerialVersions$Test0013:
+  OK. Got: TestSerialVersions$Test0013: 66, 105
   Ser Fields:
     [x:int]
     [y:int]
-  Serializing TestSerialVersions$Test0001
+  Serializing TestSerialVersions$Test0013
     OK.
 
-TestSerialVersions$Test0002:
-  Deserialize exception: java.io.InvalidClassException
+TestSerialVersions$Test0012:
+  OK. Got: TestSerialVersions$Test0012: 0, 0
   Ser Fields:
-    [x:double]
-    [y:double]
-  Serializing TestSerialVersions$Test0002
+    [xodd:java.lang.String]
+    [yodd:java.lang.String]
+  Serializing TestSerialVersions$Test0012
     OK.
 
-TestSerialVersions$Test0003:
-  Deserialize exception: java.io.InvalidClassException
+TestSerialVersions$Test0011:
+  OK. Got: TestSerialVersions$Test0011: 0, 0
   Ser Fields:
-    [x:short]
-    [y:short]
-  Serializing TestSerialVersions$Test0003
+    [xodd:java.lang.String]
+    [yodd:java.lang.String]
+  Serializing TestSerialVersions$Test0011
     OK.
 
-TestSerialVersions$Test0004:
+TestSerialVersions$Test0010:
+  OK. Got: TestSerialVersions$Test0010: 0, 0
+  Ser Fields:
+    [xodd:java.lang.String]
+    [yodd:java.lang.String]
+  Serializing TestSerialVersions$Test0010
+    Serialization exception: java.io.InvalidClassException
+
+TestSerialVersions$Test0009:
   Deserialize exception: java.io.InvalidClassException
   Ser Fields:
     [x:java.lang.String]
     [y:java.lang.String]
-  Serializing TestSerialVersions$Test0004
-    OK.
+  Serializing TestSerialVersions$Test0009
+    Serialization exception: java.io.InvalidClassException
 
-TestSerialVersions$Test0005:
-  OK. Got: TestSerialVersions$Test0005: <no fields>
+TestSerialVersions$Test0008:
+  OK. Got: TestSerialVersions$Test0008: <no fields>
   Ser Fields:
-  Serializing TestSerialVersions$Test0005
-    OK.
+    [x:int]
+    [y:int]
+  Serializing TestSerialVersions$Test0008
+    Serialization exception: java.io.InvalidClassException
 
-TestSerialVersions$Test0052:
-  OK. Got: TestSerialVersions$Test0052: y=105
+TestSerialVersions$Test0007:
+  Deserialize exception: java.io.InvalidClassException
   Ser Fields:
+    [x:int]
     [y:int]
-  Serializing TestSerialVersions$Test0052
-    OK.
+  Serializing TestSerialVersions$Test0007
+    Serialization exception: java.io.InvalidClassException
 
 TestSerialVersions$Test0006:
   Deserialize exception: java.io.InvalidClassException
@@ -458,68 +477,49 @@
   Serializing TestSerialVersions$Test0006
     OK.
 
-TestSerialVersions$Test0007:
-  Deserialize exception: java.io.InvalidClassException
+TestSerialVersions$Test0052:
+  OK. Got: TestSerialVersions$Test0052: y=105
   Ser Fields:
-    [x:int]
     [y:int]
-  Serializing TestSerialVersions$Test0007
-    Serialization exception: java.io.InvalidClassException
+  Serializing TestSerialVersions$Test0052
+    OK.
 
-TestSerialVersions$Test0008:
-  OK. Got: TestSerialVersions$Test0008: <no fields>
+TestSerialVersions$Test0005:
+  OK. Got: TestSerialVersions$Test0005: <no fields>
   Ser Fields:
-    [x:int]
-    [y:int]
-  Serializing TestSerialVersions$Test0008
-    Serialization exception: java.io.InvalidClassException
+  Serializing TestSerialVersions$Test0005
+    OK.
 
-TestSerialVersions$Test0009:
+TestSerialVersions$Test0004:
   Deserialize exception: java.io.InvalidClassException
   Ser Fields:
     [x:java.lang.String]
     [y:java.lang.String]
-  Serializing TestSerialVersions$Test0009
-    Serialization exception: java.io.InvalidClassException
-
-TestSerialVersions$Test0010:
-  OK. Got: TestSerialVersions$Test0010: 0, 0
-  Ser Fields:
-    [xodd:java.lang.String]
-    [yodd:java.lang.String]
-  Serializing TestSerialVersions$Test0010
-    Serialization exception: java.io.InvalidClassException
+  Serializing TestSerialVersions$Test0004
+    OK.
 
-TestSerialVersions$Test0011:
-  OK. Got: TestSerialVersions$Test0011: 0, 0
+TestSerialVersions$Test0003:
+  Deserialize exception: java.io.InvalidClassException
   Ser Fields:
-    [xodd:java.lang.String]
-    [yodd:java.lang.String]
-  Serializing TestSerialVersions$Test0011
+    [x:short]
+    [y:short]
+  Serializing TestSerialVersions$Test0003
     OK.
 
-TestSerialVersions$Test0012:
-  OK. Got: TestSerialVersions$Test0012: 0, 0
+TestSerialVersions$Test0002:
+  Deserialize exception: java.io.InvalidClassException
   Ser Fields:
-    [xodd:java.lang.String]
-    [yodd:java.lang.String]
-  Serializing TestSerialVersions$Test0012
+    [x:double]
+    [y:double]
+  Serializing TestSerialVersions$Test0002
     OK.
 
-TestSerialVersions$Test0013:
-  OK. Got: TestSerialVersions$Test0013: 66, 105
+TestSerialVersions$Test0001:
+  OK. Got: TestSerialVersions$Test0001: 66, 105
   Ser Fields:
     [x:int]
     [y:int]
-  Serializing TestSerialVersions$Test0013
-    OK.
-
-TestSerialVersions$Test0014:
-  Deserialize exception: java.io.InvalidClassException
-  Ser Fields:
-    [x:[I]
-    [y:[I]
-  Serializing TestSerialVersions$Test0014
+  Serializing TestSerialVersions$Test0001
     OK.
 
 */




More information about the kaffe mailing list