CSPACE-5271: Added test for building Contact sub-resource URIs.

diff --git a/services/common/src/main/java/org/collectionspace/services/common/UriTemplateFactory.java b/services/common/src/main/java/org/collectionspace/services/common/UriTemplateFactory.java
index 1c270fc1322d369efea67bb6127dd891f9227682..4876c15b54e0415c6aab1ca56c710caedcafbbcf 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/UriTemplateFactory.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/UriTemplateFactory.java
@@ -73,7 +73,7 @@ public class UriTemplateFactory {
             + "/"\r
             + "{" + CONTACT_IDENTIFIER_VAR + "}";\r
 \r
-    public static UriTemplate getURITemplate(UriTemplateType type) {\r
+    public static StoredValuesUriTemplate getURITemplate(UriTemplateType type) {\r
         return new StoredValuesUriTemplate(type, getUriPathPattern(type));\r
     }\r
     \r

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 be6796c680ee3803a7371f4ca00ade945fe64363..07629146c8b2aa8277b58b56c65578f504224a98 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
@@ -37,10 +37,10 @@ public class UriTemplateTest {
     private final static String EXAMPLE_SERVICE_NAME = "examples";\r
     private final static String EXAMPLE_CSID = "a87f6616-4146-4c17-a41a-048597cc12aa";\r
     private final static String EXAMPLE_ITEM_CSID = "5d1c2f45-6d02-4376-8852-71893eaf8b1b";\r
+    private final static String EXAMPLE_CONTACT_CSID = "f01e9edb-4f9c-4716-a9cb-5e954fc29577";\r
     private final static HashMap<String, String> EMPTY_VALUES_MAP = new HashMap<String, String>();\r
     private static final Logger logger = LoggerFactory.getLogger(UriTemplateTest.class);\r
 \r
-\r
     private void testBanner(String msg) {\r
         String BANNER = "-------------------------------------------------------";\r
         logger.debug("\r" + BANNER + "\r\n" + this.getClass().getName() + "\r\n" + msg + "\r\n" + BANNER);\r
@@ -109,9 +109,27 @@ public class UriTemplateTest {
         Assert.assertTrue(uriStr.contains(EXAMPLE_CSID), "Generated URI string does not contain expected value: " + EXAMPLE_CSID);\r
         Assert.assertTrue(uriStr.contains(EXAMPLE_ITEM_CSID), "Generated URI string does not contain expected item value: " + EXAMPLE_ITEM_CSID);\r
     }\r
-    \r
-    // Negative tests: errors are anticipated and checked for in each of the following tests\r
 \r
+    @Test(dependsOnMethods = {"buildItemUri"})\r
+    public void buildContactUri() {\r
+        testBanner("buildContactUri");\r
+        StoredValuesUriTemplate contactTemplate =\r
+                UriTemplateFactory.getURITemplate(UriTemplateFactory.CONTACT);\r
+        Map<String, String> additionalValues = new HashMap<String, String>();\r
+        additionalValues.put(UriTemplateFactory.SERVICENAME_VAR, EXAMPLE_SERVICE_NAME);\r
+        additionalValues.put(UriTemplateFactory.IDENTIFIER_VAR, EXAMPLE_CSID);\r
+        additionalValues.put(UriTemplateFactory.ITEM_IDENTIFIER_VAR, EXAMPLE_ITEM_CSID);\r
+        additionalValues.put(UriTemplateFactory.CONTACT_IDENTIFIER_VAR, EXAMPLE_CONTACT_CSID);\r
+        String uriStr = contactTemplate.buildUri(additionalValues);\r
+        logger.debug("Generated URI string = " + uriStr);\r
+        Assert.assertTrue(Tools.notBlank(uriStr), "Generated URI string is null or blank.");\r
+        Assert.assertTrue(uriStr.contains(EXAMPLE_SERVICE_NAME), "Generated URI string does not contain expected value: " + EXAMPLE_SERVICE_NAME);\r
+        Assert.assertTrue(uriStr.contains(EXAMPLE_CSID), "Generated URI string does not contain expected value: " + EXAMPLE_CSID);\r
+        Assert.assertTrue(uriStr.contains(EXAMPLE_ITEM_CSID), "Generated URI string does not contain expected item value: " + EXAMPLE_ITEM_CSID);\r
+        Assert.assertTrue(uriStr.contains(EXAMPLE_CONTACT_CSID), "Generated URI string does not contain expected value: " + EXAMPLE_CONTACT_CSID);\r
+    }\r
+\r
+    // Negative tests: errors are anticipated and checked for in each of the following tests\r
     @Test(dependsOnMethods = {"buildResourceUri"})\r
     public void buildResourceUriWithMissingValue() {\r
         testBanner("buildResourceUriWithMissingValue");\r