Repository: camel Updated Branches: refs/heads/master e7e47a81e -> a7a97bfe7
CAMEL-11845: Migrated camel-bonita from powermock to mockito Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a7a97bfe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a7a97bfe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a7a97bfe Branch: refs/heads/master Commit: a7a97bfe7b8c98387e1fa8da798c52500d604c3f Parents: e7e47a8 Author: aldettinger <aldettin...@gmail.com> Authored: Wed Sep 27 23:43:45 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Sep 28 08:57:41 2017 +0200 ---------------------------------------------------------------------- components/camel-azure/pom.xml | 1 - components/camel-bonita/pom.xml | 32 ++------------------ .../BonitaAuthFilterAlreadyConnectedTest.java | 5 ++- .../api/BonitaAuthFilterConnectionTest.java | 7 ++--- .../bonita/api/BonitaAuthFilterTest.java | 7 ++--- .../util/BonitaAPIUtilPrepareInputsTest.java | 6 ++-- parent/pom.xml | 1 - 7 files changed, 10 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a7a97bfe/components/camel-azure/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-azure/pom.xml b/components/camel-azure/pom.xml index bb4da12..ef0fa0b 100644 --- a/components/camel-azure/pom.xml +++ b/components/camel-azure/pom.xml @@ -34,7 +34,6 @@ <properties> <azure-storage-java-sdk-version>5.0.0</azure-storage-java-sdk-version> - <powermock-easymock-version>1.6.6</powermock-easymock-version> <camel.osgi.export.pkg>org.apache.camel.component.azure.*</camel.osgi.export.pkg> <camel.osgi.export.service> </camel.osgi.export.service> http://git-wip-us.apache.org/repos/asf/camel/blob/a7a97bfe/components/camel-bonita/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml index 9927082..bcf5de4 100644 --- a/components/camel-bonita/pom.xml +++ b/components/camel-bonita/pom.xml @@ -63,15 +63,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>${powermock-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>${powermock-version}</version> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> @@ -97,25 +90,4 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>jdk9-build</id> - <activation> - <jdk>9</jdk> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <!-- TODO: See https://github.com/powermock/powermock/issues/783 for more information. --> - <exclude>**/**.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/a7a97bfe/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java index 7188ec0..73822f2 100644 --- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java +++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java @@ -27,12 +27,10 @@ import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter; import org.apache.camel.component.bonita.api.util.BonitaAPIConfig; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.powermock.modules.junit4.PowerMockRunner; +import org.mockito.MockitoAnnotations; -@RunWith(PowerMockRunner.class) public class BonitaAuthFilterAlreadyConnectedTest { @Mock @@ -40,6 +38,7 @@ public class BonitaAuthFilterAlreadyConnectedTest { @Before public void setup() { + MockitoAnnotations.initMocks(this); Map<String, Cookie> resultCookies = new HashMap<>(); resultCookies.put("JSESSIONID", new Cookie("JSESSIONID", "something")); Mockito.when(requestContext.getCookies()).thenReturn(resultCookies); http://git-wip-us.apache.org/repos/asf/camel/blob/a7a97bfe/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java index 9f4ced8..c311aaf 100644 --- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java +++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java @@ -29,11 +29,9 @@ import org.apache.camel.component.bonita.api.util.BonitaAPIConfig; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.modules.junit4.PowerMockRunner; +import org.mockito.MockitoAnnotations; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.post; @@ -42,8 +40,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.junit.Assert.assertEquals; -@RunWith(PowerMockRunner.class) -@PowerMockIgnore({"javax.net.ssl.*", "javax.management.*"}) public class BonitaAuthFilterConnectionTest { @Rule @@ -54,6 +50,7 @@ public class BonitaAuthFilterConnectionTest { @Before public void setup() { + MockitoAnnotations.initMocks(this); Mockito.when(requestContext.getCookies()).thenReturn(new HashMap<String, Cookie>()); Mockito.when(requestContext.getHeaders()).thenReturn(new MultivaluedHashMap()); } http://git-wip-us.apache.org/repos/asf/camel/blob/a7a97bfe/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java index 2d33d07..d2135e8 100644 --- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java +++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java @@ -27,14 +27,10 @@ import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter; import org.apache.camel.component.bonita.api.util.BonitaAPIConfig; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.modules.junit4.PowerMockRunner; +import org.mockito.MockitoAnnotations; -@RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.management.*") public class BonitaAuthFilterTest { @Mock @@ -42,6 +38,7 @@ public class BonitaAuthFilterTest { @Before public void setup() { + MockitoAnnotations.initMocks(this); Map<String, Cookie> resultCookies = new HashMap<>(); Mockito.when(requestContext.getCookies()).thenReturn(resultCookies); http://git-wip-us.apache.org/repos/asf/camel/blob/a7a97bfe/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java index 5c6fae6..b08acc7 100644 --- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java +++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java @@ -30,14 +30,11 @@ import org.junit.runner.RunWith; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; +import org.mockito.MockitoAnnotations; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@RunWith(PowerMockRunner.class) -@PrepareForTest(BonitaAPIUtil.class) public class BonitaAPIUtilPrepareInputsTest { @Mock @@ -47,6 +44,7 @@ public class BonitaAPIUtilPrepareInputsTest { @Before public void setup() { + MockitoAnnotations.initMocks(this); bonitaApiUtil = BonitaAPIUtil .getInstance(new BonitaAPIConfig("hostname", "port", "username", "password")); Mockito.when(processDefinition.getName()).thenReturn("processName"); http://git-wip-us.apache.org/repos/asf/camel/blob/a7a97bfe/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9b30560..35b0514 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -557,7 +557,6 @@ <pax-logging-version>1.8.6</pax-logging-version> <pdfbox-version>1.8.13</pdfbox-version> <pgjdbc-ng-driver-version>0.7.1</pgjdbc-ng-driver-version> - <powermock-version>1.6.6</powermock-version> <protobuf-version>3.3.0</protobuf-version> <protobuf-guava-version>20.0</protobuf-guava-version> <protobuf-maven-plugin-version>0.5.0</protobuf-maven-plugin-version>
