Log Message
Fix for Java 1.4.
Modified Paths
Diff
Modified: branches/v-1.4.x/xstream/src/test/com/thoughtworks/acceptance/InnerClassesTest.java (2359 => 2360)
--- branches/v-1.4.x/xstream/src/test/com/thoughtworks/acceptance/InnerClassesTest.java 2015-02-24 22:52:22 UTC (rev 2359)
+++ branches/v-1.4.x/xstream/src/test/com/thoughtworks/acceptance/InnerClassesTest.java 2015-02-25 00:21:20 UTC (rev 2360)
@@ -11,6 +11,8 @@
*/
package com.thoughtworks.acceptance;
+import com.thoughtworks.xstream.core.JVM;
+
public class InnerClassesTest extends AbstractAcceptanceTest {
public void testSerializedInnerClassMaintainsReferenceToOuterClass() {
@@ -83,7 +85,7 @@
final OuterType outer = new OuterType();
- final String expectedXml = ""
+ String expectedXml = ""
+ "<inner>\n"
+ " <innerName>Inner Name</innerName>\n"
+ " <outer-class>\n"
@@ -115,6 +117,10 @@
+ " </dyn3>\n"
+ " </outer-class>\n"
+ "</inner>";
+
+ if (!JVM.is15()) {
+ expectedXml = expectedXml.replaceFirst("OuterType\\$InnerType\\$Dynamic3\\$1", "1\\$");
+ }
assertBothWays(outer.inner, expectedXml);
}
To unsubscribe from this list please visit:
