aboutsummaryrefslogtreecommitdiffstats
path: root/client/client-editor/src/test
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@ericsson.com>2018-09-19 17:23:48 +0100
committerliamfallon <liam.fallon@ericsson.com>2018-09-20 12:26:57 +0100
commitaece3940d349329efe6d220961f6f2a487f90565 (patch)
treea55e5302c038a130327cc5e69aee78aab1eb3ac8 /client/client-editor/src/test
parentf28256b49d1041a959646536d16094fc68431b12 (diff)
Refactor Editor REST servlet
Issue-ID: POLICY-1034 Change-Id: Ifa08c7a31b4fe19eb62c2035b67b6f5cad313b5f Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'client/client-editor/src/test')
-rw-r--r--client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/TestApexEditorRestResource.java (renamed from client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/TestApexEditorRestResource.java)47
-rw-r--r--client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanFake.java (renamed from client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/bean/BeanFake.java)2
-rw-r--r--client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/TestBeans.java (renamed from client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/bean/TestBeans.java)2
3 files changed, 21 insertions, 30 deletions
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/TestApexEditorRestResource.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/TestApexEditorRestResource.java
index 4d45289b1..3585959f5 100644
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/TestApexEditorRestResource.java
+++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/TestApexEditorRestResource.java
@@ -18,10 +18,10 @@
* ============LICENSE_END=========================================================
*/
-package org.onap.policy.apex.client.editor.rest;
+package org.onap.policy.apex.client.editor.rest.handling;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
import java.io.IOException;
@@ -146,26 +146,17 @@ public class TestApexEditorRestResource extends JerseyTest {
result = target("editor/12345/Model/Get").request().get(ApexApiResult.class);
assertEquals(Result.FAILED, result.getResult());
- try {
- result = target("editor/" + corruptSessionId + "/Model/Download").request().get(ApexApiResult.class);
- } catch (final Exception e) {
- assertEquals("HTTP 500 Request failed.", e.getMessage());
- }
+ String resultString = target("editor/" + corruptSessionId + "/Model/Download").request().get(String.class);
+ assertEquals("", resultString);
- result = target("editor/" + sessionId + "/Model/Download").request().get(ApexApiResult.class);
- assertEquals(Result.SUCCESS, result.getResult());
- try {
- target("editor/-12345/Model/Download").request().get(ApexApiResult.class);
- fail("test should throw an exception here");
- } catch (final Exception e) {
- assertEquals("HTTP 500 Request failed.", e.getMessage());
- }
- try {
- target("editor/12345/Model/Download").request().get(ApexApiResult.class);
- fail("test should throw an exception here");
- } catch (final Exception e) {
- assertEquals("HTTP 500 Request failed.", e.getMessage());
- }
+ resultString = target("editor/" + sessionId + "/Model/Download").request().get(String.class);
+ assertNotNull(resultString);
+
+ resultString = target("editor/-12345/Model/Download").request().get(String.class);
+ assertEquals("", resultString);
+
+ resultString = target("editor/12345/Model/Download").request().get(String.class);
+ assertEquals("", resultString);
try {
result = target("editor/" + corruptSessionId + "/KeyInformation/Get").request().get(ApexApiResult.class);
@@ -347,11 +338,11 @@ public class TestApexEditorRestResource extends JerseyTest {
}
result = target("editor/" + sessionId + "/Validate/ContextAlbum").request().get(ApexApiResult.class);
- assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = target("editor/" + sessionId + "/Validate/ContextAlbum").queryParam("name", (String) null)
.queryParam("version", (String) null).request().get(ApexApiResult.class);
- assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = target("editor/" + sessionId + "/Validate/ContextAlbum").queryParam("name", "%%%$£")
.queryParam("version", (String) null).request().get(ApexApiResult.class);
@@ -471,7 +462,7 @@ public class TestApexEditorRestResource extends JerseyTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = target("editor/" + sessionId + "/Validate/Event").request().get(ApexApiResult.class);
- assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
try {
target("editor/" + corruptSessionId + "/Validate/Event").request().get(ApexApiResult.class);
@@ -481,7 +472,7 @@ public class TestApexEditorRestResource extends JerseyTest {
result = target("editor/" + sessionId + "/Validate/Event").queryParam("name", (String) null)
.queryParam("version", (String) null).request().get(ApexApiResult.class);
- assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = target("editor/" + sessionId + "/Validate/Event").queryParam("name", "%%%$£")
.queryParam("version", (String) null).request().get(ApexApiResult.class);
@@ -666,7 +657,7 @@ public class TestApexEditorRestResource extends JerseyTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = target("editor/" + sessionId + "/Validate/Task").request().get(ApexApiResult.class);
- assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
try {
target("editor/" + corruptSessionId + "/Validate/Task").request().get(ApexApiResult.class);
@@ -676,7 +667,7 @@ public class TestApexEditorRestResource extends JerseyTest {
result = target("editor/" + sessionId + "/Validate/Task").queryParam("name", (String) null)
.queryParam("version", (String) null).request().get(ApexApiResult.class);
- assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = target("editor/" + sessionId + "/Validate/Task").queryParam("name", "%%%$£")
.queryParam("version", (String) null).request().get(ApexApiResult.class);
@@ -885,7 +876,7 @@ public class TestApexEditorRestResource extends JerseyTest {
+ "\"description\" : \"A description of hello\"" + "}";
entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
- assertEquals(ApexApiResult.Result.FAILED, result.getResult());
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
entityString = "{" + "\"name\" : \"Howdy5\"," + "\"version\" : \"0.0.2\","
+ "\"contexts\" : [{\"name\" : null, \"version\" : \"0.0.1\"}],"
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/bean/BeanFake.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanFake.java
index c166dc267..958f1a6cd 100644
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/bean/BeanFake.java
+++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanFake.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.onap.policy.apex.client.editor.rest.bean;
+package org.onap.policy.apex.client.editor.rest.handling.bean;
import javax.xml.bind.annotation.XmlType;
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/bean/TestBeans.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/TestBeans.java
index df08dbaf2..72cbae22c 100644
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/bean/TestBeans.java
+++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/TestBeans.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.onap.policy.apex.client.editor.rest.bean;
+package org.onap.policy.apex.client.editor.rest.handling.bean;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;