Fix sonar issues in dmaap-dbcpi

[dmaap/dbcapi.git] / src / test / java / org / onap / dmaap / dbcapi / model / DmaapTest.java

diff --git a/src/test/java/org/onap/dmaap/dbcapi/model/DmaapTest.java b/src/test/java/org/onap/dmaap/dbcapi/model/DmaapTest.java
index fb83fe9..cb0c22f 100644 (file)
--- a/src/test/java/org/onap/dmaap/dbcapi/model/DmaapTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/model/DmaapTest.java
@@ -19,17 +19,14 @@
  */
 package org.onap.dmaap.dbcapi.model;
 
-import static org.junit.Assert.*;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
 public class DmaapTest {
-       String ver, tnr, dn, dpu, lu, bat, nk, ako; 
+       private String ver, tnr, dn, dpu, lu, bat, nk, ako;
 
        @Before
        public void setUp() throws Exception {
@@ -51,7 +48,7 @@ public class DmaapTest {
        @Test
        public void testDmaapClassDefaultConstructor() {
 
-               Dmaap t = new Dmaap();
+               Dmaap t = new Dmaap.DmaapBuilder().createDmaap();
        
                assertTrue( t.getVersion() == null  );
                assertTrue( t.getTopicNsRoot() == null  );
@@ -67,7 +64,7 @@ public class DmaapTest {
        @Test
        public void testDmaapClassConstructor() {
 
-               Dmaap t = new Dmaap( ver, tnr, dn, dpu, lu, bat, nk, ako );
+               Dmaap t = new Dmaap.DmaapBuilder().setVer(ver).setTnr(tnr).setDn(dn).setDpu(dpu).setLu(lu).setBat(bat).setNk(nk).setAko(ako).createDmaap();
        
                assertTrue( ver.equals( t.getVersion() ));
                assertTrue( tnr.equals( t.getTopicNsRoot() ));
@@ -83,7 +80,7 @@ public class DmaapTest {
        @Test
        public void testDmaapClassSetters() {
 
-               Dmaap t = new Dmaap();
+               Dmaap t = new Dmaap.DmaapBuilder().createDmaap();
 
                t.setVersion( ver );
                assertTrue( ver.equals( t.getVersion() ));