diff --git a/pom.xml b/pom.xml index a0ef635a..26ac7f62 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.7 + 4.31 @@ -83,27 +83,18 @@ com.github.spotbugs spotbugs-annotations - 4.1.4 - - - org.mockito - mockito-core - test - - - org.powermock - powermock-module-junit4 - test + 4.5.1 + true - org.hamcrest - hamcrest-core + com.google.code.findbugs + jsr305 - org.powermock - powermock-api-mockito2 + org.mockito + mockito-core test diff --git a/src/test/java/hudson/plugins/active_directory/RemoveIrrelevantGroupsTest.java b/src/test/java/hudson/plugins/active_directory/RemoveIrrelevantGroupsTest.java index 0cd93544..6fe2eaae 100644 --- a/src/test/java/hudson/plugins/active_directory/RemoveIrrelevantGroupsTest.java +++ b/src/test/java/hudson/plugins/active_directory/RemoveIrrelevantGroupsTest.java @@ -32,9 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.jvnet.hudson.test.JenkinsRule; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.modules.junit4.PowerMockRunner; import java.util.Arrays; import java.util.HashSet; @@ -42,15 +39,14 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.powermock.api.mockito.PowerMockito.when; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * Tests for the "Remove Irrelevant Groups" feature. * * @author Fredrik Persson <fredrik6.persson@sonymobile.com> */ -@RunWith(PowerMockRunner.class) -@PowerMockIgnore({"javax.crypto.*", "javax.xml.*", "com.sun.*", "org.xml.*"}) public class RemoveIrrelevantGroupsTest { @Rule @@ -76,7 +72,7 @@ private void setUpJenkinsUsedGroups(String... groups) { usedGroups.add(group); } - AuthorizationStrategy authorizationStrategy = PowerMockito.mock(AuthorizationStrategy.class); + AuthorizationStrategy authorizationStrategy = mock(AuthorizationStrategy.class); when(authorizationStrategy.getGroups()).thenReturn(usedGroups); jenkinsRule.getInstance().setAuthorizationStrategy(authorizationStrategy); }