1 files changed, 67 insertions, 58 deletions
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);
+	}
+}
+