Log Message
Update test to reflect new behavior of Oracle JDKs 1.6.0.39 and 1.7.0.13.
Modified Paths
Added Paths
Diff
Added: trunk/xstream/src/test/$Package.java (0 => 2020)
--- trunk/xstream/src/test/$Package.java (rev 0)
+++ trunk/xstream/src/test/$Package.java 2013-02-22 17:04:46 UTC (rev 2020)
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2013 XStream Committers.
+ * All rights reserved.
+ *
+ * Created on 22. February 2013 by Joerg Schaible
+ */
+
+/**
+ * Dummy class in default package starting with dollar.
+ *
+ * <p>The Java compiler used to generate such class names for dynamic proxies.
+ * However, the Oracle/Sun compilers changed behavior with version 1.7.0.13 /
+ * 1.6.0.39 and its generated proxy classes are now in package com.sun.proxy.
+ * It is expected that other vendors will follow.</p>
+ */
+public class $Package {
+ // empty
+}
Property changes on: trunk/xstream/src/test/$Package.java
___________________________________________________________________
Added: svn:keywords
Added: svn:eol-style
Modified: trunk/xstream/src/test/com/thoughtworks/xstream/mapper/XmlFriendlyMapperTest.java (2019 => 2020)
--- trunk/xstream/src/test/com/thoughtworks/xstream/mapper/XmlFriendlyMapperTest.java 2013-01-19 16:48:56 UTC (rev 2019)
+++ trunk/xstream/src/test/com/thoughtworks/xstream/mapper/XmlFriendlyMapperTest.java 2013-02-22 17:04:46 UTC (rev 2020)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007 XStream Committers.
+ * Copyright (C) 2006, 2007, 2013 XStream Committers.
* All rights reserved.
*
* The software in this package is published under the terms of the BSD
@@ -10,7 +10,6 @@
*/
package com.thoughtworks.xstream.mapper;
-import com.thoughtworks.acceptance.objects.SampleDynamicProxy;
import com.thoughtworks.xstream.core.util.CompositeClassLoader;
import junit.framework.TestCase;
@@ -19,13 +18,13 @@
private Mapper mapper;
- public void testPrefixesIllegalXmlElementNamesWithValue() {
+ public void testPrefixesIllegalXmlElementNamesWithValue() throws ClassNotFoundException {
mapper = new XmlFriendlyMapper(new DefaultMapper(new CompositeClassLoader()));
- Class proxyCls = SampleDynamicProxy.newInstance().getClass();
- String aliasedName = mapper.serializedClass(proxyCls);
- assertTrue("Does not start with 'default-Proxy' : <" + aliasedName + ">",
- aliasedName.startsWith("default-Proxy"));
- assertEquals(proxyCls, mapper.realClass(aliasedName));
+ Class clsInDefaultPackage = Class.forName("$Package");
+ String aliasedName = mapper.serializedClass(clsInDefaultPackage);
+ assertTrue("Does not start with 'default-Package' : <" + aliasedName + ">",
+ aliasedName.startsWith("default-Package"));
+ assertEquals(clsInDefaultPackage, mapper.realClass(aliasedName));
}
}
To unsubscribe from this list please visit:
