Merge "improved coverage of module "

7 files changed, 71 insertions, 32 deletions

diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/ObjectFactoryTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/ObjectFactoryTest.java
index 5e3f79add6..c3949a6a79 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/ObjectFactoryTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/ObjectFactoryTest.java
@@ -20,6 +20,11 @@
 
 package org.openecomp.mso.adapters.sdnc;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
@@ -74,14 +79,14 @@ public class ObjectFactoryTest {
             fail ();
         }
         String marshalled = writer.toString ();
-        assert(marshalled.contains ("<RequestId>reqid</RequestId>"));
+        assertThat(marshalled, containsString("<RequestId>reqid</RequestId>"));
         
         InputStream inputStream = new ByteArrayInputStream(marshalled.getBytes(Charset.forName("UTF-8")));
         try {
             RequestHeader res2 = (RequestHeader) jaxbUnmarshaller.unmarshal (inputStream);
-            assert(res2.getCallbackUrl ().equals ("callback"));
-            assert(res2.getMsoAction ().equals ("action"));
-            assert(res2.getSvcOperation ().equals ("op"));
+            assertEquals("callback", res2.getCallbackUrl ());
+            assertEquals("action", res2.getMsoAction ());
+            assertEquals("op", res2.getSvcOperation ());
         } catch (JAXBException e) {
             e.printStackTrace();
             fail();
@@ -95,6 +100,14 @@ public class ObjectFactoryTest {
     public final void testCreateSDNCAdapterResponse () {
         ObjectFactory of = new ObjectFactory ();
         SDNCAdapterResponse ar = of.createSDNCAdapterResponse ();
-        assert (ar != null);
+        assertNotNull(ar);
     }
+    
+    @Test
+    public final void testCreateSDNCAdapterRequest () {
+        ObjectFactory of = new ObjectFactory ();
+        SDNCAdapterRequest ar = of.createSDNCAdapterRequest ();
+        assertNotNull(ar);
+    }
+    
 }
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/SDNCAdapterRequestTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/SDNCAdapterRequestTest.java
index fa96b7983e..b9d88406f9 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/SDNCAdapterRequestTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/SDNCAdapterRequestTest.java
@@ -21,6 +21,9 @@
 
 package org.openecomp.mso.adapters.sdnc;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openecomp.mso.adapters.sdnc.SDNCAdapterRequest;
@@ -46,9 +49,9 @@ public class SDNCAdapterRequestTest {
 	public final void testtoString(){
 		((SDNCAdapterRequest) sd).setRequestData("data");
 		((SDNCAdapterRequest) sd).setRequestHeader(rh);
-        assert (((SDNCAdapterRequest) sd).getRequestData()!= null) ;
-		assert(((SDNCAdapterRequest) sd).getRequestData().equals("data"));
-		assert(((SDNCAdapterRequest) sd).getRequestHeader().equals(rh));		
+        assertNotNull(((SDNCAdapterRequest) sd).getRequestData()) ;
+        assertEquals("data", ((SDNCAdapterRequest) sd).getRequestData());
+        assertEquals(rh, ((SDNCAdapterRequest) sd).getRequestHeader());
 	}
 
 }
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/client/CallbackHeaderTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/client/CallbackHeaderTest.java
index 88d2b950b9..39518e2081 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/client/CallbackHeaderTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/client/CallbackHeaderTest.java
@@ -20,8 +20,10 @@
 
 package org.openecomp.mso.adapters.sdnc.client;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import org.junit.Test;
-import org.openecomp.mso.adapters.sdnc.client.CallbackHeader;
 
 public class CallbackHeaderTest {
 
@@ -32,16 +34,16 @@ public class CallbackHeaderTest {
         cb.setRequestId("413658f4-7f42-482e-b834-23a5c15657da-1474471336781");
         cb.setResponseCode("200");
         cb.setResponseMessage("OK");
-        assert (cb.getRequestId() != null);
-        assert (cb.getResponseCode() != null);
-        assert (cb.getResponseMessage() != null);
-        assert (cb.getRequestId().equals("413658f4-7f42-482e-b834-23a5c15657da-1474471336781"));
-        assert (cb.getResponseCode().equals("200"));
-        assert (cb.getResponseMessage().equals("OK"));
+        assertNotNull(cb.getRequestId());
+        assertNotNull(cb.getResponseCode());
+        assertNotNull(cb.getResponseMessage());
+        assertEquals("413658f4-7f42-482e-b834-23a5c15657da-1474471336781", cb.getRequestId());
+        assertEquals("200", cb.getResponseCode());
+        assertEquals("OK", cb.getResponseMessage());
     }
 
     @Test
     public void testtoString() {
-        assert (cb.toString() != null);
+        assertNotNull(cb.toString());
     }
 }
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/client/SDNCAdapterCallbackRequestTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/client/SDNCAdapterCallbackRequestTest.java
index 63aa49cf54..ecffd1c5ad 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/client/SDNCAdapterCallbackRequestTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/client/SDNCAdapterCallbackRequestTest.java
@@ -21,6 +21,9 @@
 
 package org.openecomp.mso.adapters.sdnc.client;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import org.junit.Test;
 import org.openecomp.mso.adapters.sdnc.client.CallbackHeader;
 import org.openecomp.mso.adapters.sdnc.client.SDNCAdapterCallbackRequest;
@@ -35,17 +38,18 @@ public class SDNCAdapterCallbackRequestTest {
    {
        sdc.setCallbackHeader(ch);
        sdc.setRequestData("data");
-       assert(sdc.getCallbackHeader()!=null);
-       assert(sdc.getRequestData()!=null);
-       assert(sdc.getCallbackHeader().equals(ch));
-       assert(sdc.getRequestData().equals("data"));
+       assertNotNull(sdc.getCallbackHeader());
+       assertNotNull(sdc.getRequestData());
+       assertEquals(ch, sdc.getCallbackHeader());
+       assertEquals("data", sdc.getRequestData());
 
    }
    
    @Test
    public void testtoString()
    {
-       assert(ch.toString()!=null);
+       assertNotNull(ch.toString());
+       assertNotNull(sdc.toString());
    }
    
 }
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/RequestTunablesTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/RequestTunablesTest.java
index 17ba0d22f8..72b11708e6 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/RequestTunablesTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/RequestTunablesTest.java
@@ -20,6 +20,8 @@
 
 package org.openecomp.mso.adapters.sdnc.impl;
 
+import static org.junit.Assert.*;
+
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
@@ -54,18 +56,31 @@ public class RequestTunablesTest {
     @Test
     public final void testRequestTunables () {
         RequestTunables rt = new RequestTunables (null, null, "op", null,msoPropertiesFactory);
-        assert(rt.getReqId ().length ()==0);
+        assertEquals(0, rt.getReqId ().length ());
         rt = new RequestTunables ("reqId", "msoAction", null, "query",msoPropertiesFactory);
         rt.setTunables ();
         System.out.println(rt.toString ());
       //  assert (rt.getReqMethod ().equals ("toto"));
-        assert (rt.getTimeout () != null);
-        assert (rt.getAction ().equals ("query"));
-        assert (rt.getMsoAction ().equals ("msoAction"));
-        assert (rt.getHeaderName ().equals ("sdnc-request-header"));
-        assert (rt.getOperation ().length () == 0);
-        assert (rt.getAsyncInd ().equals ("N"));
-        assert (rt.getReqId ().equals ("reqId"));
+        assertNotNull(rt.getTimeout ());
+        assertEquals("query", rt.getAction ());
+        assertEquals("msoAction", rt.getMsoAction ());
+        assertEquals("sdnc-request-header", rt.getHeaderName ());
+        assertEquals(0, rt.getOperation ().length ());
+        assertEquals("N", rt.getAsyncInd ());
+        assertEquals("reqId", rt.getReqId ());
+    }
+    
+    @Test
+    public final void testRequestTunablesSet() {
+    	RequestTunables rt = new RequestTunables("reqId", "gammainternet", "service-configuration-operation", "changeactivate", msoPropertiesFactory);
+    	 rt.setTunables ();
+    	 assertNotNull(rt.getTimeout ());
+         assertEquals("changeactivate", rt.getAction ());
+         assertEquals("gammainternet", rt.getMsoAction ());
+         assertEquals("sdnc-request-header", rt.getHeaderName ());
+         assertEquals("service-configuration-operation", rt.getOperation ());
+         assertEquals("N", rt.getAsyncInd ());
+         assertEquals("reqId", rt.getReqId ());
     }
 
 }
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/SDNCResponseTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/SDNCResponseTest.java
index f8867ae4f8..f9c885f0eb 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/SDNCResponseTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/SDNCResponseTest.java
@@ -43,7 +43,7 @@ public class SDNCResponseTest {
    @Test
    public void testtoString()
    {
-       assert(sdncresponse.toString()!=null);
+       assertNotNull(sdncresponse.toString());
    }
 }
    
\ No newline at end of file
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/util/SDNCRequestIdUtilTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/util/SDNCRequestIdUtilTest.java
index 275c2acd14..77d22e44df 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/util/SDNCRequestIdUtilTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/util/SDNCRequestIdUtilTest.java
@@ -20,6 +20,8 @@
 
 package org.openecomp.mso.adapters.sdnc.util;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.UUID;
 import org.junit.Test;
 
@@ -35,8 +37,8 @@ public class SDNCRequestIdUtilTest {
     	String postfixedRequestId = originalRequestId + "-1466203712068";
     	String postfixedRequestId2 = originalRequestId + "-1466203712068-2";
 
-        assert(SDNCRequestIdUtil.getSDNCOriginalRequestId(postfixedRequestId).equals(originalRequestId));
-        assert(SDNCRequestIdUtil.getSDNCOriginalRequestId(postfixedRequestId2).equals(postfixedRequestId2));
+        assertEquals(originalRequestId, SDNCRequestIdUtil.getSDNCOriginalRequestId(postfixedRequestId));
+        assertEquals(postfixedRequestId2, SDNCRequestIdUtil.getSDNCOriginalRequestId(postfixedRequestId2));
        
     }