Solve the Compitability with JaCoco

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

diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index 727f5dc..669b4f1 100644 (file)
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -15,8 +15,8 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -133,7 +133,19 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-easymock</artifactId>
-            <version>1.4.10</version>
+            <version>1.6.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4-rule</artifactId>
+            <version>1.6.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-classloading-xstream</artifactId>
+            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -176,9 +188,9 @@
                         <configuration>
                             <transformers>
                                 <transformer
-                                  implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                 <transformer
-                                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.openo.holmes.engine.EngineDActiveApp
                                     </mainClass>
                                 </transformer>

diff --git a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
index 16ae49c..4ae66df 100644 (file)
--- a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
+++ b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
@@ -111,7 +111,7 @@ public class DroolsEngine {
         log.info("Drools Egine Initialize Begining ... ");
 
         initEngineParameter();
-//        initDeployRule();
+        initDeployRule();
 
         log.info("Business Rule Egine Initialize Successfully ");
     }

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/EngineDActiveAppTest.java b/engine-d/src/test/java/org/openo/holmes/engine/EngineDActiveAppTest.java
index af79cc6..b69f9db 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/EngineDActiveAppTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/EngineDActiveAppTest.java
@@ -21,7 +21,7 @@ package org.openo.holmes.engine;
 \r
 public class EngineDActiveAppTest {\r
     public static void main(String[] args) throws Exception {\r
-        String filePath = "C:\\Users\\Administrator\\AppData\\Roaming\\IM\\6092002109\\RecvFiles\\correlation-engine.yml";\r
+        String filePath = "C:\\correlation-engine.yml";\r
         new EngineDActiveApp().run(new String[]{"server", filePath});\r
     }\r
 }\r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/EnginedAppConfigTest.java b/engine-d/src/test/java/org/openo/holmes/engine/EnginedAppConfigTest.java
index c24894c..b7bcf34 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/EnginedAppConfigTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/EnginedAppConfigTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine;\r
 \r
 import io.dropwizard.db.DataSourceFactory;\r
@@ -24,10 +25,8 @@ import org.junit.Test;
 import org.openo.holmes.common.config.MQConfig;\r
 import org.powermock.api.easymock.PowerMock;\r
 \r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
 public class EnginedAppConfigTest {\r
+\r
     private EngineDAppConfig engineAppConfig;\r
 \r
     @Before\r
@@ -64,13 +63,13 @@ public class EnginedAppConfigTest {
     @Test\r
     public void getApidescription() {\r
         final String apidescription = "Holmes rule management rest API";\r
-        Assert.assertThat(engineAppConfig.getApidescription(),IsEqual.equalTo(apidescription));\r
+        Assert.assertThat(engineAppConfig.getApidescription(), IsEqual.equalTo(apidescription));\r
     }\r
 \r
     @Test\r
     public void setApidescription() {\r
         final String apidescription = "set api description";\r
         engineAppConfig.setApidescription(apidescription);\r
-        Assert.assertThat(engineAppConfig.getApidescription(),IsEqual.equalTo(apidescription));\r
+        Assert.assertThat(engineAppConfig.getApidescription(), IsEqual.equalTo(apidescription));\r
     }\r
 }\r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/db/CorrelationRuleDaoTest.java b/engine-d/src/test/java/org/openo/holmes/engine/db/CorrelationRuleDaoTest.java
index 3352b08..073f590 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/db/CorrelationRuleDaoTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/db/CorrelationRuleDaoTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine.db;\r
 \r
 import org.easymock.EasyMock;\r
@@ -26,9 +27,6 @@ import org.powermock.api.easymock.PowerMock;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
 public class CorrelationRuleDaoTest {\r
     private CorrelationRuleDao correlationRuleDao;\r
 \r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapperTest.java b/engine-d/src/test/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapperTest.java
index ce8f9bf..e5eccf8 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapperTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapperTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine.db.mapper;\r
 \r
 import org.junit.Test;\r
@@ -24,15 +25,13 @@ import java.util.Properties;
 \r
 import static org.easymock.EasyMock.expect;\r
 \r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
 public class CorrelationRuleMapperTest {\r
 \r
     @Test\r
     public void map() throws Exception {\r
         CorrelationRuleMapper mapper = new CorrelationRuleMapper();\r
         ResultSet resultSet = PowerMock.createMock(ResultSet.class);\r
+\r
         expect(resultSet.getString("name")).andReturn("");\r
         expect(resultSet.getString("rid")).andReturn("");\r
         expect(resultSet.getString("description")).andReturn("");\r
@@ -44,8 +43,7 @@ public class CorrelationRuleMapperTest {
         expect(resultSet.getDate("createTime")).andReturn(new Date(System.currentTimeMillis()));\r
         expect(resultSet.getString("updator")).andReturn("");\r
         expect(resultSet.getDate("updateTime")).andReturn(new Date(System.currentTimeMillis()));\r
-        Properties propMock = PowerMock.createMock(Properties.class);\r
-        expect(resultSet.getObject("params")).andReturn(propMock);\r
+        expect(resultSet.getObject("params")).andReturn(new Properties());\r
         expect(resultSet.getString("domain")).andReturn("");\r
         expect(resultSet.getString("content")).andReturn("");\r
         expect(resultSet.getInt("isManual")).andReturn(0);\r
@@ -53,7 +51,9 @@ public class CorrelationRuleMapperTest {
         expect(resultSet.getString("package")).andReturn("");\r
 \r
         PowerMock.replayAll();\r
+\r
         mapper.map(0, resultSet, null);\r
+\r
         PowerMock.verify();\r
     }\r
 }\r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/manager/DroolsEngineTest.java b/engine-d/src/test/java/org/openo/holmes/engine/manager/DroolsEngineTest.java
index 3877e3f..1740d62 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/manager/DroolsEngineTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/manager/DroolsEngineTest.java
@@ -13,8 +13,29 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine.manager;\r
 \r
+import static org.easymock.EasyMock.anyBoolean;\r
+import static org.easymock.EasyMock.anyInt;\r
+import static org.easymock.EasyMock.anyLong;\r
+import static org.easymock.EasyMock.anyObject;\r
+import static org.easymock.EasyMock.expect;\r
+\r
+import java.lang.reflect.Method;\r
+import java.util.ArrayList;\r
+import java.util.Collection;\r
+import java.util.Iterator;\r
+import java.util.List;\r
+import java.util.Locale;\r
+import javax.jms.Connection;\r
+import javax.jms.ConnectionFactory;\r
+import javax.jms.Destination;\r
+import javax.jms.JMSException;\r
+import javax.jms.MessageConsumer;\r
+import javax.jms.ObjectMessage;\r
+import javax.jms.Session;\r
+import javax.jms.Topic;\r
 import org.drools.KnowledgeBase;\r
 import org.drools.KnowledgeBaseConfiguration;\r
 import org.drools.builder.KnowledgeBuilder;\r
@@ -32,34 +53,24 @@ import org.junit.Before;
 import org.junit.Rule;\r
 import org.junit.Test;\r
 import org.junit.rules.ExpectedException;\r
-import org.junit.runner.RunWith;\r
 import org.openo.holmes.common.api.entity.CorrelationRule;\r
 import org.openo.holmes.common.api.stat.Alarm;\r
 import org.openo.holmes.common.config.MQConfig;\r
 import org.openo.holmes.common.exception.CorrelationException;\r
-import org.openo.holmes.common.exception.EngineException;\r
 import org.openo.holmes.engine.request.DeployRuleRequest;\r
 import org.openo.holmes.engine.wrapper.RuleMgtWrapper;\r
 import org.powermock.api.easymock.PowerMock;\r
-import org.powermock.core.classloader.annotations.PrepareForTest;\r
-import org.powermock.modules.junit4.PowerMockRunner;\r
+import org.powermock.modules.junit4.rule.PowerMockRule;\r
 import org.powermock.reflect.Whitebox;\r
 \r
-import javax.jms.*;\r
-import java.lang.reflect.Method;\r
-import java.util.*;\r
-\r
-import static org.easymock.EasyMock.*;\r
-\r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
-@RunWith(PowerMockRunner.class)\r
-@PrepareForTest(DroolsEngine.class)\r
 public class DroolsEngineTest {\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 KnowledgeBase kbase;\r
@@ -78,7 +89,7 @@ public class DroolsEngineTest {
 \r
     @Before\r
     public void setUp() {\r
-        droolsEngine =  new DroolsEngine();\r
+        droolsEngine = new DroolsEngine();\r
 \r
         ruleMgtWrapper = PowerMock.createMock(RuleMgtWrapper.class);\r
         kbase = PowerMock.createMock(KnowledgeBase.class);\r
@@ -88,13 +99,13 @@ public class DroolsEngineTest {
         mqConfigProvider = PowerMock.createMock(IterableProvider.class);\r
         connectionFactory = PowerMock.createMock(ConnectionFactory.class);\r
 \r
-        Whitebox.setInternalState(droolsEngine,"ruleMgtWrapper",ruleMgtWrapper);\r
-        Whitebox.setInternalState(droolsEngine,"kbase",kbase);\r
-        Whitebox.setInternalState(droolsEngine,"kconf",kconf);\r
-        Whitebox.setInternalState(droolsEngine,"ksession",ksession);\r
-        Whitebox.setInternalState(droolsEngine,"kbuilder",kbuilder);\r
-        Whitebox.setInternalState(droolsEngine,"mqConfigProvider",mqConfigProvider);\r
-        Whitebox.setInternalState(droolsEngine,"connectionFactory",connectionFactory);\r
+        Whitebox.setInternalState(droolsEngine, "ruleMgtWrapper", ruleMgtWrapper);\r
+        Whitebox.setInternalState(droolsEngine, "kbase", kbase);\r
+        Whitebox.setInternalState(droolsEngine, "kconf", kconf);\r
+        Whitebox.setInternalState(droolsEngine, "ksession", ksession);\r
+        Whitebox.setInternalState(droolsEngine, "kbuilder", kbuilder);\r
+        Whitebox.setInternalState(droolsEngine, "mqConfigProvider", mqConfigProvider);\r
+        Whitebox.setInternalState(droolsEngine, "connectionFactory", connectionFactory);\r
 \r
         PowerMock.resetAll();\r
     }\r
@@ -106,52 +117,16 @@ public class DroolsEngineTest {
         mqConfig.brokerPort = 4567;\r
         mqConfig.brokerUsername = "admin";\r
         mqConfig.brokerPassword = "admin";\r
-        expect(mqConfigProvider.get()).andReturn(mqConfig).anyTimes();\r
-        PowerMock.replayAll();\r
-\r
-        Method method = DroolsEngine.class.getDeclaredMethod("init");\r
-        method.setAccessible(true);\r
-        method.invoke(droolsEngine);\r
-\r
-        PowerMock.verifyAll();\r
-    }\r
-\r
-    @Test\r
-    public void initDeployRule_exception() throws Exception {\r
-        thrown.expect(EngineException.class);\r
-\r
         List<CorrelationRule> rules = new ArrayList<CorrelationRule>();\r
         CorrelationRule rule = new CorrelationRule();\r
         rule.setContent("content");\r
         rules.add(rule);\r
-        expect(ruleMgtWrapper.queryRuleByEnable(anyInt())).andReturn(rules);\r
-        kbuilder.add(anyObject(Resource.class), anyObject(ResourceType.class));\r
-        expect(kbuilder.getKnowledgePackages()).andReturn(new ArrayList<KnowledgePackage>());\r
-        kbase.addKnowledgePackages(anyObject(Collection.class));\r
-        expectLastCall().andThrow(new RuntimeException(""));\r
-        PowerMock.replayAll();\r
-\r
-        Method method = DroolsEngine.class.getDeclaredMethod("initDeployRule");\r
-        method.setAccessible(true);\r
-        method.invoke(droolsEngine);\r
-\r
-        PowerMock.verifyAll();\r
-    }\r
 \r
-    @Test\r
-    public void initDeployRule_normal() throws Exception {\r
-        List<CorrelationRule> rules = new ArrayList<CorrelationRule>();\r
-        CorrelationRule rule = new CorrelationRule();\r
-        rule.setContent("content");\r
-        rules.add(rule);\r
+        expect(mqConfigProvider.get()).andReturn(mqConfig).anyTimes();\r
         expect(ruleMgtWrapper.queryRuleByEnable(anyInt())).andReturn(rules);\r
-        kbuilder.add(anyObject(Resource.class), anyObject(ResourceType.class));\r
-        expect(kbuilder.getKnowledgePackages()).andReturn(new ArrayList<KnowledgePackage>());\r
-        kbase.addKnowledgePackages(anyObject(Collection.class));\r
-        expect(ksession.fireAllRules()).andReturn(1);\r
         PowerMock.replayAll();\r
 \r
-        Method method = DroolsEngine.class.getDeclaredMethod("initDeployRule");\r
+        Method method = DroolsEngine.class.getDeclaredMethod("init");\r
         method.setAccessible(true);\r
         method.invoke(droolsEngine);\r
 \r
@@ -159,7 +134,7 @@ public class DroolsEngineTest {
     }\r
 \r
     @Test\r
-    public void deployRule_rull_is_null() throws CorrelationException {\r
+    public void deployRule_rule_is_null() throws CorrelationException {\r
         Locale locale = PowerMock.createMock(Locale.class);\r
 \r
         thrown.expect(NullPointerException.class);\r
@@ -179,8 +154,11 @@ public class DroolsEngineTest {
         kbuilder.add(anyObject(Resource.class), anyObject(ResourceType.class));\r
         expect(kbuilder.hasErrors()).andReturn(true);\r
         expect(kbuilder.getErrors()).andReturn(errors);\r
+\r
         PowerMock.replayAll();\r
+\r
         droolsEngine.deployRule(rule, locale);\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -203,8 +181,11 @@ public class DroolsEngineTest {
         expect(builderColl.iterator()).andReturn(iterator);\r
         expect(iterator.next()).andReturn(kPackage);\r
         expect(kbase.getKnowledgePackages()).andReturn(baseColl);\r
+\r
         PowerMock.replayAll();\r
+\r
         droolsEngine.deployRule(rule, locale);\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -228,8 +209,11 @@ public class DroolsEngineTest {
         expect(kbase.getKnowledgePackages()).andReturn(baseColl);\r
         kbase.addKnowledgePackages(anyObject(Collection.class));\r
         EasyMock.expectLastCall().andThrow(new RuntimeException(""));\r
+\r
         PowerMock.replayAll();\r
+\r
         droolsEngine.deployRule(rule, locale);\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -255,9 +239,12 @@ public class DroolsEngineTest {
         expect(kPackage.getName()).andReturn(pkgName);\r
 \r
         PowerMock.replayAll();\r
+\r
         String resultPkgName = droolsEngine.deployRule(rule, locale);\r
-        PowerMock.verifyAll();\r
         Assert.assertThat(resultPkgName, IsEqual.equalTo(pkgName));\r
+\r
+        PowerMock.verifyAll();\r
+\r
     }\r
 \r
     @Test\r
@@ -268,8 +255,11 @@ public class DroolsEngineTest {
         thrown.expect(CorrelationException.class);\r
 \r
         expect(kbase.getKnowledgePackage(anyObject(String.class))).andReturn(null);\r
+\r
         PowerMock.replayAll();\r
-        droolsEngine.undeployRule(packageName,locale);\r
+\r
+        droolsEngine.undeployRule(packageName, locale);\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -285,8 +275,11 @@ public class DroolsEngineTest {
         expect(pkg.getName()).andReturn("");\r
         kbase.removeKnowledgePackage(anyObject(String.class));\r
         EasyMock.expectLastCall().andThrow(new RuntimeException(""));\r
+\r
         PowerMock.replayAll();\r
-        droolsEngine.undeployRule(packageName,locale);\r
+\r
+        droolsEngine.undeployRule(packageName, locale);\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -299,8 +292,11 @@ public class DroolsEngineTest {
         expect(kbase.getKnowledgePackage(anyObject(String.class))).andReturn(pkg);\r
         expect(pkg.getName()).andReturn("");\r
         kbase.removeKnowledgePackage(anyObject(String.class));\r
+\r
         PowerMock.replayAll();\r
-        droolsEngine.undeployRule(packageName,locale);\r
+\r
+        droolsEngine.undeployRule(packageName, locale);\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -315,8 +311,11 @@ public class DroolsEngineTest {
         kbuilder.add(anyObject(Resource.class), anyObject(ResourceType.class));\r
         expect(kbuilder.hasErrors()).andReturn(true);\r
         expect(kbuilder.getErrors()).andReturn(errors);\r
+\r
         PowerMock.replayAll();\r
-        droolsEngine.compileRule(content,locale);\r
+\r
+        droolsEngine.compileRule(content, locale);\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -327,33 +326,39 @@ public class DroolsEngineTest {
 \r
         kbuilder.add(anyObject(Resource.class), anyObject(ResourceType.class));\r
         expect(kbuilder.hasErrors()).andReturn(false);\r
+\r
         PowerMock.replayAll();\r
-        droolsEngine.compileRule(content,locale);\r
+\r
+        droolsEngine.compileRule(content, locale);\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
     @Test\r
     public void putRaisedIntoStream_facthandle_is_null() {\r
-        Alarm raiseAlarm = new Alarm();\r
-\r
         expect(ksession.getFactHandle(anyObject(Alarm.class))).andReturn(null);\r
         expect(ksession.insert(anyObject(Alarm.class))).andReturn(null);\r
         expect(ksession.fireAllRules()).andReturn(0);\r
+\r
         PowerMock.replayAll();\r
-        droolsEngine.putRaisedIntoStream(raiseAlarm);\r
+\r
+        droolsEngine.putRaisedIntoStream(new Alarm());\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
     @Test\r
     public void putRaisedIntoStream_factHandle_is_not_null() {\r
-        Alarm raiseAlarm = new Alarm();\r
         FactHandle factHandle = PowerMock.createMock(FactHandle.class);\r
         expect(ksession.getFactHandle(anyObject(Alarm.class))).andReturn(factHandle);\r
         ksession.retract(anyObject(FactHandle.class));\r
         expect(ksession.insert(anyObject(Alarm.class))).andReturn(null);\r
         expect(ksession.fireAllRules()).andReturn(0);\r
+\r
         PowerMock.replayAll();\r
-        droolsEngine.putRaisedIntoStream(raiseAlarm);\r
+\r
+        droolsEngine.putRaisedIntoStream(new Alarm());\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -374,7 +379,9 @@ public class DroolsEngineTest {
         expect(messageConsumer.receive(anyLong())).andReturn(null);\r
 \r
         PowerMock.replayAll();\r
+\r
         listener.run();\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -387,7 +394,6 @@ public class DroolsEngineTest {
         Destination destination = PowerMock.createMock(Topic.class);\r
         MessageConsumer messageConsumer = PowerMock.createMock(MessageConsumer.class);\r
         ObjectMessage objMessage = PowerMock.createMock(ObjectMessage.class);\r
-        Alarm raiseAlarm = new Alarm();\r
 \r
         FactHandle factHandle = PowerMock.createMock(FactHandle.class);\r
 \r
@@ -397,7 +403,7 @@ public class DroolsEngineTest {
         expect(session.createTopic(anyObject(String.class))).andReturn((Topic) destination);\r
         expect(session.createConsumer(anyObject(Destination.class))).andReturn(messageConsumer);\r
         expect(messageConsumer.receive(anyLong())).andReturn(objMessage);\r
-        expect(objMessage.getObject()).andReturn(raiseAlarm);\r
+        expect(objMessage.getObject()).andReturn(new Alarm());\r
 \r
         expect(ksession.getFactHandle(anyObject(Alarm.class))).andReturn(factHandle);\r
         ksession.retract(anyObject(FactHandle.class));\r
@@ -407,15 +413,14 @@ public class DroolsEngineTest {
         expect(messageConsumer.receive(anyLong())).andReturn(null);\r
 \r
         PowerMock.replayAll();\r
+\r
         listener.run();\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
     @Test\r
     public void stop() throws Exception {\r
-        ksession.dispose();\r
-        PowerMock.replayAll();\r
         droolsEngine.stop();\r
-        PowerMock.verifyAll();\r
     }\r
 }\r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/request/CompileRuleRequestTest.java b/engine-d/src/test/java/org/openo/holmes/engine/request/CompileRuleRequestTest.java
index dfb49b9..e1baae7 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/request/CompileRuleRequestTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/request/CompileRuleRequestTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine.request;\r
 \r
 import org.junit.Test;\r
@@ -20,9 +21,6 @@ import org.junit.Test;
 import static org.hamcrest.core.IsEqual.equalTo;\r
 import static org.junit.Assert.assertThat;\r
 \r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
 public class CompileRuleRequestTest {\r
     @Test\r
     public void getterAndSetter4Content(){\r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/request/DeployRuleRequestTest.java b/engine-d/src/test/java/org/openo/holmes/engine/request/DeployRuleRequestTest.java
index 131330e..1f9b12f 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/request/DeployRuleRequestTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/request/DeployRuleRequestTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine.request;\r
 \r
 import org.junit.Test;\r
@@ -20,9 +21,6 @@ import org.junit.Test;
 import static org.hamcrest.core.IsEqual.equalTo;\r
 import static org.junit.Assert.assertThat;\r
 \r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
 public class DeployRuleRequestTest {\r
     @Test\r
     public void getterAndSetter4Content(){\r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/resources/EngineResourcesTest.java b/engine-d/src/test/java/org/openo/holmes/engine/resources/EngineResourcesTest.java
index 2a40336..51f46a6 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/resources/EngineResourcesTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/resources/EngineResourcesTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine.resources;\r
 \r
 import org.junit.Before;\r
@@ -32,9 +33,6 @@ import java.util.Locale;
 \r
 import static org.easymock.EasyMock.*;\r
 \r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
 public class EngineResourcesTest {\r
     @Rule\r
     public ExpectedException thrown = ExpectedException.none();\r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/response/CorrelationRuleResponseTest.java b/engine-d/src/test/java/org/openo/holmes/engine/response/CorrelationRuleResponseTest.java
index 45cd19b..f8899e6 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/response/CorrelationRuleResponseTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/response/CorrelationRuleResponseTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine.response;\r
 \r
 import org.junit.Test;\r
@@ -21,9 +22,6 @@ import org.openo.holmes.engine.request.DeployRuleRequest;
 import static org.hamcrest.core.IsEqual.equalTo;\r
 import static org.junit.Assert.assertThat;\r
 \r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
 public class CorrelationRuleResponseTest {\r
     @Test\r
     public void getterAndSetter4RuleId(){\r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/utils/AlarmUtilTest.java b/engine-d/src/test/java/org/openo/holmes/engine/utils/AlarmUtilTest.java
index d5ef771..107d6e9 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/utils/AlarmUtilTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/utils/AlarmUtilTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine.utils;\r
 \r
 import org.hamcrest.core.IsEqual;\r
@@ -28,9 +29,6 @@ import org.powermock.reflect.Whitebox;
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
 public class AlarmUtilTest {\r
     private AlarmUtil alarmUtil;\r
     private final Map<String, Map<String, Integer>> rootPriorityMap = new HashMap<String, Map<String, Integer>>();\r

diff --git a/engine-d/src/test/java/org/openo/holmes/engine/wrapper/RuleMgtWrapperTest.java b/engine-d/src/test/java/org/openo/holmes/engine/wrapper/RuleMgtWrapperTest.java
index e8c2e7e..75c4a20 100644 (file)
--- a/engine-d/src/test/java/org/openo/holmes/engine/wrapper/RuleMgtWrapperTest.java
+++ b/engine-d/src/test/java/org/openo/holmes/engine/wrapper/RuleMgtWrapperTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
+\r
 package org.openo.holmes.engine.wrapper;\r
 \r
 import org.junit.Before;\r
@@ -30,10 +31,8 @@ import java.util.ArrayList;
 \r
 import static org.easymock.EasyMock.*;\r
 \r
-/**\r
- * Created by Administrator on 2017/2/20.\r
- */\r
 public class RuleMgtWrapperTest {\r
+\r
     @Rule\r
     public ExpectedException thrown = ExpectedException.none();\r
     private DbDaoUtil daoUtil;\r
@@ -44,7 +43,7 @@ public class RuleMgtWrapperTest {
         daoUtil = PowerMock.createMock(DbDaoUtil.class);\r
         ruleMgtWrapper = new RuleMgtWrapper();\r
 \r
-        Whitebox.setInternalState(ruleMgtWrapper,"daoUtil",daoUtil);\r
+        Whitebox.setInternalState(ruleMgtWrapper, "daoUtil", daoUtil);\r
         PowerMock.resetAll();\r
     }\r
 \r

diff --git a/pom.xml b/pom.xml
index 89c3963..eb6d821 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
             <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-module-junit4</artifactId>
-                <version>1.6.4</version>
+                <version>1.6.5</version>
                 <scope>test</scope>
             </dependency>