From 3c86680e532b959bd637b6c093b3916ae5bcee11 Mon Sep 17 00:00:00 2001 From: "Thomas Nelson Jr (arthurdent3) tn1381@att.com" Date: Tue, 13 Mar 2018 20:10:04 -0400 Subject: Docker update and POM fix Update the docker for cassandra to change ownership of imported files. Update the POM to fix bug Numerous bug fixes fro Logging and Error reporting. Change-Id: I518807f9796734134341ebefd109219050a84b51 Issue-ID: MUSIC-56, MUSIC-57, MUSIC-58 Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com --- .../org/onap/music/unittests/JsonResponseTest.java | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/test/java/org/onap/music/unittests/JsonResponseTest.java') diff --git a/src/test/java/org/onap/music/unittests/JsonResponseTest.java b/src/test/java/org/onap/music/unittests/JsonResponseTest.java index 55e5965e..9da10638 100644 --- a/src/test/java/org/onap/music/unittests/JsonResponseTest.java +++ b/src/test/java/org/onap/music/unittests/JsonResponseTest.java @@ -25,6 +25,7 @@ package org.onap.music.unittests; import static org.junit.Assert.*; import java.util.Map; import org.junit.Test; +import org.onap.music.main.ResultType; import org.onap.music.response.jsonobjects.JsonResponse; public class JsonResponseTest { @@ -33,28 +34,22 @@ public class JsonResponseTest { @Test public void testJsonResponseBooleanStringString() { - result = new JsonResponse(true,"error","version"); + result = new JsonResponse(ResultType.SUCCESS).setError("error").setMusicVersion("version"); assertEquals("error",result.getError()); } - @Test - public void testJsonResponse() { - result = new JsonResponse(); - assertFalse(result.getStatus()); - } - @Test public void testStatus() { - result = new JsonResponse(); - result.setStatus(true); - assertTrue(result.getStatus()); - result = new JsonResponse(false,"error","version"); - assertFalse(result.getStatus()); + result = new JsonResponse(ResultType.SUCCESS); + result.setStatus(ResultType.SUCCESS); + assertEquals(ResultType.SUCCESS, result.getStatus()); + result = new JsonResponse(ResultType.FAILURE).setError("error").setMusicVersion("version"); + assertEquals(ResultType.FAILURE, result.getStatus()); } @Test public void testError() { - result = new JsonResponse(); + result = new JsonResponse(ResultType.FAILURE); result.setError("error"); assertTrue(result.getError().equals("error")); result.setError(""); @@ -63,21 +58,26 @@ public class JsonResponseTest { @Test public void testVersion() { - result = new JsonResponse(); - result.setVersion("version"); - assertTrue(result.getVersion().equals("version")); - result.setVersion(""); - assertFalse(result.getVersion().equals("version")); + result = new JsonResponse(ResultType.SUCCESS); + result.setMusicVersion("version"); + assertTrue(result.getMusicVersion().equals("version")); + result.setMusicVersion(""); + assertFalse(result.getMusicVersion().equals("version")); } @Test public void testToMap() { - result = new JsonResponse(true,"error","version"); + result = new JsonResponse(ResultType.SUCCESS).setError("error").setMusicVersion("1.0"); Map myMap = result.toMap(); assertTrue(myMap.containsKey("status")); - result = new JsonResponse(false,"",""); + assertEquals(ResultType.SUCCESS, myMap.get("status")); + assertEquals("error", myMap.get("error")); + assertEquals("1.0", myMap.get("version")); + + result = new JsonResponse(ResultType.FAILURE); myMap = result.toMap(); assertTrue(myMap.containsKey("status")); + assertEquals(ResultType.FAILURE, myMap.get("status")); } } -- cgit 1.2.3-korg