You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/09/27 11:15:36 UTC
camel git commit: CAMEL-11845: Remove powermock from camel-docker
Repository: camel
Updated Branches:
refs/heads/master 0150745a9 -> f0376e360
CAMEL-11845: Remove powermock from camel-docker
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f0376e36
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f0376e36
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f0376e36
Branch: refs/heads/master
Commit: f0376e360ee02f86525bf4a673566ab4cf976180
Parents: 0150745
Author: James Netherton <ja...@gmail.com>
Authored: Wed Sep 27 11:26:39 2017 +0100
Committer: James Netherton <ja...@gmail.com>
Committed: Wed Sep 27 11:28:30 2017 +0100
----------------------------------------------------------------------
components/camel-docker/pom.xml | 35 ++------------------
.../consumer/DockerEventsConsumerTest.java | 6 ++--
.../consumer/DockerStatsConsumerTest.java | 6 ++--
.../docker/headers/BaseDockerHeaderTest.java | 7 ++--
4 files changed, 9 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f0376e36/components/camel-docker/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml
index f1c07e2..fb369e9 100644
--- a/components/camel-docker/pom.xml
+++ b/components/camel-docker/pom.xml
@@ -97,39 +97,10 @@
<artifactId>camel-test</artifactId>
<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>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</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 details-->
- <exclude>**/**.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/f0376e36/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
index 7490522..0c61c4a 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
@@ -30,14 +30,12 @@ import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.runners.MockitoJUnitRunner;
/**
* Consumer test for events on Docker Platform
*/
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.management.*", "javax.net.ssl.*"})
+@RunWith(MockitoJUnitRunner.class)
public class DockerEventsConsumerTest extends CamelTestSupport {
private String host = "localhost";
private Integer port = 2375;
http://git-wip-us.apache.org/repos/asf/camel/blob/f0376e36/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
index a06d75c..9e1961f 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
@@ -30,14 +30,12 @@ import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.runners.MockitoJUnitRunner;
/**
* Consumer test for statistics on Docker Platform
*/
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.management.*", "javax.net.ssl.*"})
+@RunWith(MockitoJUnitRunner.class)
public class DockerStatsConsumerTest extends CamelTestSupport {
private String host = "localhost";
private Integer port = 2375;
http://git-wip-us.apache.org/repos/asf/camel/blob/f0376e36/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
index 11655a9..f43d20e 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
@@ -32,12 +32,9 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.runners.MockitoJUnitRunner;
-
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.management.*", "javax.net.ssl.*"})
+@RunWith(MockitoJUnitRunner.class)
public abstract class BaseDockerHeaderTest<T> extends CamelTestSupport {
@Mock