CSPACE-5301,CSPACE-5073: Added refName parsing test for item display name containing...

diff --git a/services/common-api/src/test/java/org/collectionspace/services/common/api/test/RefNameTest.java b/services/common-api/src/test/java/org/collectionspace/services/common/api/test/RefNameTest.java
index 03a90bf4f0748b443e0a7eb2127081e8cd101ca0..a91162f34b9aece6acb29899f1e90b97cf33d52f 100644 (file)
--- a/services/common-api/src/test/java/org/collectionspace/services/common/api/test/RefNameTest.java
+++ b/services/common-api/src/test/java/org/collectionspace/services/common/api/test/RefNameTest.java
@@ -22,6 +22,8 @@
 package org.collectionspace.services.common.api.test;\r
 \r
 import org.collectionspace.services.common.api.RefName;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 import org.testng.Assert;\r
 import org.testng.annotations.Test;\r
 \r
@@ -29,30 +31,34 @@ import org.testng.annotations.Test;
  * User: laramie $LastChangedRevision: $ $LastChangedDate: $\r
  */\r
 public class RefNameTest {\r
+    \r
+    private static final Logger logger = LoggerFactory.getLogger(RefName.class);\r
 \r
     public static final String AUTHORITY_EXAMPLE = "urn:cspace:collectionspace.org:Loansin:name(shortID)'displayName'";\r
     public static final String AUTHORITY_EXAMPLE2 = "urn:cspace:collectionspace.org:Loansin:name(shortID)";\r
     public static final String AUTHORITY_ITEM_EXAMPLE = "urn:cspace:collectionspace.org:Loansin:name(shortID):item:name(itemShortID)'itemDisplayName'";\r
-    public static final String EX_tenantName = "collectionspace.org";\r
-    public static final String EX_resource = "Loansin";\r
-    public static final String EX_shortIdentifier = "shortID";\r
-    public static final String EX_displayName = "displayName";\r
-    public static final String EX_itemShortIdentifier = "itemShortID";\r
-    public static final String EX_itemDisplayName = "itemDisplayName";\r
-    public static final String EX_itemDisplayNameContainsColon = "itemDisplayName:itemDisplayName2:itemDisplayName3";\r
-    public static final String EX_itemDisplayNameContainsParens = "itemDisplayName (in parens) and more";\r
+    public static final String TENANT_DOMAIN_NAME = "collectionspace.org";\r
+    public static final String RESOURCE = "Loansin";\r
+    public static final String SHORT_IDENTIFIER = "shortID";\r
+    public static final String DISPLAY_NAME = "displayName";\r
+    public static final String ITEM_SHORT_IDENTIFIER = "itemShortID";\r
+    public static final String ITEM_DISPLAY_NAME = "itemDisplayName";\r
+    public static final String DISPLAY_NAME_WITH_COLONS = "itemDisplayName:itemDisplayName2:itemDisplayName3";\r
+    public static final String DISPLAY_NAME_WITH_PARENS = "itemDisplayName (in parens) and more";\r
+    public static final String DISPLAY_NAME_WITH_APOSTROPHE = "itemDisplayName O'Reilly";\r
+\r
     \r
 \r
     private void testBanner(String msg) {\r
         String BANNER = "-------------------------------------------------------";\r
-        System.out.println(BANNER + "\r\n" + this.getClass().getName() + "\r\n" + msg + "\r\n" + BANNER);\r
+        logger.debug("\r" + BANNER + "\r\n" + this.getClass().getName() + "\r\n" + msg + "\r\n" + BANNER);\r
     }\r
 \r
     private void check(String one, String two, String msg) {\r
         if (one == null || two == null || !(one.equals(two))) {\r
-            System.out.println("equals check FAILED. (msg: " + msg + ")\r\none: " + one + "\r\ntwo: " + two + "\r\n");\r
+            logger.debug("equals check FAILED. (msg: " + msg + ")\r\none: " + one + "\r\ntwo: " + two + "\r\n");\r
         } else {\r
-            System.out.println("equals check OK. (msg: " + msg + ")\r\none: " + one + "\r\ntwo: " + two + "\r\n");\r
+            logger.debug("equals check OK. (msg: " + msg + ")\r\none: " + one + "\r\ntwo: " + two + "\r\n");\r
         }\r
         Assert.assertEquals(one, two, msg);\r
     }\r
@@ -61,17 +67,17 @@ public class RefNameTest {
     public void testRoundTrip() {\r
         testBanner("testRoundTrip");\r
         RefName.AuthorityItem item = RefName.AuthorityItem.parse(AUTHORITY_ITEM_EXAMPLE);\r
-        check(item.displayName, EX_itemDisplayName, "EX_itemDisplayName");\r
-        check(item.shortIdentifier, EX_itemShortIdentifier, "EX_itemShortIdentifier");\r
-        check(item.toString(), AUTHORITY_ITEM_EXAMPLE, "AUTHORITY_ITEM_EXAMPLE");\r
+        check(item.toString(), AUTHORITY_ITEM_EXAMPLE, "Item refName");\r
+        check(item.displayName, ITEM_DISPLAY_NAME, "Item display name");\r
+        check(item.shortIdentifier, ITEM_SHORT_IDENTIFIER, "Item short identifier");\r
         check(item.inAuthority.displayName, "", "displayName from inAuthority should be empty");\r
 \r
         RefName.Authority authority = RefName.Authority.parse(AUTHORITY_EXAMPLE);\r
-        check(authority.toString(), AUTHORITY_EXAMPLE, "AUTHORITY_ITEM_EXAMPLE");\r
-        check(authority.tenantName, EX_tenantName, "EX_tenantName");\r
-        check(authority.resource, EX_resource, "EX_resource");\r
-        check(authority.displayName, EX_displayName, "EX_displayName");\r
-        check(authority.shortIdentifier, EX_shortIdentifier, "EX_shortIdentifier");\r
+        check(authority.toString(), AUTHORITY_EXAMPLE, "Authority refName");\r
+        check(authority.tenantName, TENANT_DOMAIN_NAME, "Authority tenant domain name");\r
+        check(authority.resource, RESOURCE, "Authority resource");\r
+        check(authority.displayName, DISPLAY_NAME, "Authority display name");\r
+        check(authority.shortIdentifier, SHORT_IDENTIFIER, "Authority short identifier");\r
 \r
         Assert.assertEquals(authority, item.inAuthority, "inAuthority from AuthorityItem.parse() matches Authority from Authority.parse()");\r
     }\r
@@ -80,8 +86,8 @@ public class RefNameTest {
     public void testConstructors() {\r
         testBanner("testConstructors");\r
         RefName.AuthorityItem item = RefName.buildAuthorityItem(AUTHORITY_EXAMPLE2,\r
-                EX_itemShortIdentifier,\r
-                EX_itemDisplayName);\r
+                ITEM_SHORT_IDENTIFIER,\r
+                ITEM_DISPLAY_NAME);\r
         RefName.AuthorityItem itemParsed = RefName.AuthorityItem.parse(AUTHORITY_ITEM_EXAMPLE);\r
         check(item.toString(), itemParsed.toString(), "buildAuthorityItem from AUTHORITY_EXAMPLE2 vs. parse(AUTHORITY_ITEM_EXAMPLE)");\r
         Assert.assertEquals(item, itemParsed);\r
@@ -90,8 +96,8 @@ public class RefNameTest {
 \r
         RefName.Authority authority2 = RefName.Authority.parse(AUTHORITY_EXAMPLE2);\r
         RefName.AuthorityItem item3 = RefName.buildAuthorityItem(authority2,\r
-                EX_itemShortIdentifier,\r
-                EX_itemDisplayName);\r
+                ITEM_SHORT_IDENTIFIER,\r
+                ITEM_DISPLAY_NAME);\r
         check(item.toString(), item3.toString(), "buildAuthorityItem(Authority,str,str) from AUTHORITY_EXAMPLE2 vs. AUTHORITY_ITEM_EXAMPLE");\r
         Assert.assertEquals(item, item3);\r
     }\r
@@ -104,21 +110,21 @@ public class RefNameTest {
     public void testShortIDGetters() {\r
         testBanner("testShortIDGetters");\r
         RefName.Authority authority = RefName.Authority.parse(AUTHORITY_EXAMPLE);\r
-        Assert.assertEquals(authority.getShortIdentifier(), EX_shortIdentifier,\r
+        Assert.assertEquals(authority.getShortIdentifier(), SHORT_IDENTIFIER,\r
                 "Short identifier from parsing parent authority refName does not match value of Authority.getShortIdentifier().");\r
 \r
         RefName.AuthorityItem item = RefName.buildAuthorityItem(AUTHORITY_EXAMPLE,\r
-                EX_itemShortIdentifier,\r
-                EX_itemDisplayName);\r
-        Assert.assertEquals(item.getParentShortIdentifier(), EX_shortIdentifier,\r
+                ITEM_SHORT_IDENTIFIER,\r
+                ITEM_DISPLAY_NAME);\r
+        Assert.assertEquals(item.getParentShortIdentifier(), SHORT_IDENTIFIER,\r
                 "Parent short identifier from parsing authority refName does not match value of AuthorityItem.getParentShortIdentifier().");\r
-        Assert.assertEquals(item.getShortIdentifier(), EX_itemShortIdentifier,\r
+        Assert.assertEquals(item.getShortIdentifier(), ITEM_SHORT_IDENTIFIER,\r
                 "Short identifier from item does not match value of AuthorityItem.getShortIdentifier().");\r
 \r
         RefName.AuthorityItem parsedItem = RefName.AuthorityItem.parse(AUTHORITY_ITEM_EXAMPLE);\r
-        Assert.assertEquals(parsedItem.getParentShortIdentifier(), EX_shortIdentifier,\r
+        Assert.assertEquals(parsedItem.getParentShortIdentifier(), SHORT_IDENTIFIER,\r
                 "Parent short identifier from parsing item refName does not match value of AuthorityItem.getParentShortIdentifier().");\r
-        Assert.assertEquals(parsedItem.getShortIdentifier(), EX_itemShortIdentifier,\r
+        Assert.assertEquals(parsedItem.getShortIdentifier(), ITEM_SHORT_IDENTIFIER,\r
                 "Short identifier from parsing item refName does not match value of AuthorityItem.getShortIdentifier().");\r
 \r
     }\r
@@ -132,26 +138,37 @@ public class RefNameTest {
     public void testSeparatorsInDisplayNames() {\r
         testBanner("testSeparatorsInDisplayNames");\r
         \r
-        RefName.AuthorityItem itemDisplayNameContainsColon =\r
+        RefName.AuthorityItem itemWithDisplayNameColons =\r
+                RefName.buildAuthorityItem(AUTHORITY_EXAMPLE2,\r
+                ITEM_SHORT_IDENTIFIER,\r
+                DISPLAY_NAME_WITH_COLONS);\r
+        Assert.assertEquals(itemWithDisplayNameColons.getShortIdentifier(), ITEM_SHORT_IDENTIFIER,\r
+                "Short identifier from item " + itemWithDisplayNameColons.getShortIdentifier()\r
+                + "does not match expected value " + ITEM_SHORT_IDENTIFIER);\r
+        Assert.assertEquals(itemWithDisplayNameColons.displayName, DISPLAY_NAME_WITH_COLONS,\r
+                "Display name from item " + itemWithDisplayNameColons.displayName\r
+                + "does not match expected value " + DISPLAY_NAME_WITH_COLONS);\r
+        \r
+        RefName.AuthorityItem itemWithDisplayNameParens =\r
                 RefName.buildAuthorityItem(AUTHORITY_EXAMPLE2,\r
-                EX_itemShortIdentifier,\r
-                EX_itemDisplayNameContainsColon);\r
-        Assert.assertEquals(itemDisplayNameContainsColon.getShortIdentifier(), EX_itemShortIdentifier,\r
-                "Short identifier from item " + itemDisplayNameContainsColon.getShortIdentifier()\r
-                + "does not match expected value " + EX_itemShortIdentifier);\r
-        Assert.assertEquals(itemDisplayNameContainsColon.displayName, EX_itemDisplayNameContainsColon,\r
-                "Display name from item " + itemDisplayNameContainsColon.displayName\r
-                + "does not match expected value " + EX_itemDisplayNameContainsColon);\r
+                ITEM_SHORT_IDENTIFIER,\r
+                DISPLAY_NAME_WITH_PARENS);\r
+        Assert.assertEquals(itemWithDisplayNameParens.getShortIdentifier(), ITEM_SHORT_IDENTIFIER,\r
+                "Short identifier from item " + itemWithDisplayNameParens.getShortIdentifier()\r
+                + "does not match expected value " + ITEM_SHORT_IDENTIFIER);\r
+        Assert.assertEquals(itemWithDisplayNameParens.displayName, DISPLAY_NAME_WITH_PARENS,\r
+                "Display name from item " + itemWithDisplayNameParens.displayName\r
+                + "does not match expected value " + DISPLAY_NAME_WITH_PARENS);\r
         \r
-        RefName.AuthorityItem itemDisplayNameContainsParens =\r
+        RefName.AuthorityItem itemWithDisplayNameApostrophe =\r
                 RefName.buildAuthorityItem(AUTHORITY_EXAMPLE2,\r
-                EX_itemShortIdentifier,\r
-                EX_itemDisplayNameContainsParens);\r
-        Assert.assertEquals(itemDisplayNameContainsParens.getShortIdentifier(), EX_itemShortIdentifier,\r
-                "Short identifier from item " + itemDisplayNameContainsParens.getShortIdentifier()\r
-                + "does not match expected value " + EX_itemShortIdentifier);\r
-        Assert.assertEquals(itemDisplayNameContainsParens.displayName, EX_itemDisplayNameContainsParens,\r
-                "Display name from item " + itemDisplayNameContainsParens.displayName\r
-                + "does not match expected value " + EX_itemDisplayNameContainsParens);\r
+                ITEM_SHORT_IDENTIFIER,\r
+                DISPLAY_NAME_WITH_APOSTROPHE);\r
+        Assert.assertEquals(itemWithDisplayNameApostrophe.getShortIdentifier(), ITEM_SHORT_IDENTIFIER,\r
+                "Short identifier from item " + itemWithDisplayNameApostrophe.getShortIdentifier()\r
+                + "does not match expected value " + ITEM_SHORT_IDENTIFIER);\r
+        Assert.assertEquals(itemWithDisplayNameApostrophe.displayName, DISPLAY_NAME_WITH_APOSTROPHE,\r
+                "Display name from item " + itemWithDisplayNameApostrophe.displayName\r
+                + "does not match expected value " + DISPLAY_NAME_WITH_APOSTROPHE);\r
     }\r
 }\r

diff --git a/services/common-api/src/test/resources/log4j.properties b/services/common-api/src/test/resources/log4j.properties
new file mode 100644 (file)
index 0000000..e2db432
--- /dev/null
+++ b/services/common-api/src/test/resources/log4j.properties
@@ -0,0 +1,27 @@
+log4j.rootLogger=debug, stdout, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+# log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+log4j.appender.stdout.layout.ConversionPattern=%m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=target/test-client.log
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+#packages
+log4j.logger.org.collectionspace.services.client.PoxPayloadIn=DEBUG
+log4j.logger.org.collectionspace.services.client.PoxPayloadOut=DEBUG
+
+log4j.logger.org.collectionspace=DEBUG
+log4j.logger.org.apache=INFO
+log4j.logger.httpclient=INFO
+log4j.logger.org.jboss.resteasy=INFO