PatchSet 6998
Date: 2005/12/11 13:36:46
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fixlet for TestSerialPersistent.
Members:
ChangeLog:1.4519->1.4520
test/regression/TestSerialPersistent.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4519 kaffe/ChangeLog:1.4520
--- kaffe/ChangeLog:1.4519 Sun Dec 11 03:20:25 2005
+++ kaffe/ChangeLog Sun Dec 11 13:36:46 2005
@@ -1,3 +1,9 @@
+2005-12-11 Guilhem Lavaux <[EMAIL PROTECTED]>
+
+ * test/regression/TestSerialPersistent.java: Fix expected output.
+ At the moment it is exactly the same compared to JDK's. Removed
+ private modifiers.
+
2005-12-11 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac: Pass on jikes program name to
Index: kaffe/test/regression/TestSerialPersistent.java
diff -u kaffe/test/regression/TestSerialPersistent.java:1.3
kaffe/test/regression/TestSerialPersistent.java:1.4
--- kaffe/test/regression/TestSerialPersistent.java:1.3 Sat Dec 10 19:38:20 2005
+++ kaffe/test/regression/TestSerialPersistent.java Sun Dec 11 13:36:50 2005
@@ -13,7 +13,7 @@
public class TestSerialPersistent
{
- private static class Default
+ static class Default
implements Serializable
{
private int i;
@@ -22,7 +22,7 @@
// No serialPersistentFields specification
}
- private static class DefaultTransient
+ static class DefaultTransient
implements Serializable
{
private int i;
@@ -32,7 +32,7 @@
// No serialPersistentFields specification
}
- private static class Subset
+ static class Subset
implements Serializable
{
private int i;
@@ -46,7 +46,7 @@
};
}
- private static class Subclass
+ static class Subclass
extends Subset
implements Serializable
{
@@ -61,7 +61,7 @@
};
}
- private static class FieldSort
+ static class FieldSort
implements Serializable
{
private int ib;
@@ -81,7 +81,7 @@
};
}
- private static class TransientOverlap
+ static class TransientOverlap
implements Serializable
{
private int i;
@@ -96,7 +96,7 @@
};
}
- private static class ContainsNull
+ static class ContainsNull
implements Serializable
{
private int i;
@@ -110,7 +110,7 @@
};
}
- private static class IsNull
+ static class IsNull
implements Serializable
{
private int i;
@@ -120,7 +120,7 @@
private static final ObjectStreamField[] serialPersistentFields
= null;
}
- private static class IsNoFieldsMagic
+ static class IsNoFieldsMagic
implements Serializable
{
private int i;
@@ -130,7 +130,7 @@
private static final ObjectStreamField[] serialPersistentFields
= ObjectStreamClass.NO_FIELDS;
}
- private static class NonPrivate
+ static class NonPrivate
implements Serializable
{
private int expected;
@@ -143,7 +143,7 @@
};
}
- private static class WrongType
+ static class WrongType
implements Serializable
{
private int expected;
@@ -156,7 +156,7 @@
};
}
- private static class ReallyWrongType
+ static class ReallyWrongType
implements Serializable
{
private int expected;
@@ -165,7 +165,7 @@
public static final int serialPersistentFields = 0x11;
}
- private static class Empty
+ static class Empty
implements Serializable
{
private int not_expected_i;
@@ -176,7 +176,7 @@
};
}
- private static class NamesMismatch
+ static class NamesMismatch
implements Serializable
{
private int not_expected_t;
@@ -189,7 +189,7 @@
};
}
- private static class SubtypeSpec
+ static class SubtypeSpec
implements Serializable
{
private int i;
@@ -202,7 +202,7 @@
};
}
- private static class TypesMismatch
+ static class TypesMismatch
implements Serializable
{
private int i;
@@ -216,7 +216,7 @@
}
// XXX JDK1.4 doesn't complain about this case.
- private static class Duplicates
+ static class Duplicates
implements Serializable
{
private int i;
@@ -231,7 +231,7 @@
// XXX JDK1.4.1 blows up with an internal error in
ObjectStreamClass.lookup() on next two test:
// See bug 4764280 (fixed in 1.4.2??)
- private static class Overlap1 // 2nd is correct
+ static class Overlap1 // 2nd is correct
implements Serializable
{
private int i;
@@ -245,7 +245,7 @@
// XXX JDK1.4.1 blows up with an internal error in
ObjectStreamClass.lookup() on next two test:
// See bug 4764280 (fixed in 1.4.2??)
- private static class Overlap2 // 1st is correct
+ static class Overlap2 // 1st is correct
implements Serializable
{
private int i;
@@ -359,9 +359,6 @@
Serialization:
Ok: 92 bytes.
Checking TestSerialPersistent$Duplicates:
- [0]: int i
- [1]: int i
- [2]: int i
Serialization:
THREW: java.io.InvalidClassException
Checking TestSerialPersistent$Empty:
@@ -393,13 +390,9 @@
Serialization:
Ok: 67 bytes.
Checking TestSerialPersistent$Overlap1:
- [0]: int i
- [1]: java.lang.String i
Serialization:
THREW: java.io.InvalidClassException
Checking TestSerialPersistent$Overlap2:
- [0]: int i
- [1]: java.lang.String i
Serialization:
THREW: java.io.InvalidClassException
Checking TestSerialPersistent$ReallyWrongType:
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
