additional coverage

Change-Id: Ibaf0bef19e447162233217b0aa44c04cbe550dce
Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
Issue-ID: DCAEGEN2-227

diff --git a/src/test/java/org/onap/dcae/vestest/EventTransformTest.java b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
similarity index 90%
rename from src/test/java/org/onap/dcae/vestest/EventTransformTest.java
rename to src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
index 96e965c..6e89ead 100644 (file)
--- 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 2a7a205..0fa0219 100644 (file)
--- 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);
-       }
-
-}
-
+/*-\r
+ * ============LICENSE_START=======================================================\r
+ * PROJECT\r
+ * ================================================================================\r
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.\r
+ * ================================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ * \r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ * \r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END=========================================================\r
+ */\r
+package org.onap.dcae.vestest;\r
+\r
+import org.junit.After;\r
+import org.junit.Assert;\r
+import org.junit.Before;\r
+import org.junit.Test;\r
+\r
+import org.onap.dcae.commonFunction.DmaapPropertyReader;\r
+\r
+public class TestDmaapPropertyReader {\r
+\r
+       DmaapPropertyReader dr;\r
+\r
+       Boolean flag = false;\r
+\r
+       @Before\r
+       public void setUp() throws Exception {\r
+\r
+               // process command line arguments\r
+\r
+               \r
+\r
+       }\r
+\r
+       @After\r
+       public void tearDown() throws Exception {\r
+\r
+       }\r
+\r
+       @Test\r
+       public void testDmaapPropertyReader() {\r
+               String testinput = "src/test/resources/testDmaapConfig_ip.json";\r
+               dr = new DmaapPropertyReader(testinput);\r
+               Boolean test = true;\r
+               flag = !dr.dmaap_hash.isEmpty();\r
+               Assert.assertEquals(test, flag);\r
+       }\r
+\r
+       @Test\r
+       public void testDmaapPropertyReaderNewConfig() {\r
+               String testinput = "src/test/resources/testDmaapConfig_gen2.json";\r
+               dr = new DmaapPropertyReader(testinput);\r
+               Boolean test = true;\r
+               flag = !dr.dmaap_hash.isEmpty();\r
+               Assert.assertEquals(test, flag);\r
+       }\r
+}\r
+\r

diff --git a/src/test/resources/testDmaapConfig_gen2.json b/src/test/resources/testDmaapConfig_gen2.json
new file mode 100644 (file)
index 0000000..d8097bf
--- /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