aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay VK <vv770d@att.com>2018-02-21 23:16:22 +0000
committerVENKATESH KUMAR <vv770d@att.com>2018-02-21 18:17:05 -0500
commit8ead72e4a6b7b92e370d89fa2590ea21c2764428 (patch)
treedb4e2aa95eca860c1efdb945e134286370995beb
parentbdf15f5602b0c2592fc960affab464cd6c6d3904 (diff)
additional coverage
Change-Id: Ibaf0bef19e447162233217b0aa44c04cbe550dce Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-227
-rw-r--r--src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java (renamed from src/test/java/org/onap/dcae/vestest/EventTransformTest.java)28
-rw-r--r--src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java125
-rw-r--r--src/test/resources/testDmaapConfig_gen2.json24
3 files changed, 118 insertions, 59 deletions
diff --git a/src/test/java/org/onap/dcae/vestest/EventTransformTest.java b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
index 96e965cf..6e89ead5 100644
--- a/src/test/java/org/onap/dcae/vestest/EventTransformTest.java
+++ b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
@@ -32,7 +32,7 @@ import org.onap.dcae.commonFunction.ConfigProcessors;
-public class EventTransformTest {
+public class TestConfigProcessor {
public JSONObject getFileAsJsonObject()
{
JSONObject jsonObject = null;
@@ -177,5 +177,31 @@ public class EventTransformTest {
System.out.println("responseData==" + responseData);
assertEquals ("1980.0", responseData);
}
+
+ @Test
+ public void testAttrGet(){
+
+ Boolean Flag= true;
+ final JSONObject jsonObject = getFileAsJsonObject();
+ System.out.println("event==" + jsonObject.toString());
+ final JSONObject jsonArgs = new JSONObject ( "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}" );
+ ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);
+ cpEvent.getValue(jsonArgs);
+ assertEquals (true, Flag);
+ }
+
+ @Test
+ public void testAttrSet(){
+ Boolean Flag= true;
+ final JSONObject jsonObject = getFileAsJsonObject();
+ System.out.println("event==" + jsonObject.toString());
+ final JSONObject jsonArgs = new JSONObject ( "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}" );
+ ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);
+ cpEvent.setValue(jsonArgs);
+
+ assertEquals (true, Flag);
+ }
+
+
}
diff --git a/src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java b/src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java
index 2a7a205e..0fa02190 100644
--- a/src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java
+++ b/src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java
@@ -1,58 +1,67 @@
-/*-
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-package org.onap.dcae.vestest;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.onap.dcae.commonFunction.DmaapPropertyReader;
-
-public class TestDmaapPropertyReader {
-
- DmaapPropertyReader dr;
- String testinput = "src/test/resources/testDmaapConfig_ip.json";
- Boolean flag = false;
-
- @Before
- public void setUp() throws Exception {
-
- // process command line arguments
-
- dr = new DmaapPropertyReader(testinput);
-
- }
-
- @After
- public void tearDown() throws Exception {
-
- }
-
- @Test
- public void testDmaapPropertyReader() {
-
- Boolean test = true;
- flag = !dr.dmaap_hash.isEmpty();
- Assert.assertEquals(test, flag);
- }
-
-}
-
+/*-
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcae.vestest;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.onap.dcae.commonFunction.DmaapPropertyReader;
+
+public class TestDmaapPropertyReader {
+
+ DmaapPropertyReader dr;
+
+ Boolean flag = false;
+
+ @Before
+ public void setUp() throws Exception {
+
+ // process command line arguments
+
+
+
+ }
+
+ @After
+ public void tearDown() throws Exception {
+
+ }
+
+ @Test
+ public void testDmaapPropertyReader() {
+ String testinput = "src/test/resources/testDmaapConfig_ip.json";
+ dr = new DmaapPropertyReader(testinput);
+ Boolean test = true;
+ flag = !dr.dmaap_hash.isEmpty();
+ Assert.assertEquals(test, flag);
+ }
+
+ @Test
+ public void testDmaapPropertyReaderNewConfig() {
+ String testinput = "src/test/resources/testDmaapConfig_gen2.json";
+ dr = new DmaapPropertyReader(testinput);
+ Boolean test = true;
+ flag = !dr.dmaap_hash.isEmpty();
+ Assert.assertEquals(test, flag);
+ }
+}
+
diff --git a/src/test/resources/testDmaapConfig_gen2.json b/src/test/resources/testDmaapConfig_gen2.json
new file mode 100644
index 00000000..d8097bf1
--- /dev/null
+++ b/src/test/resources/testDmaapConfig_gen2.json
@@ -0,0 +1,24 @@
+{
+ "ves-fault-secondary": {
+ "aaf_username": null,
+ "dmaap_info": {
+ "topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV",
+ "location": "mtl5",
+ "client_id": null,
+ "client_role": null
+ },
+ "type": "message_router",
+ "aaf_password": null
+ },
+ "ves-thresholdCrossingAlert-secondary": {
+ "aaf_username": null,
+ "dmaap_info": {
+ "topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV",
+ "location": "mtl5",
+ "client_id": null,
+ "client_role": null
+ },
+ "type": "message_router",
+ "aaf_password": null
+ }
+ } \ No newline at end of file