CSPACE-5271: Added second test case for generating a URI string via variable expansio...

diff --git a/services/common/src/test/java/org/collectionspace/services/common/test/UriTemplateTest.java b/services/common/src/test/java/org/collectionspace/services/common/test/UriTemplateTest.java
index 6fae7065979a3fdad259d5fe74dafaf79a33bc52..b897c322e2aa881e1382d1a7151f5e4b30d01a53 100644 (file)
--- a/services/common/src/test/java/org/collectionspace/services/common/test/UriTemplateTest.java
+++ b/services/common/src/test/java/org/collectionspace/services/common/test/UriTemplateTest.java
@@ -21,14 +21,20 @@
  */\r
 package org.collectionspace.services.common.test;\r
 \r
+import java.util.HashMap;\r
+import java.util.Map;\r
 import org.collectionspace.services.common.UriTemplate;\r
 import org.collectionspace.services.common.UriTemplateFactory;\r
+import org.collectionspace.services.common.api.Tools;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 import org.testng.Assert;\r
 import org.testng.annotations.Test;\r
 \r
 public class UriTemplateTest {\r
+    \r
+    final static String EXAMPLE_SERVICE_NAME = "examples";\r
+    final static String CSID = "a87f6616-4146-4c17-a41a-048597cc12aa";\r
 \r
     private static final Logger logger = LoggerFactory.getLogger(UriTemplateTest.class);\r
 \r
@@ -38,8 +44,8 @@ public class UriTemplateTest {
     }\r
 \r
     @Test\r
-    public void testResourceUriTemplate() {\r
-        testBanner("testBuildResourceUri");\r
+    public void createResourceUriTemplate() {\r
+        testBanner("createResourceUriTemplate");\r
         UriTemplate resourceTemplate = UriTemplateFactory.getURITemplate(UriTemplateFactory.UriTemplateType.RESOURCE);\r
         Assert.assertNotNull(resourceTemplate, "Resource template is null.");\r
         logger.debug("Resource template URI path = " + resourceTemplate.toString());\r
@@ -47,4 +53,16 @@ public class UriTemplateTest {
         Assert.assertEquals(resourceTemplate.toString(), UriTemplateFactory.RESOURCE_TEMPLATE_PATTERN,\r
                 "Resource template URI path doesn't match expected path.");\r
     }\r
+    \r
+    @Test (dependsOnMethods = {"createResourceUriTemplate"})\r
+    public void buildResourceUri() {\r
+        testBanner("buildResourceUri");\r
+        UriTemplate resourceTemplate = UriTemplateFactory.getURITemplate(UriTemplateFactory.UriTemplateType.RESOURCE);\r
+        Map<String,String> resourceUriVars = new HashMap<String,String>();\r
+        resourceUriVars.put("servicename", EXAMPLE_SERVICE_NAME);\r
+        resourceUriVars.put("identifier", CSID);\r
+        String uriStr = resourceTemplate.buildUri(resourceUriVars);\r
+        Assert.assertFalse(Tools.isBlank(uriStr), "Generated URI string is null or blank.");\r
+        logger.debug("Generated URI string = " + uriStr);\r
+    }\r
 }\r