Merge pull request apache#817 from beckhampu/dev

remove powermock
xuse · May 9, 2018 · d64fa6c · d64fa6c
2 parents c4aeaec + 761e73c
commit d64fa6c
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 80 deletions.
diff --git a/pom.xml b/pom.xml
@@ -52,8 +52,7 @@
         <guava-retrying.version>2.0.0</guava-retrying.version>
         <quartz.version>2.3.0</quartz.version>
         <opentracing.version>0.30.0</opentracing.version>
-        <powermock.version>1.7.1</powermock.version>
-
+
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
@@ -310,18 +309,6 @@
                 <version>${spring-boot.version}</version>
                 <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-mockito2</artifactId>
-                <version>${powermock.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>io.opentracing</groupId>
                 <artifactId>opentracing-mock</artifactId>

diff --git a/sharding-opentracing/pom.xml b/sharding-opentracing/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <artifactId>sharding-opentracing</artifactId>
     <name>${project.artifactId}</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>io.shardingjdbc</groupId>
@@ -34,12 +34,12 @@
             <artifactId>opentracing-mock</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/ExecuteEventListenerTest.java b/sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/ExecuteEventListenerTest.java
@@ -39,8 +39,8 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public final class ExecuteEventListenerTest {
 

diff --git a/sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/ShardingJDBCTracerTest.java b/sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/ShardingJDBCTracerTest.java
@@ -21,62 +21,60 @@
 import io.opentracing.Tracer;
 import io.opentracing.util.GlobalTracer;
 import io.shardingjdbc.core.exception.ShardingJdbcException;
-import io.shardingjdbc.opentracing.config.OpentracingConfigurationParser;
 import io.shardingjdbc.opentracing.fixture.FooTracer;
-import org.hamcrest.core.Is;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.lang.reflect.Field;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.hamcrest.core.Is.isA;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(OpentracingConfigurationParser.class)
 public final class ShardingJDBCTracerTest {
-
-    @Before
-    public void setUp() throws Exception {
-        mockStatic(System.class);
-        clearGlobalTracer();
-    }
-
-    @Test
-    public void assertDuplicatedLoading() {
-        ShardingJDBCTracer.init(mock(Tracer.class));
-        Tracer t1 = ShardingJDBCTracer.get();
-        ShardingJDBCTracer.init();
-        assertEquals(t1, ShardingJDBCTracer.get());
-        ShardingJDBCTracer.init(mock(Tracer.class));
-        assertEquals(t1, ShardingJDBCTracer.get());
-    }
-
-    @Test
-    public void assertTracer() {
-        when(System.getProperty("shardingjdbc.opentracing.tracer.class")).thenReturn(FooTracer.class.getName());
-        assertThat((GlobalTracer) ShardingJDBCTracer.get(), Is.isA(GlobalTracer.class));
-        assertTrue(GlobalTracer.isRegistered());
-        assertThat(ShardingJDBCTracer.get(), Is.is(ShardingJDBCTracer.get()));
-    }
-
-    @Test(expected = ShardingJdbcException.class)
-    public void assertTracerClassError() {
-        when(System.getProperty("shardingjdbc.opentracing.tracer.class")).thenReturn("com.foo.FooTracer");
-        ShardingJDBCTracer.get();
-
-    }
-
-    private static void clearGlobalTracer() throws NoSuchFieldException, IllegalAccessException {
-        Field tracerField = GlobalTracer.class.getDeclaredField("tracer");
-        tracerField.setAccessible(true);
-        tracerField.set(GlobalTracer.class, NoopTracerFactory.create());
-    }
+
+	@Before
+	public void setUp() throws Exception {
+		System.setProperty("shardingjdbc.opentracing.tracer.class", FooTracer.class.getName());
+		clearGlobalTracer();
+	}
+
+	@After
+	public void tearDown() {
+		System.getProperties().remove("shardingjdbc.opentracing.tracer.class");
+	}
+
+	@Test
+	public void assertDuplicatedLoading() {
+		ShardingJDBCTracer.init(mock(Tracer.class));
+		Tracer t1 = ShardingJDBCTracer.get();
+		ShardingJDBCTracer.init();
+		assertEquals(t1, ShardingJDBCTracer.get());
+		ShardingJDBCTracer.init(mock(Tracer.class));
+		assertEquals(t1, ShardingJDBCTracer.get());
+	}
+
+	@Test
+	public void assertTracer() {
+		assertThat((GlobalTracer) ShardingJDBCTracer.get(), isA(GlobalTracer.class));
+		assertTrue(GlobalTracer.isRegistered());
+		assertThat(ShardingJDBCTracer.get(), is(ShardingJDBCTracer.get()));
+	}
+
+	@Test(expected = ShardingJdbcException.class)
+	public void assertTracerClassError() {
+		System.setProperty("shardingjdbc.opentracing.tracer.class", "com.foo.FooTracer");
+		ShardingJDBCTracer.get();
+
+	}
+
+	private static void clearGlobalTracer() throws NoSuchFieldException, IllegalAccessException {
+		Field tracerField = GlobalTracer.class.getDeclaredField("tracer");
+		tracerField.setAccessible(true);
+		tracerField.set(GlobalTracer.class, NoopTracerFactory.create());
+	}
 }
diff --git a/...opentracing/src/test/java/io/shardingjdbc/opentracing/config/ConfigurationLoaderTest.java b/...opentracing/src/test/java/io/shardingjdbc/opentracing/config/ConfigurationLoaderTest.java
@@ -18,29 +18,27 @@
 package io.shardingjdbc.opentracing.config;
 
 import io.shardingjdbc.opentracing.fixture.FooTracer;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.when;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(OpentracingConfigurationParser.class)
 public final class ConfigurationLoaderTest {
 
     @Before
     public void setUp() {
-        mockStatic(System.class);
+        System.setProperty("shardingjdbc.opentracing.tracer.class",FooTracer.class.getName());
+    }
+
+    @After
+    public void tearDown() {
+        System.getProperties().remove("shardingjdbc.opentracing.tracer.class");
     }
 
     @Test
     public void assertLoadConfigFromProperty() {
-        when(System.getProperty("shardingjdbc.opentracing.tracer.class")).thenReturn(FooTracer.class.getName());
         assertThat(new ConfigurationLoader().getTracerClassName(), is(FooTracer.class.getName()));
     }