me
/
guix
Archived
1
0
Fork 0
Code

gnu: java-powermock-reflect: Update to 2.0.9. 

* gnu/packages/java.scm (java-powermock-reflect): Update to 2.0.9.
[source]: Use git source.
(java-powermock-reflect, java-powermock-core, java-powermock-api-support)
(java-powermock-junit4-common, java-powermock-junit4)
(java-powermock-api-easymock): Update inputs and use new style.
* gnu/packages/patches/java-powermock-fix-java-files.patch: Update
  patch.

Change-Id: I856e5f923b094b9fcfa78f5f1d6ca2e4c2af41a7
master
Julien Lepiller 2023-02-25 21:30:42 +01:00
parent bb3a631f24
commit 92af4ea17f
No known key found for this signature in database
GPG Key ID: 53D457B2D636EE82
2 changed files with 190 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
gnu/packages/java.scm
View File

@ -11440,30 +11440,27 @@ and without the help of a compiler.")
(define-public java-powermock-reflect (define-public java-powermock-reflect
(package (package
(name "java-powermock-reflect") (name "java-powermock-reflect")
(version "1.7.3") (version "2.0.9")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/powermock/powermock/" (uri (git-reference
"archive/powermock-" version ".tar.gz")) (url "https://github.com/powermock/powermock")
(file-name (string-append name "-" version ".tar.gz")) (commit (string-append "powermock-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0sbgi5vqq7k72wzcdjb20s370vyd4hsbnx71pzb8ishml3gy7fwy")) "03y8szi9iwxnv431z2mn2ivc1ak30vcvfvkyrwmfq7wq93bj2c5v"))
(patches (patches
(search-patches "java-powermock-fix-java-files.patch")))) (search-patches "java-powermock-fix-java-files.patch"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "java-powermock-reflect.jar" `(#:jar-name "java-powermock-reflect.jar"
#:jdk ,icedtea-8
#:source-dir "powermock-reflect/src/main/java" #:source-dir "powermock-reflect/src/main/java"
#:test-dir "powermock-reflect/src/test")) #:test-dir "powermock-reflect/src/test"))
(inputs (inputs
(list java-objenesis)) (list java-asm-9 java-objenesis))
(native-inputs (native-inputs
`(("junit" ,java-junit) (list java-assertj java-cglib java-hamcrest-core java-junit))
("cglib" ,java-cglib)
("hamcrest" ,java-hamcrest-core)
("assertj" ,java-assertj)))
(home-page "https://github.com/powermock/powermock") (home-page "https://github.com/powermock/powermock")
(synopsis "Mock library extension framework") (synopsis "Mock library extension framework")
(description "PowerMock is a framework that extends other mock libraries (description "PowerMock is a framework that extends other mock libraries
@ -11492,12 +11489,12 @@ done to the IDE or continuous integration servers which simplifies adoption.")
"build/classes") "build/classes")
#t))))) #t)))))
(inputs (inputs
`(("reflect" ,java-powermock-reflect) (list java-asm-9
("javassist" ,java-jboss-javassist))) java-byte-buddy-dep
java-jboss-javassist
java-powermock-reflect))
(native-inputs (native-inputs
`(("junit" ,java-junit) (list java-assertj java-mockito-1 java-junit))))
("assertj" ,java-assertj)
("mockito" ,java-mockito-1)))))
(define-public java-powermock-api-support (define-public java-powermock-api-support
(package (package
@ -11510,8 +11507,7 @@ done to the IDE or continuous integration servers which simplifies adoption.")
#:source-dir "powermock-api/powermock-api-support/src/main/java" #:source-dir "powermock-api/powermock-api-support/src/main/java"
#:tests? #f)); no tests #:tests? #f)); no tests
(inputs (inputs
`(("core" ,java-powermock-core) (list java-powermock-core java-powermock-reflect))))
("reflect" ,java-powermock-reflect)))))
(define-public java-powermock-modules-junit4-common (define-public java-powermock-modules-junit4-common
(package (package
@ -11524,11 +11520,11 @@ done to the IDE or continuous integration servers which simplifies adoption.")
#:source-dir "powermock-modules/powermock-module-junit4-common/src/main/java" #:source-dir "powermock-modules/powermock-module-junit4-common/src/main/java"
#:test-dir "powermock-modules/powermock-module-junit4-common/src/test")) #:test-dir "powermock-modules/powermock-module-junit4-common/src/test"))
(inputs (inputs
`(("core" ,java-powermock-core) (list java-cglib
("easymock" ,java-easymock) java-easymock
("reflect" ,java-powermock-reflect) java-hamcrest-core
("hamcrest" ,java-hamcrest-core) java-powermock-core
("cglib" ,java-cglib))))) java-powermock-reflect))))
(define-public java-powermock-modules-junit4 (define-public java-powermock-modules-junit4
(package (package
@ -11537,7 +11533,7 @@ done to the IDE or continuous integration servers which simplifies adoption.")
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "java-powermock-modules-junit4.jar" `(#:jar-name "java-powermock-modules-junit4.jar"
#:jdk ,icedtea-8 #:tests? #f; require easymock 4, which introduces a loop with testng
#:source-dir "powermock-modules/powermock-module-junit4/src/main/java" #:source-dir "powermock-modules/powermock-module-junit4/src/main/java"
#:test-dir "powermock-modules/powermock-module-junit4/src/test" #:test-dir "powermock-modules/powermock-module-junit4/src/test"
#:phases #:phases
@ -11550,15 +11546,15 @@ done to the IDE or continuous integration servers which simplifies adoption.")
(("4.12") "4.12-SNAPSHOT")) (("4.12") "4.12-SNAPSHOT"))
#t))))) #t)))))
(inputs (inputs
`(("core" ,java-powermock-core) (list java-cglib
("reflect" ,java-powermock-reflect) java-powermock-core
("common" ,java-powermock-modules-junit4-common) java-powermock-reflect
("cglib" ,java-cglib))) java-powermock-modules-junit4-common))
(native-inputs (native-inputs
`(("easymock" ,java-easymock) (list java-easymock
("hamcrest" ,java-hamcrest-core) java-hamcrest-core
("objenesis" ,java-objenesis) java-junit
("junit" ,java-junit))))) java-objenesis))))
(define-public java-powermock-api-easymock (define-public java-powermock-api-easymock
(package (package
@ -11581,11 +11577,11 @@ done to the IDE or continuous integration servers which simplifies adoption.")
(("\\(\\(MockClassLoader\\) classLoader\\).*;") ";"))) (("\\(\\(MockClassLoader\\) classLoader\\).*;") ";")))
#t))))) #t)))))
(inputs (inputs
`(("core" ,java-powermock-core) (list java-cglib
("easymock" ,java-easymock) java-easymock
("reflect" ,java-powermock-reflect) java-powermock-api-support
("support" ,java-powermock-api-support) java-powermock-core
("cglib" ,java-cglib))))) java-powermock-reflect))))
(define-public java-jboss-jms-api-spec (define-public java-jboss-jms-api-spec
(package (package

192
gnu/packages/patches/java-powermock-fix-java-files.patch
View File

@ -1,16 +1,129 @@
This patch fixes build issues caused by the java compiler not finding the This patch fixes build issues caused by the java compiler not finding the
correct types on some statements. correct types on some statements.
From 1ac84b58b4383fa118d98c35956d722d11cf449e Mon Sep 17 00:00:00 2001 From 10ce6e0e30bbaf22212abc77f5d644c074df6068 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu> From: Julien Lepiller <julien@lepiller.eu>
Date: Tue, 22 Aug 2017 20:40:27 +0200 Date: Sat, 25 Feb 2023 18:00:13 +0100
Subject: [PATCH] Fix java files. Subject: [PATCH] Fix java files.
--- ---
.../internal/impl/DelegatingPowerMockRunner.java | 13 +++++++--- .../ConditionalStateStackManipulation.java | 6 ++--
.../java/org/powermock/reflect/WhiteBoxTest.java | 30 +++++++++++----------- .../org/powermock/core/bytebuddy/Frame.java | 2 +-
.../reflect/internal/proxy/ClassFactory.java | 6 ++--- .../core/bytebuddy/MaxLocalsExtractor.java | 6 ++--
3 files changed, 27 insertions(+), 22 deletions(-) .../core/bytebuddy/MockGetawayCall.java | 2 +-
.../core/bytebuddy/PrimitiveBoxing.java | 4 +--
.../agent/DefinalizingClassTransformer.java | 4 +--
.../agent/DefinalizingClassVisitor.java | 6 ++--
.../impl/DelegatingPowerMockRunner.java | 13 +++++---
.../org/powermock/reflect/WhiteBoxTest.java | 32 +++++++++----------
.../reflect/internal/proxy/ClassFactory.java | 6 ++--
10 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/ConditionalStateStackManipulation.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/ConditionalStateStackManipulation.java
index fa23a3f..1fa4b94 100644
--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/ConditionalStateStackManipulation.java
+++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/ConditionalStateStackManipulation.java
@@ -20,9 +20,9 @@ package org.powermock.core.bytebuddy;
import net.bytebuddy.implementation.Implementation.Context;
import net.bytebuddy.implementation.bytecode.StackManipulation;
-import net.bytebuddy.jar.asm.Label;
-import net.bytebuddy.jar.asm.MethodVisitor;
-import net.bytebuddy.jar.asm.Opcodes;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
public class ConditionalStateStackManipulation implements StackManipulation {
diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/Frame.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/Frame.java
index 8ada262..adfc218 100644
--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/Frame.java
+++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/Frame.java
@@ -24,7 +24,7 @@ import net.bytebuddy.description.method.ParameterDescription.InDefinedShape;
import net.bytebuddy.description.method.ParameterList;
import net.bytebuddy.description.type.TypeDescription.Generic;
import net.bytebuddy.implementation.bytecode.StackSize;
-import net.bytebuddy.jar.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
import net.bytebuddy.utility.CompoundList;
import java.util.ArrayList;
diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/MaxLocalsExtractor.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/MaxLocalsExtractor.java
index 6b5cddd..8fe1936 100644
--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/MaxLocalsExtractor.java
+++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/MaxLocalsExtractor.java
@@ -19,9 +19,9 @@
package org.powermock.core.bytebuddy;
import net.bytebuddy.description.method.MethodDescription;
-import net.bytebuddy.jar.asm.ClassVisitor;
-import net.bytebuddy.jar.asm.MethodVisitor;
-import net.bytebuddy.jar.asm.Opcodes;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
public class MaxLocalsExtractor extends ClassVisitor {
diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/MockGetawayCall.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/MockGetawayCall.java
index db84196..84942f8 100644
--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/MockGetawayCall.java
+++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/MockGetawayCall.java
@@ -27,7 +27,7 @@ import net.bytebuddy.implementation.bytecode.StackManipulation;
import net.bytebuddy.implementation.bytecode.collection.ArrayFactory;
import net.bytebuddy.implementation.bytecode.constant.ClassConstant;
import net.bytebuddy.implementation.bytecode.member.MethodInvocation;
-import net.bytebuddy.jar.asm.MethodVisitor;
+import org.objectweb.asm.MethodVisitor;
import org.powermock.core.bytebuddy.Variable.VariableAccess;
import org.powermock.reflect.internal.WhiteboxImpl;
diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/PrimitiveBoxing.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/PrimitiveBoxing.java
index e200b22..ae1036b 100644
--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/PrimitiveBoxing.java
+++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/PrimitiveBoxing.java
@@ -24,8 +24,8 @@ import net.bytebuddy.description.type.TypeDescription.ForLoadedType;
import net.bytebuddy.implementation.Implementation;
import net.bytebuddy.implementation.bytecode.StackManipulation;
import net.bytebuddy.implementation.bytecode.StackSize;
-import net.bytebuddy.jar.asm.MethodVisitor;
-import net.bytebuddy.jar.asm.Opcodes;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
public enum PrimitiveBoxing implements StackManipulation{
diff --git a/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassTransformer.java b/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassTransformer.java
index e8eef7a..01d0bcb 100644
--- a/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassTransformer.java
+++ b/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassTransformer.java
@@ -16,8 +16,8 @@
package org.powermock.modules.agent;
-import net.bytebuddy.jar.asm.ClassReader;
-import net.bytebuddy.jar.asm.ClassWriter;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
import java.lang.instrument.ClassFileTransformer;
import java.security.ProtectionDomain;
diff --git a/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassVisitor.java b/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassVisitor.java
index 3bb80c3..9aada60 100644
--- a/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassVisitor.java
+++ b/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassVisitor.java
@@ -1,8 +1,8 @@
package org.powermock.modules.agent;
-import net.bytebuddy.jar.asm.ClassVisitor;
-import net.bytebuddy.jar.asm.MethodVisitor;
-import net.bytebuddy.jar.asm.Opcodes;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
class DefinalizingClassVisitor extends ClassVisitor {
diff --git a/powermock-modules/powermock-module-junit4/src/main/java/org/powermock/modules/junit4/internal/impl/DelegatingPowerMockRunner.java b/powermock-modules/powermock-module-junit4/src/main/java/org/powermock/modules/junit4/internal/impl/DelegatingPowerMockRunner.java diff --git a/powermock-modules/powermock-module-junit4/src/main/java/org/powermock/modules/junit4/internal/impl/DelegatingPowerMockRunner.java b/powermock-modules/powermock-module-junit4/src/main/java/org/powermock/modules/junit4/internal/impl/DelegatingPowerMockRunner.java
index 301f854..caecbbd 100644 index 301f854..caecbbd 100644
@ -39,7 +152,7 @@ index 301f854..caecbbd 100644
if (testClass.isAnnotationPresent(PowerMockRunnerDelegate.class) if (testClass.isAnnotationPresent(PowerMockRunnerDelegate.class)
&& JUnitVersion.isGreaterThanOrEqualTo("4.5")) { && JUnitVersion.isGreaterThanOrEqualTo("4.5")) {
diff --git a/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java b/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java diff --git a/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java b/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java
index bf1e2e3..0d60487 100644 index acb3154..8c24fbc 100644
--- a/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java --- a/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java
+++ b/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java +++ b/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java
@@ -248,7 +248,7 @@ public class WhiteBoxTest { @@ -248,7 +248,7 @@ public class WhiteBoxTest {
@ -47,126 +160,133 @@ index bf1e2e3..0d60487 100644
@Test @Test
public void testMethodWithPrimitiveAndWrappedInt_primtive_wrapped() throws Exception { public void testMethodWithPrimitiveAndWrappedInt_primtive_wrapped() throws Exception {
- assertEquals(17, Whitebox.invokeMethod(new ClassWithPrivateMethods(), "methodWithPrimitiveAndWrappedInt", - assertEquals(17, Whitebox.invokeMethod(new ClassWithPrivateMethods(), "methodWithPrimitiveAndWrappedInt",
+ assertEquals((Integer)17, Whitebox.invokeMethod(new ClassWithPrivateMethods(), "methodWithPrimitiveAndWrappedInt", + assertEquals(17, (int) Whitebox.invokeMethod(new ClassWithPrivateMethods(), "methodWithPrimitiveAndWrappedInt",
new Class[]{int.class, Integer.class}, 9, Integer.valueOf(8))); new Class[]{int.class, Integer.class}, 9, Integer.valueOf(8)));
} }
@@ -257,7 +257,7 @@ public class WhiteBoxTest { @@ -257,13 +257,13 @@ public class WhiteBoxTest {
int expected = 123; int expected = 123;
Whitebox.setInternalState(ClassWithInternalState.class, "staticState", expected); Whitebox.setInternalState(ClassWithInternalState.class, "staticState", expected);
assertEquals(expected, ClassWithInternalState.getStaticState()); assertEquals(expected, ClassWithInternalState.getStaticState());
- assertEquals(expected, Whitebox.getInternalState(ClassWithInternalState.class, "staticState")); - assertEquals(expected, Whitebox.getInternalState(ClassWithInternalState.class, "staticState"));
+ assertEquals(expected, (int)Whitebox.getInternalState(ClassWithInternalState.class, "staticState")); + assertEquals(expected, (int) Whitebox.getInternalState(ClassWithInternalState.class, "staticState"));
} }
@Test @Test
@@ -334,25 +334,25 @@ public class WhiteBoxTest { public void testStaticFinalPrimitiveState() {
Whitebox.setInternalState(ClassWithInternalState.class, "staticFinalIntState", 123);
- assertEquals(123, Whitebox.getInternalState(ClassWithInternalState.class, "staticFinalIntState"));
+ assertEquals(123, (int) Whitebox.getInternalState(ClassWithInternalState.class, "staticFinalIntState"));
}
@Test
@@ -330,25 +330,25 @@ public class WhiteBoxTest {
@Test @Test
public void testInvokeVarArgsMethod_multipleValues() throws Exception { public void testInvokeVarArgsMethod_multipleValues() throws Exception {
ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); ClassWithPrivateMethods tested = new ClassWithPrivateMethods();
- assertEquals(6, Whitebox.invokeMethod(tested, "varArgsMethod", 1, 2, 3)); - assertEquals(6, Whitebox.invokeMethod(tested, "varArgsMethod", 1, 2, 3));
+ assertEquals(6, (int)Whitebox.invokeMethod(tested, "varArgsMethod", 1, 2, 3)); + assertEquals(6, (int) Whitebox.invokeMethod(tested, "varArgsMethod", 1, 2, 3));
} }
@Test @Test
public void testInvokeVarArgsMethod_noArguments() throws Exception { public void testInvokeVarArgsMethod_noArguments() throws Exception {
ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); ClassWithPrivateMethods tested = new ClassWithPrivateMethods();
- assertEquals(0, Whitebox.invokeMethod(tested, "varArgsMethod")); - assertEquals(0, Whitebox.invokeMethod(tested, "varArgsMethod"));
+ assertEquals(0, (int)Whitebox.invokeMethod(tested, "varArgsMethod")); + assertEquals(0, (int) Whitebox.invokeMethod(tested, "varArgsMethod"));
} }
@Test @Test
public void testInvokeVarArgsMethod_oneArgument() throws Exception { public void testInvokeVarArgsMethod_oneArgument() throws Exception {
ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); ClassWithPrivateMethods tested = new ClassWithPrivateMethods();
- assertEquals(4, Whitebox.invokeMethod(tested, "varArgsMethod", 2)); - assertEquals(4, Whitebox.invokeMethod(tested, "varArgsMethod", 2));
+ assertEquals(4, (int)Whitebox.invokeMethod(tested, "varArgsMethod", 2)); + assertEquals(4, (int) Whitebox.invokeMethod(tested, "varArgsMethod", 2));
} }
@Test @Test
public void testInvokeVarArgsMethod_invokeVarArgsWithOneArgument() throws Exception { public void testInvokeVarArgsMethod_invokeVarArgsWithOneArgument() throws Exception {
ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); ClassWithPrivateMethods tested = new ClassWithPrivateMethods();
- assertEquals(1, Whitebox.invokeMethod(tested, "varArgsMethod", new Class<?>[]{int[].class}, 1)); - assertEquals(1, Whitebox.invokeMethod(tested, "varArgsMethod", new Class<?>[]{int[].class}, 1));
+ assertEquals(1, (int)Whitebox.invokeMethod(tested, "varArgsMethod", new Class<?>[]{int[].class}, 1)); + assertEquals(1, (int) Whitebox.invokeMethod(tested, "varArgsMethod", new Class<?>[]{int[].class}, 1));
} }
@Test @Test
@@ -376,7 +376,7 @@ public class WhiteBoxTest { @@ -372,7 +372,7 @@ public class WhiteBoxTest {
ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() { ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() {
}; };
Whitebox.setInternalState(tested, fieldName, value); Whitebox.setInternalState(tested, fieldName, value);
- assertEquals(value, Whitebox.getInternalState(tested, fieldName)); - assertEquals(value, Whitebox.getInternalState(tested, fieldName));
+ assertEquals(value, (int)Whitebox.getInternalState(tested, fieldName)); + assertEquals(value, (int) Whitebox.getInternalState(tested, fieldName));
} }
@Test @Test
@@ -387,8 +387,8 @@ public class WhiteBoxTest { @@ -383,8 +383,8 @@ public class WhiteBoxTest {
ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() { ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() {
}; };
Whitebox.setInternalState(tested, fieldName, value); Whitebox.setInternalState(tested, fieldName, value);
- assertEquals(value, Whitebox.getInternalState(tested, fieldName)); - assertEquals(value, Whitebox.getInternalState(tested, fieldName));
- assertEquals(-1, Whitebox.getInternalState(tested, fieldName, ClassWithInternalState.class)); - assertEquals(-1, Whitebox.getInternalState(tested, fieldName, ClassWithInternalState.class));
+ assertEquals(value, (int)Whitebox.getInternalState(tested, fieldName)); + assertEquals(value, (int) Whitebox.getInternalState(tested, fieldName));
+ assertEquals(-1, (int)Whitebox.getInternalState(tested, fieldName, ClassWithInternalState.class)); + assertEquals(-1, (int) Whitebox.getInternalState(tested, fieldName, ClassWithInternalState.class));
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
@@ -398,7 +398,7 @@ public class WhiteBoxTest { @@ -394,7 +394,7 @@ public class WhiteBoxTest {
ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() { ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() {
}; };
Whitebox.setInternalState(tested, fieldName, new Object()); Whitebox.setInternalState(tested, fieldName, new Object());
- assertEquals(value, Whitebox.getInternalState(tested, fieldName)); - assertEquals(value, Whitebox.getInternalState(tested, fieldName));
+ assertEquals(value, (int)Whitebox.getInternalState(tested, fieldName)); + assertEquals(value, (int) Whitebox.getInternalState(tested, fieldName));
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
@@ -408,7 +408,7 @@ public class WhiteBoxTest { @@ -404,7 +404,7 @@ public class WhiteBoxTest {
ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() { ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() {
}; };
Whitebox.setInternalState(tested, fieldName, (Object) null); Whitebox.setInternalState(tested, fieldName, (Object) null);
- assertEquals(value, Whitebox.getInternalState(tested, fieldName)); - assertEquals(value, Whitebox.getInternalState(tested, fieldName));
+ assertEquals(value, (int)Whitebox.getInternalState(tested, fieldName)); + assertEquals(value, (int) Whitebox.getInternalState(tested, fieldName));
} }
@Test @Test
@@ -417,8 +417,8 @@ public class WhiteBoxTest { @@ -413,8 +413,8 @@ public class WhiteBoxTest {
ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState(); ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState();
Whitebox.setInternalState(tested, int.class, value); Whitebox.setInternalState(tested, int.class, value);
assertEquals(value, (int) Whitebox.getInternalState(tested, int.class)); assertEquals(value, (int) Whitebox.getInternalState(tested, int.class));
- assertEquals(value, Whitebox.getInternalState(tested, "anotherInternalState")); - assertEquals(value, Whitebox.getInternalState(tested, "anotherInternalState"));
- assertEquals(value, Whitebox.getInternalState(tested, "anotherInternalState", - assertEquals(value, Whitebox.getInternalState(tested, "anotherInternalState",
+ assertEquals(value, (int)Whitebox.getInternalState(tested, "anotherInternalState")); + assertEquals(value, (int) Whitebox.getInternalState(tested, "anotherInternalState"));
+ assertEquals(value, (int)Whitebox.getInternalState(tested, "anotherInternalState", + assertEquals(value, (int) Whitebox.getInternalState(tested, "anotherInternalState",
ClassWithChildThatHasInternalState.class)); ClassWithChildThatHasInternalState.class));
} }
@@ -429,7 +429,7 @@ public class WhiteBoxTest { @@ -425,7 +425,7 @@ public class WhiteBoxTest {
Whitebox.setInternalState(tested, int.class, value, ClassWithInternalState.class); Whitebox.setInternalState(tested, int.class, value, ClassWithInternalState.class);
assertEquals(42, (int) Whitebox.getInternalState(tested, int.class)); assertEquals(42, (int) Whitebox.getInternalState(tested, int.class));
assertEquals(value, (int) Whitebox.getInternalState(tested, int.class, ClassWithInternalState.class)); assertEquals(value, (int) Whitebox.getInternalState(tested, int.class, ClassWithInternalState.class));
- assertEquals(value, Whitebox.getInternalState(tested, "staticState", ClassWithInternalState.class)); - assertEquals(value, Whitebox.getInternalState(tested, "staticState", ClassWithInternalState.class));
+ assertEquals(value, (int)Whitebox.getInternalState(tested, "staticState", ClassWithInternalState.class)); + assertEquals(value, (int) Whitebox.getInternalState(tested, "staticState", ClassWithInternalState.class));
} }
@Test @Test
@@ -619,7 +619,7 @@ public class WhiteBoxTest { @@ -621,7 +621,7 @@ public class WhiteBoxTest {
@Test @Test
public void testInvokeMethodWithBothNormalAndVarArgsParameter() throws Exception { public void testInvokeMethodWithBothNormalAndVarArgsParameter() throws Exception {
ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); ClassWithPrivateMethods tested = new ClassWithPrivateMethods();
- assertEquals(4, Whitebox.invokeMethod(tested, "varArgsMethod2", 1, 2, 3)); - assertEquals(4, Whitebox.invokeMethod(tested, "varArgsMethod2", 1, 2, 3));
+ assertEquals(4, (int)Whitebox.invokeMethod(tested, "varArgsMethod2", 1, 2, 3)); + assertEquals(4, (int) Whitebox.invokeMethod(tested, "varArgsMethod2", 1, 2, 3));
} }
@Test @Test
diff --git a/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java b/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java diff --git a/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java b/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java
index a5e5fda..14b8bbe 100644 index 03db992..828bfe0 100644
--- a/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java --- a/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java
+++ b/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java +++ b/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package org.powermock.reflect.internal.proxy; package org.powermock.reflect.internal.proxy;
-import net.sf.cglib.asm.ClassWriter; -import net.bytebuddy.jar.asm.ClassWriter;
-import net.sf.cglib.asm.MethodVisitor; -import net.bytebuddy.jar.asm.MethodVisitor;
-import net.sf.cglib.asm.Opcodes; -import net.bytebuddy.jar.asm.Opcodes;
+import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes;
@ -174,5 +294,5 @@ index a5e5fda..14b8bbe 100644
class ClassFactory implements Opcodes { class ClassFactory implements Opcodes {
-- --
2.14.1 2.38.1