You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/09/01 15:37:05 UTC

[2/2] aries-jax-rs-whiteboard git commit: extend test case to check two replacements

extend test case to check two replacements


Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/d5bdc767
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/d5bdc767
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/d5bdc767

Branch: refs/heads/master
Commit: d5bdc7673b18692455ebb20732b08f5da318795d
Parents: 5f0b4c6
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Sep 1 17:35:51 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Sep 1 17:35:51 2017 +0200

----------------------------------------------------------------------
 jax-rs.itests/src/main/java/test/JaxrsTest.java | 68 ++++++++++++++++++++
 1 file changed, 68 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d5bdc767/jax-rs.itests/src/main/java/test/JaxrsTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java
index cc562a7..f722fa3 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -396,6 +396,74 @@ public class JaxrsTest extends TestHelper {
                 request().
                 get(String.class));
 
+        ServiceRegistration<Application> serviceRegistration2 =
+            registerApplication(
+                new TestApplicationConflict(), JAX_RS_NAME, ".default",
+                "service.ranking", 1);
+
+        assertEquals(0, getRuntimeDTO().applicationDTOs.length);
+        assertEquals(2, getRuntimeDTO().failedApplicationDTOs.length);
+        assertEquals(
+            serviceRegistration2.getReference().getProperty("service.id"),
+            getRuntimeDTO().defaultApplication.serviceId);
+        assertEquals(
+            DTOConstants.FAILURE_REASON_DUPLICATE_NAME,
+            getRuntimeDTO().failedApplicationDTOs[0].failureReason);
+        assertEquals(
+            DTOConstants.FAILURE_REASON_DUPLICATE_NAME,
+            getRuntimeDTO().failedApplicationDTOs[1].failureReason);
+
+        assertEquals(
+            "Hello application conflict",
+            createDefaultTarget().
+                path("/test-application").
+                request().
+                get().
+                readEntity(String.class));
+
+        assertEquals(
+            404,
+            createDefaultTarget().path("/test").request().get().getStatus());
+
+        assertEquals(
+            "Hello test",
+            createDefaultTarget().
+                path("/test-application").
+                path("/test").
+                request().
+                get(String.class));
+
+        serviceRegistration2.unregister();
+
+        assertEquals(0, getRuntimeDTO().applicationDTOs.length);
+        assertEquals(1, getRuntimeDTO().failedApplicationDTOs.length);
+        assertEquals(
+            serviceRegistration.getReference().getProperty("service.id"),
+            getRuntimeDTO().defaultApplication.serviceId);
+        assertEquals(
+            DTOConstants.FAILURE_REASON_DUPLICATE_NAME,
+            getRuntimeDTO().failedApplicationDTOs[0].failureReason);
+
+        assertEquals(
+            "Hello application",
+            createDefaultTarget().
+                path("/test-application").
+                request().
+                get().
+                readEntity(String.class));
+
+        assertEquals(
+            404,
+            createDefaultTarget().path("/test").request().get().getStatus());
+
+        assertEquals(
+            "Hello test",
+            createDefaultTarget().
+                path("/test-application").
+                path("/test").
+                request().
+                get(String.class));
+
         serviceRegistration.unregister();
 
         assertEquals(0, getRuntimeDTO().applicationDTOs.length);