From 43a49f1b3ccddc987eda17afb0a4d19c0b48b0ce Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Sat, 9 Jun 2012 10:10:37 -0700 Subject: [PATCH] CSPACE-5271: Trivial additions to test condition error messages. --- .../services/common/test/UriTemplateTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 -- 2.47.3