From d6649fe10f2710e13e0f1c323ffc7141c851465f Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 21 Sep 2021 08:42:06 +0100 Subject: [PATCH] Remove powermock --- pom.xml | 11 ----- src/it/powermock/invoker.properties | 1 - src/it/powermock/pom.xml | 42 ------------------- .../powermock/src/main/resources/index.jelly | 4 -- .../powermock/src/test/java/test/XTest.java | 34 --------------- 5 files changed, 92 deletions(-) delete mode 100644 src/it/powermock/invoker.properties delete mode 100644 src/it/powermock/pom.xml delete mode 100644 src/it/powermock/src/main/resources/index.jelly delete mode 100644 src/it/powermock/src/test/java/test/XTest.java diff --git a/pom.xml b/pom.xml index 7f23850068..53e6bac317 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,6 @@ 1.24 1.20 - 2.0.9 false @@ -160,16 +159,6 @@ mockito-core 3.12.4 - - org.powermock - powermock-module-junit4 - ${powermock.version} - - - org.powermock - powermock-api-mockito2 - ${powermock.version} - org.objenesis objenesis diff --git a/src/it/powermock/invoker.properties b/src/it/powermock/invoker.properties deleted file mode 100644 index de21ce6dfe..0000000000 --- a/src/it/powermock/invoker.properties +++ /dev/null @@ -1 +0,0 @@ -invoker.goals=-Dstyle.color=always -ntp clean install diff --git a/src/it/powermock/pom.xml b/src/it/powermock/pom.xml deleted file mode 100644 index 563681fec4..0000000000 --- a/src/it/powermock/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - org.jenkins-ci.plugins - plugin - @project.version@ - - - io.jenkins.plugins - powermock - 1.0-SNAPSHOT - hpi - - 2.235.1 - 8 - - - - org.powermock - powermock-api-mockito2 - test - - - org.powermock - powermock-module-junit4 - test - - - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - - diff --git a/src/it/powermock/src/main/resources/index.jelly b/src/it/powermock/src/main/resources/index.jelly deleted file mode 100644 index 0bc1db2e4b..0000000000 --- a/src/it/powermock/src/main/resources/index.jelly +++ /dev/null @@ -1,4 +0,0 @@ - -
- irrelevant -
diff --git a/src/it/powermock/src/test/java/test/XTest.java b/src/it/powermock/src/test/java/test/XTest.java deleted file mode 100644 index cceb2c3dbf..0000000000 --- a/src/it/powermock/src/test/java/test/XTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package test; - -import jenkins.model.Jenkins; -import static org.junit.Assert.assertEquals; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -@PrepareForTest(Jenkins.class) -@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"}) -public class XTest { - - @Mock - private Jenkins jenkins; - - @Before - public void setUp() throws Exception { - PowerMockito.mockStatic(Jenkins.class); - PowerMockito.when(Jenkins.get()).thenReturn(jenkins); - PowerMockito.when(jenkins.getSystemMessage()).thenReturn("mocked"); - } - - @Test - public void smokes() { - assertEquals("mocked", Jenkins.get().getSystemMessage()); - } - -}