Migrate from DW to Springboot

[holmes/rule-management.git] / rulemgt / src / test / java / org / onap / holmes / rulemgt / db / CorrelationRuleQueryServiceTest.java

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryServiceTest.java
similarity index 72%
rename from rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
rename to rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryServiceTest.java
index 0e97e3a..a2bd863 100644 (file)
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryServiceTest.java
@@ -17,6 +17,10 @@
 package org.onap.holmes.rulemgt.db;\r
 \r
 import org.easymock.EasyMock;\r
+import org.jdbi.v3.core.Handle;\r
+import org.jdbi.v3.core.Jdbi;\r
+import org.jdbi.v3.core.result.ResultIterable;\r
+import org.jdbi.v3.core.statement.Query;\r
 import org.junit.Before;\r
 import org.junit.Rule;\r
 import org.junit.Test;\r
@@ -24,14 +28,11 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;\r
 import org.onap.holmes.common.api.entity.CorrelationRule;\r
 import org.onap.holmes.common.exception.CorrelationException;\r
-import org.onap.holmes.common.utils.DbDaoUtil;\r
 import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;\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.reflect.Whitebox;\r
-import org.skife.jdbi.v2.Handle;\r
-import org.skife.jdbi.v2.Query;\r
 \r
 import java.util.*;\r
 \r
@@ -39,30 +40,28 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;\r
 \r
 @RunWith(PowerMockRunner.class)\r
-@PrepareForTest({DbDaoUtil.class, Handle.class, Query.class})\r
-public class CorrelationRuleQueryDaoTest {\r
+@PrepareForTest({Handle.class, Query.class})\r
+public class CorrelationRuleQueryServiceTest {\r
 \r
     @Rule\r
     public ExpectedException thrown = ExpectedException.none();\r
-\r
-    private DbDaoUtil dbDaoUtil;\r
-\r
     private Handle handle;\r
-\r
     private Query query;\r
-\r
-    private CorrelationRuleQueryDao correlationRuleQueryDao;\r
+    private ResultIterable resultIterable;\r
+    private CorrelationRuleQueryService correlationRuleQueryDao;\r
     private RuleQueryCondition ruleQueryCondition;\r
+    private Jdbi jdbi;\r
 \r
     @Before\r
     public void setUp() throws Exception {\r
-        correlationRuleQueryDao = new CorrelationRuleQueryDao();\r
+        correlationRuleQueryDao = new CorrelationRuleQueryService();\r
 \r
-        dbDaoUtil = PowerMock.createMock(DbDaoUtil.class);\r
+        jdbi = PowerMock.createMock(Jdbi.class);\r
         handle = PowerMock.createMock(Handle.class);\r
         query = PowerMock.createMock(Query.class);\r
+        resultIterable = PowerMock.createMock(ResultIterable.class);\r
 \r
-        Whitebox.setInternalState(correlationRuleQueryDao, "dbDaoUtil", dbDaoUtil);\r
+        Whitebox.setInternalState(correlationRuleQueryDao, "jdbi", jdbi);\r
 \r
         ruleQueryCondition = createRuleQueryCondition();\r
     }\r
@@ -74,10 +73,10 @@ public class CorrelationRuleQueryDaoTest {
         thrown.expect(CorrelationException.class);\r
         thrown.expectMessage("Failed to query the rule.");\r
 \r
-        EasyMock.expect(dbDaoUtil.getHandle()).andReturn(handle);\r
+        EasyMock.expect(jdbi.open()).andReturn(handle);\r
         EasyMock.expect(handle.createQuery(EasyMock.anyObject(String.class))).andReturn(query);\r
-        EasyMock.expect(query.list()).andThrow(new RuntimeException()).anyTimes();\r
-        dbDaoUtil.close(handle);\r
+        EasyMock.expect(query.mapToMap()).andThrow(new RuntimeException()).anyTimes();\r
+        handle.close();\r
         EasyMock.expectLastCall();\r
 \r
         PowerMock.replayAll();\r
@@ -89,10 +88,11 @@ public class CorrelationRuleQueryDaoTest {
 \r
     @Test\r
     public void getCorrelationRulesByCondition_normal() throws Exception {\r
-        EasyMock.expect(dbDaoUtil.getHandle()).andReturn(handle);\r
+        EasyMock.expect(jdbi.open()).andReturn(handle);\r
         EasyMock.expect(handle.createQuery(EasyMock.anyObject(String.class))).andReturn(query);\r
-        EasyMock.expect(query.list()).andReturn(createQueryResult()).anyTimes();\r
-        dbDaoUtil.close(handle);\r
+        EasyMock.expect(query.mapToMap()).andReturn(resultIterable);\r
+        EasyMock.expect(resultIterable.list()).andReturn(createQueryResult());\r
+        handle.close();\r
         EasyMock.expectLastCall();\r
 \r
         PowerMock.replayAll();\r
@@ -108,10 +108,11 @@ public class CorrelationRuleQueryDaoTest {
         thrown.expect(CorrelationException.class);\r
         thrown.expectMessage("An error occurred while building the query SQL.");\r
 \r
-        EasyMock.expect(dbDaoUtil.getHandle()).andReturn(handle);\r
+        EasyMock.expect(jdbi.open()).andReturn(handle);\r
         EasyMock.expect(handle.createQuery(EasyMock.anyObject(String.class))).andReturn(query);\r
-        EasyMock.expect(query.list()).andReturn(createQueryResult()).anyTimes();\r
-        dbDaoUtil.close(handle);\r
+        EasyMock.expect(query.mapToMap()).andReturn(resultIterable);\r
+        EasyMock.expect(resultIterable.list()).andReturn(createQueryResult());\r
+        handle.close();\r
         EasyMock.expectLastCall();\r
 \r
         PowerMock.replayAll();\r
@@ -128,16 +129,16 @@ public class CorrelationRuleQueryDaoTest {
         value.put("rid", "rule_" + System.currentTimeMillis());\r
         value.put("description", "desc");\r
         value.put("enable", 0);\r
-        value.put("templateID", 1L);\r
-        value.put("engineId", "engine-001");\r
-        value.put("engineType", "engineType-001");\r
+        value.put("templateid", 1L);\r
+        value.put("engineid", "engine-001");\r
+        value.put("enginetype", "engineType-001");\r
         value.put("creator", "admin");\r
-        value.put("createTime", new Date());\r
+        value.put("createtime", new Date());\r
         value.put("updator", "admin");\r
-        value.put("updateTime", new Date());\r
+        value.put("updatetime", new Date());\r
         value.put("params", new Properties());\r
         value.put("domain", "Domain");\r
-        value.put("isManual", 0);\r
+        value.put("ismanual", 0);\r
         value.put("vendor", "Vendor");\r
         value.put("content", "Contents");\r
         value.put("package", "package");\r