summaryrefslogtreecommitdiffstats
path: root/holmes-actions/src/test/java
diff options
context:
space:
mode:
authorGuangrong Fu <fu.guangrong@zte.com.cn>2017-07-31 19:20:25 +0800
committerGuangrong Fu <fu.guangrong@zte.com.cn>2017-08-02 08:58:06 +0800
commit8b3c9e2b928e3a0308974482e2645ace4838c468 (patch)
tree4735ccb33920841fa22776df99cfcd821277b39d /holmes-actions/src/test/java
parentee93748a3535926dface4f2fa5c99f35fd9cf5d0 (diff)
Change the package name from openo to onap
Change the package name & maven from openo to onap Change-Id: I9c1fcaaa1c357fbd2b5c3bc2108d7cebd2b0ffc6 Issue-ID: HOLMES-10 Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'holmes-actions/src/test/java')
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/api/entity/AlarmsCorrelationTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/api/entity/AlarmsCorrelationTest.java)3
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/api/entity/CorrelationResultTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/api/entity/CorrelationResultTest.java)4
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/api/entity/CorrelationRuleTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/api/entity/CorrelationRuleTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/api/entity/ServiceNodeTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceNodeTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/api/entity/ServiceRegisterEntityTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceRegisterEntityTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/api/stat/AlarmTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/api/stat/AlarmTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/config/MQConfigTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/config/MQConfigTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/config/MicroServiceConfigTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/exception/CorrelationExceptionTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/exception/CorrelationExceptionTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/producer/MQProducerTest.java)8
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/DbDaoUtilTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/utils/DbDaoUtilTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/ExceptionUtilTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/utils/ExceptionUtilTest.java)6
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/JacksonUtilTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/utils/JacksonUtilTest.java)4
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/JudgeNullUtilTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/utils/JudgeNullUtilTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/utils/LanguageUtilTest.java)4
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/utils/MSBRegisterUtilTest.java)10
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/utils/UserUtilTest.java)2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/bean/TestBean.java (renamed from holmes-actions/src/test/java/org/openo/holmes/common/utils/bean/TestBean.java)2
-rw-r--r--holmes-actions/src/test/java/org/openo/holmes/common/utils/I18nProxyTest.java62
19 files changed, 29 insertions, 94 deletions
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/AlarmsCorrelationTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/AlarmsCorrelationTest.java
index 7dc1fab..dd940c4 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/AlarmsCorrelationTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/AlarmsCorrelationTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.api.entity;
+package org.onap.holmes.common.api.entity;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -23,7 +23,6 @@ import java.util.Date;
import org.junit.Test;
import org.junit.Before;
import org.junit.After;
-import sun.util.resources.cldr.ga.LocaleNames_ga;
public class AlarmsCorrelationTest {
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/CorrelationResultTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/CorrelationResultTest.java
index 14a52c0..1e30fab 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/CorrelationResultTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/CorrelationResultTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.api.entity;
+package org.onap.holmes.common.api.entity;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -23,7 +23,7 @@ import java.util.Date;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.openo.holmes.common.api.stat.Alarm;
+import org.onap.holmes.common.api.stat.Alarm;
public class CorrelationResultTest {
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/CorrelationRuleTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/CorrelationRuleTest.java
index 8b6268c..25ee5c6 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/CorrelationRuleTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/CorrelationRuleTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.api.entity;
+package org.onap.holmes.common.api.entity;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceNodeTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/ServiceNodeTest.java
index 383cb91..d1b800b 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceNodeTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/ServiceNodeTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.api.entity;
+package org.onap.holmes.common.api.entity;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceRegisterEntityTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/ServiceRegisterEntityTest.java
index 442549d..266c8bc 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceRegisterEntityTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/api/entity/ServiceRegisterEntityTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.api.entity;
+package org.onap.holmes.common.api.entity;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/api/stat/AlarmTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/api/stat/AlarmTest.java
index c42ee60..b0e3690 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/api/stat/AlarmTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/api/stat/AlarmTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.api.stat;
+package org.onap.holmes.common.api.stat;
import java.util.Date;
import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/config/MQConfigTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/config/MQConfigTest.java
index bb79c8a..cc9dced 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/config/MQConfigTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/config/MQConfigTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.config;
+package org.onap.holmes.common.config;
import org.junit.Test;
import org.junit.Before;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/config/MicroServiceConfigTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
index 7ec7fe6..33431ff 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/config/MicroServiceConfigTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.config;
+package org.onap.holmes.common.config;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/exception/CorrelationExceptionTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/exception/CorrelationExceptionTest.java
index bca63b2..d924533 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/exception/CorrelationExceptionTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/exception/CorrelationExceptionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.exception;
+package org.onap.holmes.common.exception;
import org.junit.Test;
import org.junit.Before;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/producer/MQProducerTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java
index 1390b77..7c561b0 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/producer/MQProducerTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.producer;
+package org.onap.holmes.common.producer;
import static org.easymock.EasyMock.anyBoolean;
import static org.easymock.EasyMock.anyInt;
@@ -34,9 +34,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.openo.holmes.common.api.entity.CorrelationResult;
-import org.openo.holmes.common.api.stat.Alarm;
-import org.openo.holmes.common.config.MQConfig;
+import org.onap.holmes.common.api.stat.Alarm;
+import org.onap.holmes.common.api.entity.CorrelationResult;
+import org.onap.holmes.common.config.MQConfig;
import org.powermock.api.easymock.PowerMock;
import org.powermock.modules.junit4.rule.PowerMockRule;
import org.powermock.reflect.Whitebox;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/DbDaoUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/DbDaoUtilTest.java
index 18c774e..e942eb4 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/DbDaoUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/DbDaoUtilTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.utils;
+package org.onap.holmes.common.utils;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/ExceptionUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/ExceptionUtilTest.java
index caa45e3..98cac63 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/ExceptionUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/ExceptionUtilTest.java
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.utils;
-
-import static org.openo.holmes.common.utils.ExceptionUtil.buildExceptionResponse;
+package org.onap.holmes.common.utils;
import org.junit.Test;
@@ -24,7 +22,7 @@ public class ExceptionUtilTest {
@Test
public void testBuildExceptionResponse() throws Exception {
- buildExceptionResponse("test");
+ ExceptionUtil.buildExceptionResponse("test");
}
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/JacksonUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JacksonUtilTest.java
index 22d628e..5f90c2d 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/JacksonUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JacksonUtilTest.java
@@ -15,13 +15,13 @@
*/
-package org.openo.holmes.common.utils;
+package org.onap.holmes.common.utils;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
import org.junit.Test;
-import org.openo.holmes.common.utils.bean.TestBean;
+import org.onap.holmes.common.utils.bean.TestBean;
public class JacksonUtilTest {
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/JudgeNullUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JudgeNullUtilTest.java
index a2a0542..5d38229 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/JudgeNullUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JudgeNullUtilTest.java
@@ -15,7 +15,7 @@
*/
-package org.openo.holmes.common.utils;
+package org.onap.holmes.common.utils;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/LanguageUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java
index d688a35..06759ec 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/LanguageUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java
@@ -15,7 +15,7 @@
*/
-package org.openo.holmes.common.utils;
+package org.onap.holmes.common.utils;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
-import org.openo.holmes.common.constant.AlarmConst;
+import org.onap.holmes.common.constant.AlarmConst;
import org.powermock.api.easymock.PowerMock;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/MSBRegisterUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java
index 5d04c1a..a38c26e 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/MSBRegisterUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.openo.holmes.common.utils;
+package org.onap.holmes.common.utils;
import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
import javax.ws.rs.QueryParam;
import org.easymock.EasyMock;
import org.junit.Rule;
import org.junit.Test;
-import org.openo.holmes.common.api.entity.ServiceRegisterEntity;
-import org.openo.holmes.common.config.MicroServiceConfig;
-import org.openo.holmes.common.msb.MicroserviceBusRest;
+import org.onap.holmes.common.msb.MicroserviceBusRest;
+import org.onap.holmes.common.api.entity.ServiceRegisterEntity;
+import org.onap.holmes.common.config.MicroServiceConfig;
import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.rule.PowerMockRule;
@@ -55,7 +55,7 @@ public class MSBRegisterUtilTest {
serviceRegisterEntity.setServiceName("holmes-rule-mgmt");
serviceRegisterEntity.setProtocol("REST");
serviceRegisterEntity.setVersion("v1");
- serviceRegisterEntity.setUrl("/openoapi/holmes-rule-mgmt/v1");
+ serviceRegisterEntity.setUrl("/onapapi/holmes-rule-mgmt/v1");
serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9101", 0);
serviceRegisterEntity.setVisualRange("1|0");
return serviceRegisterEntity;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/UserUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
index d81c919..d88525a 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/UserUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openo.holmes.common.utils;
+package org.onap.holmes.common.utils;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/bean/TestBean.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/bean/TestBean.java
index fab78c2..d8466d4 100644
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/bean/TestBean.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/bean/TestBean.java
@@ -15,7 +15,7 @@
*/
-package org.openo.holmes.common.utils.bean;
+package org.onap.holmes.common.utils.bean;
import java.io.Serializable;
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/I18nProxyTest.java b/holmes-actions/src/test/java/org/openo/holmes/common/utils/I18nProxyTest.java
deleted file mode 100644
index c3631ac..0000000
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/I18nProxyTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright 2016 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.openo.holmes.common.utils;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-import java.util.Locale;
-import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
-
-public class I18nProxyTest {
-
- private I18nProxy i18nProxy;
-
- @Before
- public void setUp() {
- i18nProxy = I18nProxy.getInstance();
- }
-
- @Test
- public void getValue_locale_and_key() {
- String result = i18nProxy.getValue(new Locale("zh"), "test");
- assertThat(result, equalTo(null));
- }
- @Test
- public void getValueByArgs(){
- String result = i18nProxy.getValueByArgs(new Locale("zh"), "test",new String[]{"1"});
- assertThat(result,equalTo(null));
- }
- @Test
- public void getValue_by_key(){
- Map<String,String> result = i18nProxy.getValue("test");
- assertThat(result, equalTo(null));
- }
- @Test
- public void jsonI18n(){
- String result = i18nProxy.jsonI18n("test");
- assertThat(result,equalTo(null));
- }
- @Test
- public void i18nWithArgs(){
- String result = i18nProxy.i18nWithArgs("test",new String[]{});
- assertThat(result,equalTo("null"));
- }
-} \ No newline at end of file