Change the groupid from openo to onap

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

diff --git a/rulemgt/src/test/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
similarity index 89%
rename from rulemgt/src/test/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
rename to rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
index f241484..3854cdc 100644 (file)
--- a/rulemgt/src/test/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.openo.holmes.rulemgt.db;\r
+package org.onap.holmes.rulemgt.db;\r
 \r
 import static org.hamcrest.MatcherAssert.assertThat;\r
 import static org.hamcrest.Matchers.is;\r
@@ -30,11 +30,10 @@ import org.junit.Before;
 import org.junit.Rule;\r
 import org.junit.Test;\r
 import org.junit.rules.ExpectedException;\r
-import org.openo.holmes.common.api.entity.CorrelationRule;\r
-import org.openo.holmes.common.exception.CorrelationException;\r
-import org.openo.holmes.common.utils.DbDaoUtil;\r
-import org.openo.holmes.common.utils.I18nProxy;\r
-import org.openo.holmes.rulemgt.bean.request.RuleQueryCondition;\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.modules.junit4.rule.PowerMockRule;\r
 import org.powermock.reflect.Whitebox;\r
@@ -76,7 +75,7 @@ public class CorrelationRuleQueryDaoTest {
     public void getCorrelationRulesByCondition_db_exception() throws Exception {\r
 \r
         thrown.expect(CorrelationException.class);\r
-        thrown.expectMessage(I18nProxy.RULE_MANAGEMENT_QUERY_RULE_FAILED);\r
+        thrown.expectMessage("Failed to query the rule.");\r
 \r
         EasyMock.expect(dbDaoUtil.getHandle()).andReturn(handle);\r
         EasyMock.expect(handle.createQuery(EasyMock.anyObject(String.class))).andReturn(query);\r
@@ -110,7 +109,7 @@ public class CorrelationRuleQueryDaoTest {
     @Test\r
     public void getCorrelationRulesByCondition_get_where_sql_exception() throws Exception {\r
         thrown.expect(CorrelationException.class);\r
-        thrown.expectMessage(I18nProxy.RULE_MANAGEMENT_CREATE_QUERY_SQL_FAILED);\r
+        thrown.expectMessage("An error occurred while building the query SQL.");\r
 \r
         EasyMock.expect(dbDaoUtil.getHandle()).andReturn(handle);\r
         EasyMock.expect(handle.createQuery(EasyMock.anyObject(String.class))).andReturn(query);\r