Use the powerMockRule

Change-Id: Ia106d9f3b5e1d19e9fc41332088fbd0550a29c1c
Issue-ID: HOLMES-47
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/pom.xml b/pom.xml
index a699c30..1a0b116 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
         <pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir>\r
         <excludesFile>**/*$*</excludesFile>\r
         <nexusproxy>https://nexus.open-o.org/content</nexusproxy>\r
+        <powermock.version>1.6.5</powermock.version>\r
 \r
 \r
         <stringtemplate.version>3.2.1</stringtemplate.version>\r

diff --git a/rulemgt/pom.xml b/rulemgt/pom.xml
index 2de04ae..7159332 100644 (file)
--- a/rulemgt/pom.xml
+++ b/rulemgt/pom.xml
@@ -73,13 +73,25 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.4.10</version>
+            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-easymock</artifactId>
-            <version>1.4.10</version>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4-rule</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-classloading-xstream</artifactId>
+            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/rulemgt/src/test/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java b/rulemgt/src/test/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
index 2e7cc1c..e0331de 100644 (file)
--- a/rulemgt/src/test/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
+++ b/rulemgt/src/test/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
@@ -39,18 +39,20 @@ import org.openo.holmes.rulemgt.bean.request.RuleQueryCondition;
 import org.powermock.api.easymock.PowerMock;\r
 import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;\r
 import org.powermock.modules.junit4.PowerMockRunner;\r
+import org.powermock.modules.junit4.rule.PowerMockRule;\r
 import org.powermock.reflect.Whitebox;\r
 import org.skife.jdbi.v2.Handle;\r
 import org.skife.jdbi.v2.Query;\r
 \r
 \r
-@RunWith(PowerMockRunner.class)\r
-@SuppressStaticInitializationFor("org.openo.holmes.common.utils.DbDaoUtil")\r
 public class CorrelationRuleQueryDaoTest {\r
 \r
     @Rule\r
     public ExpectedException thrown = ExpectedException.none();\r
 \r
+    @Rule\r
+    public PowerMockRule powerMockRule = new PowerMockRule();\r
+\r
     private DbDaoUtil dbDaoUtil;\r
 \r
     private Handle handle;\r
@@ -75,7 +77,7 @@ public class CorrelationRuleQueryDaoTest {
 \r
 \r
 \r
-    @Test\r
+\r
     public void getCorrelationRulesByCondition_db_exception() throws Exception {\r
 \r
         thrown.expect(CorrelationException.class);\r
@@ -94,7 +96,7 @@ public class CorrelationRuleQueryDaoTest {
         PowerMock.verifyAll();\r
     }\r
 \r
-    @Test\r
+    \r
     public void getCorrelationRulesByCondition_normal() throws Exception {\r
         EasyMock.expect(dbDaoUtil.getHandle()).andReturn(handle);\r
         EasyMock.expect(handle.createQuery(EasyMock.anyObject(String.class))).andReturn(query);\r

diff --git a/rulemgt/src/test/java/org/openo/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java b/rulemgt/src/test/java/org/openo/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
index 1cb63cd..db13d17 100644 (file)
--- a/rulemgt/src/test/java/org/openo/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
+++ b/rulemgt/src/test/java/org/openo/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
@@ -47,15 +47,17 @@ import org.openo.holmes.rulemgt.db.CorrelationRuleQueryDao;
 import org.powermock.api.easymock.PowerMock;\r
 import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;\r
 import org.powermock.modules.junit4.PowerMockRunner;\r
+import org.powermock.modules.junit4.rule.PowerMockRule;\r
 import org.powermock.reflect.Whitebox;\r
 \r
-@RunWith(PowerMockRunner.class)\r
-@SuppressStaticInitializationFor("org.openo.holmes.common.utils.DbDaoUtil")\r
 public class RuleMgtWrapperTest {\r
 \r
     @Rule\r
     public ExpectedException thrown = ExpectedException.none();\r
 \r
+    @Rule\r
+    public PowerMockRule powerMockRule = new PowerMockRule();\r
+\r
     private RuleMgtWrapper ruleMgtWrapper;\r
 \r
     private EngineWrapper engineWrapperMock;\r