From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 7 Jun 2012 21:18:59 +0000 (-0700)
Subject: CSPACE-5271: Added second test case for generating a URI string via variable expansio... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0f956f32f88ab62641098bc3cb58032857bf1ed4;p=tmp%2Fjakarta-migration.git

CSPACE-5271: Added second test case for generating a URI string via variable expansion, using a provided Map.
---

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