From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 9 Jun 2012 17:05:24 +0000 (-0700)
Subject: CSPACE-5271: Added test for building Contact sub-resource URIs.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=518765f0773a4276997450cc6676541f8c804d6e;p=tmp%2Fjakarta-migration.git

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