From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 9 Jun 2012 17:10:37 +0000 (-0700)
Subject: CSPACE-5271: Trivial additions to test condition error messages.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=43a49f1b3ccddc987eda17afb0a4d19c0b48b0ce;p=tmp%2Fjakarta-migration.git

CSPACE-5271: Trivial additions to test condition error messages.
---

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 07629146c..b6fcbf5e6 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
@@ -72,8 +72,8 @@ public class UriTemplateTest {
         String uriStr = resourceTemplate.buildUri(resourceUriVars);
         logger.debug("Generated URI string = " + uriStr);
         Assert.assertFalse(Tools.isBlank(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_SERVICE_NAME), "Generated URI string does not contain expected service name value: " + EXAMPLE_SERVICE_NAME);
+        Assert.assertTrue(uriStr.contains(EXAMPLE_CSID), "Generated URI string does not contain expected identifier value: " + EXAMPLE_CSID);
     }
 
     @Test(dependsOnMethods = {"buildResourceUri"})
@@ -88,8 +88,8 @@ public class UriTemplateTest {
         String uriStr = storedValuesResourceTemplate.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_SERVICE_NAME), "Generated URI string does not contain expected service name value: " + EXAMPLE_SERVICE_NAME);
+        Assert.assertTrue(uriStr.contains(EXAMPLE_CSID), "Generated URI string does not contain expected identifier value: " + EXAMPLE_CSID);
     }
 
     @Test(dependsOnMethods = {"buildResourceUriWithStoredValues"})
@@ -105,9 +105,9 @@ public class UriTemplateTest {
         String uriStr = itemTemplate.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_SERVICE_NAME), "Generated URI string does not contain expected service name value: " + EXAMPLE_SERVICE_NAME);
+        Assert.assertTrue(uriStr.contains(EXAMPLE_CSID), "Generated URI string does not contain expected identifier value: " + EXAMPLE_CSID);
+        Assert.assertTrue(uriStr.contains(EXAMPLE_ITEM_CSID), "Generated URI string does not contain expected item identifier value: " + EXAMPLE_ITEM_CSID);
     }
 
     @Test(dependsOnMethods = {"buildItemUri"})
@@ -123,10 +123,10 @@ public class UriTemplateTest {
         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);
+        Assert.assertTrue(uriStr.contains(EXAMPLE_SERVICE_NAME), "Generated URI string does not contain expected service name value: " + EXAMPLE_SERVICE_NAME);
+        Assert.assertTrue(uriStr.contains(EXAMPLE_CSID), "Generated URI string does not contain expected identifier value: " + EXAMPLE_CSID);
+        Assert.assertTrue(uriStr.contains(EXAMPLE_ITEM_CSID), "Generated URI string does not contain expected item identifier value: " + EXAMPLE_ITEM_CSID);
+        Assert.assertTrue(uriStr.contains(EXAMPLE_CONTACT_CSID), "Generated URI string does not contain expected contact identifier value: " + EXAMPLE_CONTACT_CSID);
     }
 
     // Negative tests: errors are anticipated and checked for in each of the following tests