- Revision
- 593
- Author
- sirenian
- Date
- 2006-11-30 01:08:14 -0600 (Thu, 30 Nov 2006)
Log Message
[EK] Fixed 1.4 compilation errors (target in build isn't enough?)
Modified Paths
- trunk/extensions/classmocks/src/behaviour/jbehave/extensions/classmock/ClassMockObjectBehaviour.java
- trunk/extensions/classmocks/src/behaviour/jbehave/extensions/classmock/UsingClassMockBehaviour.java
- trunk/extensions/classmocks/src/java/jbehave/extensions/classmock/ClassMockObject.java
- trunk/extensions/classmocks/src/java/jbehave/extensions/classmock/ConstructorFactory.java
Diff
Modified: trunk/extensions/classmocks/src/behaviour/jbehave/extensions/classmock/ClassMockObjectBehaviour.java (592 => 593)
--- trunk/extensions/classmocks/src/behaviour/jbehave/extensions/classmock/ClassMockObjectBehaviour.java 2006-11-29 18:17:40 UTC (rev 592) +++ trunk/extensions/classmocks/src/behaviour/jbehave/extensions/classmock/ClassMockObjectBehaviour.java 2006-11-30 07:08:14 UTC (rev 593) @@ -97,8 +97,8 @@ AClassWithNoConstructorsAtAll.class}, new Object[] { "", - Integer.valueOf(0), - Character.valueOf(' '), + new Integer(0), + new Character(' '), new Object[0], AClassWithNoConstructorsAtAll.INSTANCE}); }
Modified: trunk/extensions/classmocks/src/behaviour/jbehave/extensions/classmock/UsingClassMockBehaviour.java (592 => 593)
--- trunk/extensions/classmocks/src/behaviour/jbehave/extensions/classmock/UsingClassMockBehaviour.java 2006-11-29 18:17:40 UTC (rev 592) +++ trunk/extensions/classmocks/src/behaviour/jbehave/extensions/classmock/UsingClassMockBehaviour.java 2006-11-30 07:08:14 UTC (rev 593) @@ -35,8 +35,8 @@ AClassWithNoConstructorsAtAll.class}, new Object[] { "", - Integer.valueOf(0), - Character.valueOf(' '), + new Integer(0), + new Character(' '), new Object[0], AClassWithNoConstructorsAtAll.INSTANCE}); mock.expects("getSomething").will(returnValue(expected));
Modified: trunk/extensions/classmocks/src/java/jbehave/extensions/classmock/ClassMockObject.java (592 => 593)
--- trunk/extensions/classmocks/src/java/jbehave/extensions/classmock/ClassMockObject.java 2006-11-29 18:17:40 UTC (rev 592) +++ trunk/extensions/classmocks/src/java/jbehave/extensions/classmock/ClassMockObject.java 2006-11-30 07:08:14 UTC (rev 593) @@ -94,7 +94,7 @@ private static IllegalArgumentException caughtANullPointer(final Class type, Throwable e) { return new IllegalArgumentException("Caught a NullPointerException while trying to mock a " + type + ". This could be caused " + "because a constructor argument that couldn't be instantiated was used in the constructor. Have you tried " + - "providing constructor arguments?", e); + "providing constructor arguments?"); }
Modified: trunk/extensions/classmocks/src/java/jbehave/extensions/classmock/ConstructorFactory.java (592 => 593)
--- trunk/extensions/classmocks/src/java/jbehave/extensions/classmock/ConstructorFactory.java 2006-11-29 18:17:40 UTC (rev 592) +++ trunk/extensions/classmocks/src/java/jbehave/extensions/classmock/ConstructorFactory.java 2006-11-30 07:08:14 UTC (rev 593) @@ -28,17 +28,17 @@ } else if (clazz == boolean.class) { return Boolean.FALSE; } else if (clazz == char.class) { - return Character.valueOf(' '); + return new Character(' '); } else if (clazz == double.class) { - return Double.valueOf(0); + return new Double(0); } else if (clazz == float.class) { - return Float.valueOf(0); + return new Float(0); } else if (clazz == int.class) { - return Integer.valueOf(0); + return new Integer(0); } else if (clazz == long.class) { - return Long.valueOf(0L); + return new Long(0L); } else if (clazz == short.class) { - return Short.valueOf((short) 0); + return new Short((short) 0); } else { throw new IllegalArgumentException("Never heard of a primitive called " + clazz + " before. "); }
To unsubscribe from this list please visit:
