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