|
|
7f0bec7 |
diff -Nru jmock-2.5.1/test/org/jmock/test/unit/support/MethodFactory.java jmock-2.5.1-gil/test/org/jmock/test/unit/support/MethodFactory.java
|
|
|
7f0bec7 |
--- jmock-2.5.1/test/org/jmock/test/unit/support/MethodFactory.java 2007-07-23 13:43:05.000000000 +0200
|
|
|
7f0bec7 |
+++ jmock-2.5.1-gil/test/org/jmock/test/unit/support/MethodFactory.java 2012-04-19 10:46:53.707914792 +0200
|
|
|
7f0bec7 |
@@ -4,13 +4,13 @@
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
import java.lang.reflect.Method;
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
-import net.sf.cglib.asm.ClassWriter;
|
|
|
7f0bec7 |
-import net.sf.cglib.asm.Type;
|
|
|
7f0bec7 |
+import org.objectweb.asm.ClassWriter;
|
|
|
7f0bec7 |
+import org.objectweb.asm.Type;
|
|
|
7f0bec7 |
import net.sf.cglib.core.Constants;
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
public class MethodFactory extends ClassLoader {
|
|
|
7f0bec7 |
- public static final int CLASS_FORMAT_VERSION = 45;
|
|
|
7f0bec7 |
+ public static final int CLASS_FORMAT_VERSION = 49;
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
public static Class[] NO_ARGUMENTS = {};
|
|
|
7f0bec7 |
public static Class[] NO_EXCEPTIONS = {};
|
|
|
7f0bec7 |
@@ -33,20 +33,20 @@
|
|
|
7f0bec7 |
{
|
|
|
7f0bec7 |
@Override
|
|
|
7f0bec7 |
protected Class findClass( String interfaceName ) {
|
|
|
7f0bec7 |
- ClassWriter writer = new ClassWriter(true);
|
|
|
7f0bec7 |
+ ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
writer.visit(CLASS_FORMAT_VERSION,
|
|
|
7f0bec7 |
Constants.ACC_PUBLIC|Constants.ACC_INTERFACE,
|
|
|
7f0bec7 |
nameToClassFormat(interfaceName),
|
|
|
7f0bec7 |
+ null,
|
|
|
7f0bec7 |
"java/lang/Object",
|
|
|
7f0bec7 |
- null, /* interfaces */
|
|
|
7f0bec7 |
- null /* source file */);
|
|
|
7f0bec7 |
+ null /* interfaces */);
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
writer.visitMethod(Constants.ACC_PUBLIC | Constants.ACC_ABSTRACT,
|
|
|
7f0bec7 |
methodName,
|
|
|
7f0bec7 |
methodDescriptor(returnType, argTypes),
|
|
|
7f0bec7 |
- classNamesInClassFormat(exceptionTypes),
|
|
|
7f0bec7 |
- null /* no attributes */);
|
|
|
7f0bec7 |
+ null,
|
|
|
7f0bec7 |
+ classNamesInClassFormat(exceptionTypes));
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
byte[] classAsBytes = writer.toByteArray();
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
diff -Nru jmock-2.5.1/test/org/jmock/test/unit/support/SyntheticEmptyInterfaceClassLoader.java jmock-2.5.1-gil/test/org/jmock/test/unit/support/SyntheticEmptyInterfaceClassLoader.java
|
|
|
7f0bec7 |
--- jmock-2.5.1/test/org/jmock/test/unit/support/SyntheticEmptyInterfaceClassLoader.java 2007-04-10 10:34:01.000000000 +0200
|
|
|
7f0bec7 |
+++ jmock-2.5.1-gil/test/org/jmock/test/unit/support/SyntheticEmptyInterfaceClassLoader.java 2012-04-19 10:46:53.706914792 +0200
|
|
|
7f0bec7 |
@@ -3,9 +3,11 @@
|
|
|
7f0bec7 |
*/
|
|
|
7f0bec7 |
package org.jmock.test.unit.support;
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
+import static org.jmock.test.unit.support.MethodFactory.CLASS_FORMAT_VERSION;
|
|
|
7f0bec7 |
+
|
|
|
7f0bec7 |
import java.util.regex.Pattern;
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
-import net.sf.cglib.asm.ClassWriter;
|
|
|
7f0bec7 |
+import org.objectweb.asm.ClassWriter;
|
|
|
7f0bec7 |
import net.sf.cglib.core.Constants;
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
public class SyntheticEmptyInterfaceClassLoader extends ClassLoader {
|
|
|
7f0bec7 |
@@ -30,13 +32,15 @@
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
private Class synthesiseInterface(String name) throws ClassFormatError {
|
|
|
7f0bec7 |
- ClassWriter writer = new ClassWriter(true);
|
|
|
7f0bec7 |
- writer.visit(MethodFactory.CLASS_FORMAT_VERSION,
|
|
|
7f0bec7 |
- Constants.ACC_PUBLIC | Constants.ACC_INTERFACE,
|
|
|
7f0bec7 |
- name.replace('.', '/'),
|
|
|
7f0bec7 |
- "java/lang/Object",
|
|
|
7f0bec7 |
- null, /* interfaces */
|
|
|
7f0bec7 |
- null /* source file */);
|
|
|
7f0bec7 |
+ ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
|
|
7f0bec7 |
+ writer.visit(CLASS_FORMAT_VERSION,
|
|
|
7f0bec7 |
+ Constants.ACC_PUBLIC|Constants.ACC_INTERFACE,
|
|
|
7f0bec7 |
+ MethodFactory.nameToClassFormat(name),
|
|
|
7f0bec7 |
+ null,
|
|
|
7f0bec7 |
+ "java/lang/Object",
|
|
|
7f0bec7 |
+ null /* interfaces */);
|
|
|
7f0bec7 |
+
|
|
|
7f0bec7 |
+
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
byte[] b = writer.toByteArray();
|
|
|
7f0bec7 |
|