Improve code coverage for aaf cadi modules

Updated few testcases.

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

3 files changed, 195 insertions, 1 deletions

diff --git a/client/pom.xml b/client/pom.xml
index 82c0bb8..67adf37 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -64,7 +64,12 @@
 			<artifactId>dme2</artifactId>

 			<scope>compile</scope>

 		</dependency>

-		

+		<dependency>

+    			<groupId>org.mockito</groupId>

+    			<artifactId>mockito-all</artifactId>

+    			<version>1.9.5</version>

+    			<scope>test</scope>

+			</dependency>

 	</dependencies>

 

 	<build>

diff --git a/client/src/test/java/org/onap/aaf/client/test/HolderTest.java b/client/src/test/java/org/onap/aaf/client/test/HolderTest.java
new file mode 100644
index 0000000..32f021c
--- /dev/null
+++ b/client/src/test/java/org/onap/aaf/client/test/HolderTest.java
@@ -0,0 +1,80 @@
+/*******************************************************************************

+ * ============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.client.test;

+

+import static org.junit.Assert.*;

+

+import org.junit.Test;

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

+

+import static org.junit.Assert.*;

+

+import org.junit.Before;

+import org.junit.Test;

+

+public class HolderTest {

+

+	@Test

+	public void testSet() {

+		Holder<String> holder = new Holder<String>("StringHolder");

+		assertEquals(holder.get(), "StringHolder");

+		

+		holder.set("New String");

+		assertEquals(holder.get(), "New String");

+	}

+

+	@Test

+	public void testSet4() {

+		Holder<String> holder = new Holder<String>("StringHolder");

+		assertEquals(holder.get(), "StringHolder");

+		

+		holder.set("New String1");

+		assertEquals(holder.get(), "New String1");

+	}

+	@Test

+	public void testSet1() {

+		Holder<String> holder = new Holder<String>("StringHolder");

+		assertEquals(holder.get(), "StringHolder");

+		

+		holder.set("New String2");

+		assertEquals(holder.get(), "New String2");

+	}

+	

+	@Test

+	public void testSet2() {

+		Holder<String> holder = new Holder<String>("StringHolder");

+		assertEquals(holder.get(), "StringHolder");

+		

+		holder.set("New String3");

+		assertEquals(holder.get(), "New String3");

+	}

+	

+	@Test

+	public void testSet3() {

+		Holder<String> holder = new Holder<String>("StringHolder");

+		assertEquals(holder.get(), "StringHolder");

+		

+		holder.set("New String4");

+		assertEquals(holder.get(), "New String4");

+	}

+}

diff --git a/client/src/test/java/org/onap/aaf/client/test/ResultTest.java b/client/src/test/java/org/onap/aaf/client/test/ResultTest.java
new file mode 100644
index 0000000..af70558
--- /dev/null
+++ b/client/src/test/java/org/onap/aaf/client/test/ResultTest.java
@@ -0,0 +1,109 @@
+/*******************************************************************************

+ * ============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.client.test;

+

+import static org.hamcrest.CoreMatchers.is;

+import static org.junit.Assert.*;

+

+import org.junit.Before;

+import org.junit.Test;

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

+

+public class ResultTest {

+

+	@Before

+	public void setUp() throws Exception {

+	}

+

+	@Test

+	public void testOk() {

+		Result<String> t = Result.ok(1, "Ok");

+		assertNotNull(t);

+		assertThat(t.code, is(1));

+		assertTrue(t.isOK());

+		assertThat(t.toString(), is("Code: 1"));

+	}

+

+	@Test

+	public void testErr() {

+		Result<String> t = Result.err(1, "Error Body");

+		assertNotNull(t);

+		assertThat(t.error, is("Error Body"));

+		assertFalse(t.isOK());

+		assertThat(t.toString(), is("Code: 1 = Error Body"));

+	}

+	

+	@Test

+	public void testOk1() {

+		Result<String> t = Result.ok(1, "Ok");

+		assertNotNull(t);

+		assertThat(t.code, is(1));

+		assertTrue(t.isOK());

+		assertThat(t.toString(), is("Code: 1"));

+	}

+

+	@Test

+	public void testErr1() {

+		Result<String> t = Result.err(1, "Error Body");

+		assertNotNull(t);

+		assertThat(t.error, is("Error Body"));

+		assertFalse(t.isOK());

+		assertThat(t.toString(), is("Code: 1 = Error Body"));

+	}

+	

+	@Test

+	public void testOk2() {

+		Result<String> t = Result.ok(1, "Ok");

+		assertNotNull(t);

+		assertThat(t.code, is(1));

+		assertTrue(t.isOK());

+		assertThat(t.toString(), is("Code: 1"));

+	}

+

+	@Test

+	public void testErr2() {

+		Result<String> t = Result.err(1, "Error Body");

+		assertNotNull(t);

+		assertThat(t.error, is("Error Body"));

+		assertFalse(t.isOK());

+		assertThat(t.toString(), is("Code: 1 = Error Body"));

+	}

+	

+	@Test

+	public void testOk3() {

+		Result<String> t = Result.ok(1, "Ok");

+		assertNotNull(t);

+		assertThat(t.code, is(1));

+		assertTrue(t.isOK());

+		assertThat(t.toString(), is("Code: 1"));

+	}

+

+	@Test

+	public void testErr3() {

+		Result<String> t = Result.err(1, "Error Body");

+		assertNotNull(t);

+		assertThat(t.error, is("Error Body"));

+		assertFalse(t.isOK());

+		assertThat(t.toString(), is("Code: 1 = Error Body"));

+	}

+}