{
- private final Method method;
-
- public MethodStubStrategyImpl(Method method) {
- if (method == null) {
- throw new IllegalArgumentException("Method to stub cannot be null.");
- }
- this.method = method;
- }
-
- @Deprecated
- @Override
- public void andReturn(T returnValue) {
- toReturn(returnValue);
- }
-
- @Override
- public void toThrow(final Throwable throwable) {
- InvocationHandler throwingInvocationHandler = new InvocationHandler() {
-
- @Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- throw throwable;
- }
- };
- MethodProxy.proxy(method, throwingInvocationHandler);
- }
-
- @Override
- public void toReturn(T returnValue) {
- Stubber.stubMethod(method, returnValue);
- }
+ private final Method method;
+
+ public MethodStubStrategyImpl(Method method) {
+ if (method == null) {
+ throw new IllegalArgumentException("Method to stub cannot be null.");
+ }
+ this.method = method;
+ }
+
+ @Deprecated
+ @Override
+ public void andReturn(T returnValue) {
+ toReturn(returnValue);
+ }
+
+ @Override
+ public void toThrow(final Throwable throwable) {
+ InvocationHandler throwingInvocationHandler = (proxy, method, args) -> {
+ throw throwable;
+ };
+ MethodProxy.proxy(method, throwingInvocationHandler);
+ }
+
+ @Override
+ public void toReturn(T returnValue) {
+ Stubber.stubMethod(method, returnValue);
+ }
}
diff --git a/powermock-classloading/powermock-classloading-objenesis/src/main/java/org/powermock/classloading/DeepCloner.java b/powermock-classloading/powermock-classloading-objenesis/src/main/java/org/powermock/classloading/DeepCloner.java
index 63fe26c2f..649c2a435 100644
--- a/powermock-classloading/powermock-classloading-objenesis/src/main/java/org/powermock/classloading/DeepCloner.java
+++ b/powermock-classloading/powermock-classloading-objenesis/src/main/java/org/powermock/classloading/DeepCloner.java
@@ -21,7 +21,6 @@
import org.powermock.classloading.spi.DoNotClone;
import org.powermock.core.ListMap;
import org.powermock.reflect.Whitebox;
-import sun.misc.Unsafe;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -36,6 +35,8 @@
import java.lang.reflect.Modifier;
import java.util.Map;
+import sun.misc.Unsafe;
+
/**
*
* The purpose of the deep cloner is to create a deep clone of an object. An
@@ -45,7 +46,7 @@
public class DeepCloner implements DeepClonerSPI {
private final ClassLoader targetCL;
- private final Map referenceMap = new ListMap();
+ private final Map referenceMap = new ListMap<>();
private final Class doNotClone;
/**
@@ -354,7 +355,7 @@ public static void write(Field field, Object object, Object value) {
}
try {
final long offset;
- if (DeepCloner.isStaticFinalModifier(field)) {
+ if (isStaticFinalModifier(field)) {
offset = unsafe.staticFieldOffset(field);
} else {
offset = unsafe.objectFieldOffset(field);
diff --git a/powermock-classloading/powermock-classloading-objenesis/src/test/java/powermock/classloading/ObjenesisClassloaderExecutorTest.java b/powermock-classloading/powermock-classloading-objenesis/src/test/java/powermock/classloading/ObjenesisClassloaderExecutorTest.java
index 82aa0caa8..962d20727 100644
--- a/powermock-classloading/powermock-classloading-objenesis/src/test/java/powermock/classloading/ObjenesisClassloaderExecutorTest.java
+++ b/powermock-classloading/powermock-classloading-objenesis/src/test/java/powermock/classloading/ObjenesisClassloaderExecutorTest.java
@@ -16,7 +16,6 @@
package powermock.classloading;
-import org.junit.Ignore;
import org.junit.Test;
import org.powermock.classloading.SingleClassloaderExecutor;
import org.powermock.core.classloader.MockClassLoader;
@@ -24,6 +23,10 @@
import org.powermock.core.transformers.ClassWrapper;
import org.powermock.core.transformers.MockTransformer;
import org.powermock.core.transformers.support.DefaultMockTransformerChain;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.Callable;
+
import powermock.classloading.classes.MyArgument;
import powermock.classloading.classes.MyClass;
import powermock.classloading.classes.MyEnum;
@@ -35,25 +38,22 @@
import powermock.classloading.classes.MyReturnValue;
import powermock.classloading.classes.ReflectionMethodInvoker;
-import java.lang.reflect.Method;
-import java.util.concurrent.Callable;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertSame;
-@Ignore("Test are failed on JDK more that 1.6. On Travis we can run only on JDK8 and JDK9")
public class ObjenesisClassloaderExecutorTest {
@Test
- public void loadsObjectGraphInSpecifiedClassloaderAndReturnsResultInOriginalClassloader() throws Exception {
+ public void loadsObjectGraphInSpecifiedClassloaderAndReturnsResultInOriginalClassloader() {
MockClassLoader classloader = createClassloader();
final MyReturnValue expectedConstructorValue = new MyReturnValue(new MyArgument("first value"));
final MyClass myClass = new MyClass(expectedConstructorValue);
final MyArgument expected = new MyArgument("A value");
MyReturnValue[] actual = new SingleClassloaderExecutor(classloader).execute(new Callable() {
- public MyReturnValue[] call() throws Exception {
+ @Override
+ public MyReturnValue[] call() {
assertEquals(JavassistMockClassLoader.class.getName(), this.getClass()
.getClassLoader()
.getClass()
@@ -61,8 +61,8 @@ public MyReturnValue[] call() throws Exception {
return myClass.myMethod(expected);
}
});
-
- assertFalse(MockClassLoader.class.getName().equals(this.getClass().getClassLoader().getClass().getName()));
+
+ assertNotEquals(MockClassLoader.class.getName(), this.getClass().getClassLoader().getClass().getName());
final MyReturnValue myReturnValue = actual[0];
assertEquals(expectedConstructorValue.getMyArgument().getValue(), myReturnValue.getMyArgument().getValue());
@@ -70,13 +70,13 @@ public MyReturnValue[] call() throws Exception {
}
@Test
- public void loadsObjectGraphThatIncludesPrimitiveValuesInSpecifiedClassloaderAndReturnsResultInOriginalClassloader()
- throws Exception {
+ public void loadsObjectGraphThatIncludesPrimitiveValuesInSpecifiedClassloaderAndReturnsResultInOriginalClassloader() {
MockClassLoader classloader = createClassloader();
final Integer expected = 42;
final MyIntegerHolder myClass = new MyIntegerHolder(expected);
Integer actual = new SingleClassloaderExecutor(classloader).execute(new Callable() {
- public Integer call() throws Exception {
+ @Override
+ public Integer call() {
assertEquals(JavassistMockClassLoader.class.getName(), this.getClass()
.getClassLoader()
.getClass()
@@ -86,20 +86,20 @@ public Integer call() throws Exception {
return myInteger;
}
});
-
- assertFalse(MockClassLoader.class.getName().equals(this.getClass().getClassLoader().getClass().getName()));
+
+ assertNotEquals(MockClassLoader.class.getName(), this.getClass().getClassLoader().getClass().getName());
assertEquals(expected, actual);
}
@Test
- public void loadsObjectGraphThatIncludesEnumsInSpecifiedClassloaderAndReturnsResultInOriginalClassloader()
- throws Exception {
+ public void loadsObjectGraphThatIncludesEnumsInSpecifiedClassloaderAndReturnsResultInOriginalClassloader() {
MockClassLoader classloader = createClassloader();
final MyEnum expected = MyEnum.MyEnum1;
final MyEnumHolder myClass = new MyEnumHolder(expected);
MyEnum actual = new SingleClassloaderExecutor(classloader).execute(new Callable() {
- public MyEnum call() throws Exception {
+ @Override
+ public MyEnum call() {
assertEquals(JavassistMockClassLoader.class.getName(), this.getClass()
.getClassLoader()
.getClass()
@@ -109,20 +109,20 @@ public MyEnum call() throws Exception {
return myEnum;
}
});
-
- assertFalse(MockClassLoader.class.getName().equals(this.getClass().getClassLoader().getClass().getName()));
+
+ assertNotEquals(MockClassLoader.class.getName(), this.getClass().getClassLoader().getClass().getName());
assertEquals(expected, actual);
}
@Test
- public void loadsObjectGraphThatIncludesPrimitiveArraysInSpecifiedClassloaderAndReturnsResultInOriginalClassloader()
- throws Exception {
+ public void loadsObjectGraphThatIncludesPrimitiveArraysInSpecifiedClassloaderAndReturnsResultInOriginalClassloader() {
MockClassLoader classloader = createClassloader();
final int[] expected = new int[]{1, 2};
final MyPrimitiveArrayHolder myClass = new MyPrimitiveArrayHolder(expected);
int[] actual = new SingleClassloaderExecutor(classloader).execute(new Callable() {
- public int[] call() throws Exception {
+ @Override
+ public int[] call() {
assertEquals(JavassistMockClassLoader.class.getName(), this.getClass()
.getClassLoader()
.getClass()
@@ -132,18 +132,19 @@ public int[] call() throws Exception {
return myArray;
}
});
-
- assertFalse(MockClassLoader.class.getName().equals(this.getClass().getClassLoader().getClass().getName()));
+
+ assertNotEquals(MockClassLoader.class.getName(), this.getClass().getClassLoader().getClass().getName());
assertArrayEquals(expected, actual);
}
@Test
- public void usesReferenceCloningWhenTwoFieldsPointToSameInstance() throws Exception {
+ public void usesReferenceCloningWhenTwoFieldsPointToSameInstance() {
final MockClassLoader classloader = createClassloader();
final MyReferenceFieldHolder tested = new MyReferenceFieldHolder();
assertSame(tested.getMyArgument1(), tested.getMyArgument2());
assertSame(tested.getMyArgument1(), MyReferenceFieldHolder.MY_ARGUMENT);
new SingleClassloaderExecutor(classloader).execute(new Runnable() {
+ @Override
public void run() {
assertEquals(JavassistMockClassLoader.class.getName(), this.getClass()
.getClassLoader()
@@ -159,12 +160,13 @@ public void run() {
}
@Test
- public void worksWithObjectHierarchy() throws Exception {
+ public void worksWithObjectHierarchy() {
final MockClassLoader classloader = createClassloader();
final MyHierarchicalFieldHolder tested = new MyHierarchicalFieldHolder();
assertSame(tested.getMyArgument1(), tested.getMyArgument2());
assertEquals(tested.getMyArgument3(), tested.getMyArgument2());
new SingleClassloaderExecutor(classloader).execute(new Runnable() {
+ @Override
public void run() {
assertEquals(JavassistMockClassLoader.class.getName(), this.getClass()
.getClassLoader()
@@ -184,6 +186,7 @@ public void worksWithReflection() throws Exception {
Method method = instance.getClass().getMethod("getMyArgument");
final ReflectionMethodInvoker tested = new ReflectionMethodInvoker(method, instance);
new SingleClassloaderExecutor(classloader).execute(new Runnable() {
+ @Override
public void run() {
Object invoke = tested.invoke();
assertSame(invoke, myArgument);
@@ -196,7 +199,7 @@ private MockClassLoader createClassloader() {
MyArgument.class.getName(), MyReturnValue.class.getName()});
MockTransformer mainMockTransformer = new MockTransformer