Log Message
Swap test hierarchy to support exclusion of SunLimitedUnsafeReflectionProvider with JDK 1.4.
Modified Paths
Diff
Modified: branches/v-1.4.x/xstream/src/test/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProviderTest.java (2208 => 2209)
--- branches/v-1.4.x/xstream/src/test/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProviderTest.java 2014-01-08 17:04:49 UTC (rev 2208)
+++ branches/v-1.4.x/xstream/src/test/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProviderTest.java 2014-01-08 17:21:47 UTC (rev 2209)
@@ -7,89 +7,11 @@
*/
package com.thoughtworks.xstream.converters.reflection;
-public class SunLimitedUnsafeReflectionProviderTest extends AbstractReflectionProviderTest {
+public class SunLimitedUnsafeReflectionProviderTest extends SunUnsafeReflectionProviderTest {
// inherits tests from superclass
public ReflectionProvider createReflectionProvider() {
return new SunLimitedUnsafeReflectionProvider();
}
-
- protected static class WithFinalFields {
- final String finalField;
- final int finalInt;
- final long finalLong;
- final short finalShort;
- final char finalChar;
- final byte finalByte;
- final float finalFloat;
- final double finalDouble;
- final boolean finalBoolean;
-
- private WithFinalFields() {
- finalField = null;
- finalChar = '\0';
- finalInt = 0;
- finalLong = 0;
- finalShort = 0;
- finalByte = 0;
- finalFloat = 0.0f;
- finalDouble = 0.0;
- finalBoolean = false;
- }
-
- }
-
- public void testCanWriteFinalFields() {
- WithFinalFields thingy = new WithFinalFields();
- reflectionProvider.writeField(thingy, "finalField", "zero", WithFinalFields.class);
- assertEquals("zero", thingy.finalField);
-
- reflectionProvider.writeField(thingy, "finalInt", new Integer(1), WithFinalFields.class);
- assertEquals(1, thingy.finalInt);
-
- reflectionProvider.writeField(thingy, "finalLong", new Long(2), WithFinalFields.class);
- assertEquals(2, thingy.finalLong);
-
- reflectionProvider.writeField(thingy, "finalShort", new Short((short)3), WithFinalFields.class);
- assertEquals(3, thingy.finalShort);
-
- reflectionProvider.writeField(thingy, "finalChar", new Character('4'), WithFinalFields.class);
- assertEquals('4', thingy.finalChar);
-
- reflectionProvider.writeField(thingy, "finalByte", new Byte((byte)5), WithFinalFields.class);
- assertEquals(5, thingy.finalByte);
-
- reflectionProvider.writeField(thingy, "finalFloat", new Float(0.6), WithFinalFields.class);
- assertEquals(0.6f, thingy.finalFloat, 0.0);
-
- reflectionProvider.writeField(thingy, "finalDouble", new Double(0.7), WithFinalFields.class);
- assertEquals(0.7, thingy.finalDouble, 0.0);
-
- reflectionProvider.writeField(thingy, "finalBoolean", new Boolean(true), WithFinalFields.class);
- assertEquals(true, thingy.finalBoolean);
-
- reflectionProvider.writeField(thingy, "finalBoolean", new Boolean(false), null);
- assertEquals(false, thingy.finalBoolean);
- }
-
- protected static class Unistantiatable {
- {
- if (true) {
- throw new IllegalStateException("<init>");
- }
- }
-
- public Unistantiatable() {
- throw new IllegalStateException("ctor");
- }
-
- public Unistantiatable(String s) {
- throw new IllegalStateException("ctor(String)");
- }
- }
-
- public void testCanInstantiateWithoutInitializer() {
- assertCanCreate(Unistantiatable.class);
- }
}
Modified: branches/v-1.4.x/xstream/src/test/com/thoughtworks/xstream/converters/reflection/SunUnsafeReflectionProviderTest.java (2208 => 2209)
--- branches/v-1.4.x/xstream/src/test/com/thoughtworks/xstream/converters/reflection/SunUnsafeReflectionProviderTest.java 2014-01-08 17:04:49 UTC (rev 2208)
+++ branches/v-1.4.x/xstream/src/test/com/thoughtworks/xstream/converters/reflection/SunUnsafeReflectionProviderTest.java 2014-01-08 17:21:47 UTC (rev 2209)
@@ -11,11 +11,89 @@
*/
package com.thoughtworks.xstream.converters.reflection;
-public class SunUnsafeReflectionProviderTest extends SunLimitedUnsafeReflectionProviderTest {
+public class SunUnsafeReflectionProviderTest extends AbstractReflectionProviderTest {
// inherits tests from superclass
public ReflectionProvider createReflectionProvider() {
return new SunUnsafeReflectionProvider();
}
+
+ protected static class WithFinalFields {
+ final String finalField;
+ final int finalInt;
+ final long finalLong;
+ final short finalShort;
+ final char finalChar;
+ final byte finalByte;
+ final float finalFloat;
+ final double finalDouble;
+ final boolean finalBoolean;
+
+ private WithFinalFields() {
+ finalField = null;
+ finalChar = '\0';
+ finalInt = 0;
+ finalLong = 0;
+ finalShort = 0;
+ finalByte = 0;
+ finalFloat = 0.0f;
+ finalDouble = 0.0;
+ finalBoolean = false;
+ }
+
+ }
+
+ public void testCanWriteFinalFields() {
+ WithFinalFields thingy = new WithFinalFields();
+ reflectionProvider.writeField(thingy, "finalField", "zero", WithFinalFields.class);
+ assertEquals("zero", thingy.finalField);
+
+ reflectionProvider.writeField(thingy, "finalInt", new Integer(1), WithFinalFields.class);
+ assertEquals(1, thingy.finalInt);
+
+ reflectionProvider.writeField(thingy, "finalLong", new Long(2), WithFinalFields.class);
+ assertEquals(2, thingy.finalLong);
+
+ reflectionProvider.writeField(thingy, "finalShort", new Short((short)3), WithFinalFields.class);
+ assertEquals(3, thingy.finalShort);
+
+ reflectionProvider.writeField(thingy, "finalChar", new Character('4'), WithFinalFields.class);
+ assertEquals('4', thingy.finalChar);
+
+ reflectionProvider.writeField(thingy, "finalByte", new Byte((byte)5), WithFinalFields.class);
+ assertEquals(5, thingy.finalByte);
+
+ reflectionProvider.writeField(thingy, "finalFloat", new Float(0.6), WithFinalFields.class);
+ assertEquals(0.6f, thingy.finalFloat, 0.0);
+
+ reflectionProvider.writeField(thingy, "finalDouble", new Double(0.7), WithFinalFields.class);
+ assertEquals(0.7, thingy.finalDouble, 0.0);
+
+ reflectionProvider.writeField(thingy, "finalBoolean", new Boolean(true), WithFinalFields.class);
+ assertEquals(true, thingy.finalBoolean);
+
+ reflectionProvider.writeField(thingy, "finalBoolean", new Boolean(false), null);
+ assertEquals(false, thingy.finalBoolean);
+ }
+
+ protected static class Unistantiatable {
+ {
+ if (true) {
+ throw new IllegalStateException("<init>");
+ }
+ }
+
+ public Unistantiatable() {
+ throw new IllegalStateException("ctor");
+ }
+
+ public Unistantiatable(String s) {
+ throw new IllegalStateException("ctor(String)");
+ }
+ }
+
+ public void testCanInstantiateWithoutInitializer() {
+ assertCanCreate(Unistantiatable.class);
+ }
}
\ No newline at end of file
To unsubscribe from this list please visit:
