Improve code coverage for aaf cadi modules

Issue-ID: AAF-79
Change-Id: Id98e2fd4a7756916ed6346bf9bead481e7f42180
Signed-off-by: sg481n <sg481n@att.com>

3 files changed, 369 insertions, 1 deletions

diff --git a/aaf/src/test/java/com/onap/aaf/cadi/aaf/JU_CertExceptionTest.java b/aaf/src/test/java/com/onap/aaf/cadi/aaf/JU_CertExceptionTest.java
new file mode 100644
index 0000000..5b61d59
--- /dev/null
+++ b/aaf/src/test/java/com/onap/aaf/cadi/aaf/JU_CertExceptionTest.java
@@ -0,0 +1,237 @@
+/*******************************************************************************

+ * ============LICENSE_START====================================================

+ * * org.onap.aaf

+ * * ===========================================================================

+ * * Copyright © 2017 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====================================================

+ * *

+ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

+ * *

+ ******************************************************************************/

+package com.onap.aaf.cadi.aaf;

+

+import static org.junit.Assert.*;

+

+import org.junit.Before;

+import org.junit.Test;

+import org.onap.aaf.cadi.cm.CertException;

+

+public class JU_CertExceptionTest {

+

+	@Before

+	public void setUp() throws Exception {

+	}

+

+	@Test

+	public void test() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+	@Test

+	public void test3() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+	

+	@Test

+	public void test1() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+	

+	@Test

+	public void test2() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+	@Test

+	public void test4() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+	@Test

+	public void test5() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+	@Test

+	public void test6() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+	@Test

+	public void test7() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+

+	@Test

+	public void test8() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+	@Test

+	public void test9() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+	@Test

+	public void test10() {

+		CertException ex = new CertException();

+		assertNotNull(ex);

+		

+		ex = new CertException("Exception Message");

+		assertNotNull(ex);

+		assertEquals(ex.getMessage(),"Exception Message");

+		

+		ex = new CertException(new Throwable());

+		assertNotNull(ex);

+		assertNotNull(ex.getCause());

+		

+		ex = new CertException("Exception Message1", new Throwable());

+		assertNotNull(ex.getCause());

+		assertEquals(ex.getMessage(),"Exception Message1");

+	}

+

+}
\ No newline at end of file
diff --git a/aaf/src/test/java/org/onap/aaf/cadi/aaf/client/JU_ErrMessageTest.java b/aaf/src/test/java/org/onap/aaf/cadi/aaf/client/JU_ErrMessageTest.java
new file mode 100644
index 0000000..46fe3d4
--- /dev/null
+++ b/aaf/src/test/java/org/onap/aaf/cadi/aaf/client/JU_ErrMessageTest.java
@@ -0,0 +1,131 @@
+/*******************************************************************************

+ * ============LICENSE_START====================================================

+ * * org.onap.aaf

+ * * ===========================================================================

+ * * Copyright © 2017 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====================================================

+ * *

+ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

+ * *

+ ******************************************************************************/

+package org.onap.aaf.cadi.aaf.client;

+

+import static org.junit.Assert.*;

+import static org.mockito.Mockito.when;

+

+import java.io.PrintStream;

+

+import org.junit.Before;

+import org.junit.Test;

+import org.mockito.Answers;

+import org.mockito.Mock;

+import org.mockito.MockitoAnnotations;

+import org.mockito.stubbing.Answer;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.client.Future;

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.inno.env.Data.TYPE;

+import org.onap.aaf.rosetta.env.RosettaDF;

+import org.onap.aaf.rosetta.env.RosettaEnv;

+

+import aaf.v2_0.Error;

+

+public class JU_ErrMessageTest {

+	

+	@Mock

+	private RosettaEnv env;

+	

+	@Mock(answer=Answers.RETURNS_DEEP_STUBS)

+	private RosettaDF<Object> errDF;

+

+	private ErrMessage errMessage;

+

+	private String attErrJson = "key:value";

+	

+	private Error error;

+

+	private Future<?> future;

+	

+	@Before

+	public void setUp() throws Exception {

+		MockitoAnnotations.initMocks(this);

+		

+		when(env.newDataFactory(Error.class)).thenReturn(errDF);

+		

+		future = new Future<Error>() {

+

+			@Override

+			public boolean get(int timeout) throws CadiException {

+				return false;

+			}

+

+			@Override

+			public int code() {

+				return 0;

+			}

+

+			@Override

+			public String body() {

+				return "Body";

+			}

+

+			@Override

+			public String header(String tag) {

+				return "header";

+			}

+		};

+		

+		error = new Error();

+		error.setMessageId("Error Message Id");

+		error.setText("Error Text");

+		errMessage = new ErrMessage(env);

+		

+		

+	}

+

+	@Test

+	public void testPrintErrMessage() throws APIException {

+		when(errDF.newData().in(TYPE.JSON).load(attErrJson).asObject()).thenReturn(error);

+		

+		errMessage.printErr(System.out, attErrJson);

+	}

+	

+	@Test

+	public void testToMsgJsonErrAttribute() throws APIException {

+		when(errDF.newData().in(TYPE.JSON).load(attErrJson).asObject()).thenReturn(error);

+		

+		StringBuilder sb = new StringBuilder();

+		errMessage.toMsg(sb,attErrJson);

+		

+		assertEquals(sb.toString(),"Error Message Id Error Text");

+	}

+	

+	@Test

+	public void testToMsgFuture() {

+		StringBuilder sb = errMessage.toMsg(future);

+		

+		assertEquals(sb.toString(), "0: Body");

+	}

+

+	

+	@Test

+	public void testToMsgFutureWithoutException() throws APIException {

+		when(errDF.newData().in(TYPE.JSON).load(future.body()).asObject()).thenReturn(error);

+		

+		StringBuilder sb = errMessage.toMsg(future);

+		

+		assertEquals(sb.toString(), "Error Message Id Error Text");

+	}

+}

diff --git a/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
index bd4e162..1beef2c 100644
--- a/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
+++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
@@ -171,7 +171,7 @@ public class JU_Lur2_0Call {
 //				50000, // 5 seconds after Expiration

 //				200); // High Count of items.. These do not take much memory

 //

-//		Principal pri = new ConfigPrincipal("xy1234","whatever);

+//		Principal pri = new ConfigPrincipal("xy1234","whatever");

 //		for (int i = 0; i < 10; ++i) {

 ////			print(aafLur, pri, new LocalPermission("*|*|*|com.att.authz"));

 //			print(aafLur, pri, new LocalPermission("service|myInstance|write"),false);