CSPACE-6949: Support for more SAS tests.

diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java
index 7296efde086b494d9160cb3f8944083166c362d8..5459dce866cf98fccb349ea14b144acd7d1a5508 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java
@@ -378,11 +378,18 @@ public abstract class AbstractAuthorityServiceTest<AUTHORITY_COMMON_TYPE, AUTHOR
      */
     @Test(dataProvider = "testName", dependsOnMethods = {"syncWithSAS", "CRUDTests"})
     public void veryifySyncWithSAS(String testName) {
-        // Perform setup.
+        //
+       // First check to see if we support sync.
+       //
+        AuthorityClient client = (AuthorityClient) getClientInstance();
+       if (client.supportsSync() == false) {
+               return; // Exit the test since this authority doesn't support synchronization
+       }        
+
+       // Perform setup.
         setupReadList();
 
         // Submit the request to the service and store the response.
-        AuthorityClient client = (AuthorityClient) getClientInstance();
         Response res = null;
         res = client.readItemListForNamedAuthority(knownSASAuthorityResourceIdentifier, null, null);
 
@@ -866,8 +873,16 @@ public abstract class AbstractAuthorityServiceTest<AUTHORITY_COMMON_TYPE, AUTHOR
     }
     
     @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
-               dependsOnMethods = {"readItem", "CRUDTests", "veryifySyncWithSAS"})
+               dependsOnMethods = {"veryifySyncWithSAS", "CRUDTests"})
     public void updateLocalItemWithSync(String testName) throws Exception {
+        //
+       // First check to see if we support sync.
+       //
+        AuthorityClient client = (AuthorityClient) getClientInstance();
+       if (client.supportsSync() == false) {
+               return; // Exit the test since this authority doesn't support synchronization
+       }        
+       
         // Perform setup.
         setupUpdate();
         AUTHORITY_ITEM_TYPE theUpdate = null;

diff --git a/services/material/client/src/test/java/org/collectionspace/services/client/test/MaterialAuthorityServiceTest.java b/services/material/client/src/test/java/org/collectionspace/services/client/test/MaterialAuthorityServiceTest.java
index 82ef25cfe065b6b134c650505d95ec21e9e34b9d..5ebca491a32955d06744d71d240394ba2d5d3c9f 100644 (file)
--- a/services/material/client/src/test/java/org/collectionspace/services/client/test/MaterialAuthorityServiceTest.java
+++ b/services/material/client/src/test/java/org/collectionspace/services/client/test/MaterialAuthorityServiceTest.java
@@ -392,7 +392,8 @@ public class MaterialAuthorityServiceTest extends AbstractAuthorityServiceTest<M
 
     @Override
     protected void compareUpdatedItemInstances(MaterialsCommon original,
-            MaterialsCommon updated) throws Exception {
+            MaterialsCommon updated,
+                       boolean compareRevNumbers) throws Exception {
             
             MaterialTermGroupList originalTermList = original.getMaterialTermGroupList();
             Assert.assertNotNull(originalTermList);
@@ -409,6 +410,10 @@ public class MaterialAuthorityServiceTest extends AbstractAuthorityServiceTest<M
             Assert.assertEquals(updatedTerms.get(0).getTermDisplayName(),
                 originalTerms.get(0).getTermDisplayName(),
                 "Value in updated record did not match submitted data.");
+            
+            if (compareRevNumbers == true) {
+               Assert.assertEquals(original.getRev(), updated.getRev(), "Revision numbers should match.");
+            }
     }
 
     @Override

diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java
index be24d57080f8f170c20051b04e3e60b089853146..ea850f6882f3a034fedfa3a716d92c8312eb0886 100644 (file)
--- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java
+++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java
@@ -1077,7 +1077,8 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest<Orgaut
 
        @Override
        protected void compareUpdatedItemInstances(OrganizationsCommon original,
-                       OrganizationsCommon updated) throws Exception {
+                       OrganizationsCommon updated,
+                       boolean compareRevNumbers) throws Exception {
             
             OrgTermGroupList originalTermList = original.getOrgTermGroupList();
             Assert.assertNotNull(originalTermList);
@@ -1094,6 +1095,10 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest<Orgaut
             Assert.assertEquals(updatedTerms.get(0).getTermDisplayName(),
                 originalTerms.get(0).getTermDisplayName(),
                 "Value in updated record did not match submitted data.");
+            
+            if (compareRevNumbers == true) {
+               Assert.assertEquals(original.getRev(), updated.getRev(), "Revision numbers should match.");
+            }
        }
 
        @Override

diff --git a/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java b/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java
index a9f59e87fe171fb4f9776674b698d048ae2865a4..aeca7f95f4aeaf0d5634db8ac12bb0f6100c8b13 100644 (file)
--- a/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java
+++ b/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java
@@ -400,7 +400,8 @@ public class PlaceAuthorityServiceTest extends AbstractAuthorityServiceTest<Plac
 
        @Override
        protected void compareUpdatedItemInstances(PlacesCommon original,
-                       PlacesCommon updated) throws Exception {
+                       PlacesCommon updated,
+                       boolean compareRevNumbers) throws Exception {
             
             PlaceTermGroupList originalTermList = original.getPlaceTermGroupList();
             Assert.assertNotNull(originalTermList);
@@ -417,6 +418,10 @@ public class PlaceAuthorityServiceTest extends AbstractAuthorityServiceTest<Plac
             Assert.assertEquals(updatedTerms.get(0).getTermDisplayName(),
                 originalTerms.get(0).getTermDisplayName(),
                 "Value in updated record did not match submitted data.");
+            
+            if (compareRevNumbers == true) {
+               Assert.assertEquals(original.getRev(), updated.getRev(), "Revision numbers should match.");
+            }
        }
 
        @Override

diff --git a/services/taxonomy/client/src/test/java/org/collectionspace/services/client/test/TaxonomyAuthorityServiceTest.java b/services/taxonomy/client/src/test/java/org/collectionspace/services/client/test/TaxonomyAuthorityServiceTest.java
index e9ec75758192c5896d07c034f8adbb5def0c382e..f35c152e377daef36149bc8c76dc2ba11187ebfb 100644 (file)
--- a/services/taxonomy/client/src/test/java/org/collectionspace/services/client/test/TaxonomyAuthorityServiceTest.java
+++ b/services/taxonomy/client/src/test/java/org/collectionspace/services/client/test/TaxonomyAuthorityServiceTest.java
@@ -419,7 +419,8 @@ public class TaxonomyAuthorityServiceTest extends AbstractAuthorityServiceTest<T
 
     @Override
     protected void compareUpdatedItemInstances(TaxonCommon original,
-            TaxonCommon updated) throws Exception {
+            TaxonCommon updated,
+                       boolean compareRevNumbers) throws Exception {
 
         TaxonTermGroupList originalTermList = original.getTaxonTermGroupList();
         Assert.assertNotNull(originalTermList);
@@ -436,6 +437,10 @@ public class TaxonomyAuthorityServiceTest extends AbstractAuthorityServiceTest<T
         Assert.assertEquals(updatedTerms.get(0).getTermDisplayName(),
                 originalTerms.get(0).getTermDisplayName(),
                 "Value in updated record did not match submitted data.");
+        
+        if (compareRevNumbers == true) {
+               Assert.assertEquals(original.getRev(), updated.getRev(), "Revision numbers should match.");
+        }
     }
 
     @Override

diff --git a/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java b/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java
index eefad4387db1a4699cf8c6862953821c35c1f6ce..07d3a0641caf5a7e181b8aef98ce040d076b145c 100644 (file)
--- a/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java
+++ b/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java
@@ -363,10 +363,15 @@ public class VocabularyServiceTest extends AbstractAuthorityServiceTest<Vocabula
 
        @Override
        protected void compareUpdatedItemInstances(VocabularyitemsCommon original,
-                       VocabularyitemsCommon updated) throws Exception {
+                       VocabularyitemsCommon updated,
+                       boolean compareRevNumbers) throws Exception {
         Assert.assertEquals(updated.getDisplayName(),
                        original.getDisplayName(),
                 "Display name in updated VocabularyItem did not match submitted data.");
+        
+        if (compareRevNumbers == true) {
+               Assert.assertEquals(original.getRev(), updated.getRev(), "Revision numbers should match.");
+        }
        }
 
        @Override

diff --git a/services/work/client/src/test/java/org/collectionspace/services/client/test/WorkAuthorityServiceTest.java b/services/work/client/src/test/java/org/collectionspace/services/client/test/WorkAuthorityServiceTest.java
index c9644d1a8985d5f672ea929df1d1b60013c8c626..9db7ed5f65b8bc6a3b83e02f4b3488e10e8cf2b0 100644 (file)
--- a/services/work/client/src/test/java/org/collectionspace/services/client/test/WorkAuthorityServiceTest.java
+++ b/services/work/client/src/test/java/org/collectionspace/services/client/test/WorkAuthorityServiceTest.java
@@ -258,37 +258,37 @@ public class WorkAuthorityServiceTest extends AbstractAuthorityServiceTest<Worka
      */
 
     @AfterClass(alwaysRun=true)
-    public void cleanUp() {
-        String noTest = System.getProperty("noTestCleanup");
-        if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Skipping Cleanup phase ...");
-            }
-            return;
-        }
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cleaning up temporary resources created for testing ...");
-        }
-        String parentResourceId;
-        String itemResourceId;
-        // Clean up contact resources.
-        WorkAuthorityClient client = new WorkAuthorityClient();
-        parentResourceId = knownResourceId;
-        // Clean up item resources.
-        for (Map.Entry<String, String> entry : allResourceItemIdsCreated.entrySet()) {
-            itemResourceId = entry.getKey();
-            parentResourceId = entry.getValue();
-            // Note: Any non-success responses from the delete operation
-            // below are ignored and not reported.
-            client.deleteItem(parentResourceId, itemResourceId).close();
-        }
-        // Clean up parent resources.
-        for (String resourceId : allResourceIdsCreated) {
-            // Note: Any non-success responses from the delete operation
-            // below are ignored and not reported.
-        client.delete(resourceId).close();
-        }
-    }
+       public void cleanUp() {
+               String noTest = System.getProperty("noTestCleanup");
+               if (Boolean.TRUE.toString().equalsIgnoreCase(noTest)) {
+                       if (logger.isDebugEnabled()) {
+                               logger.debug("Skipping Cleanup phase ...");
+                       }
+                       return;
+               }
+               if (logger.isDebugEnabled()) {
+                       logger.debug("Cleaning up temporary resources created for testing ...");
+               }
+               String parentResourceId;
+               String itemResourceId;
+               // Clean up contact resources.
+               WorkAuthorityClient client = new WorkAuthorityClient();
+               parentResourceId = knownResourceId;
+               // Clean up item resources.
+               for (Map.Entry<String, String> entry : allResourceItemIdsCreated.entrySet()) {
+                       itemResourceId = entry.getKey();
+                       parentResourceId = entry.getValue();
+                       // Note: Any non-success responses from the delete operation
+                       // below are ignored and not reported.
+                       client.deleteItem(parentResourceId, itemResourceId).close();
+               }
+               // Clean up parent resources.
+               for (String resourceId : allResourceIdsCreated) {
+                       // Note: Any non-success responses from the delete operation
+                       // below are ignored and not reported.
+                       client.delete(resourceId).close();
+               }
+       }
 
     // ---------------------------------------------------------------
     // Utility methods used by tests above
@@ -329,10 +329,9 @@ public class WorkAuthorityServiceTest extends AbstractAuthorityServiceTest<Worka
         return getItemServiceRootURL(parentResourceIdentifier) + "/" + itemResourceIdentifier;
     }
 
-        @Override
+    @Override
     public void authorityTests(String testName) {
         // TODO Auto-generated method stub
-        
     }
 
     //
@@ -389,41 +388,44 @@ public class WorkAuthorityServiceTest extends AbstractAuthorityServiceTest<Worka
     // Authority item specific overrides
     //
     
-    @Override
-    protected WorksCommon updateItemInstance(WorksCommon worksCommon) {
-                            
-            WorkTermGroupList termList = worksCommon.getWorkTermGroupList();
-            Assert.assertNotNull(termList);
-            List<WorkTermGroup> terms = termList.getWorkTermGroup();
-            Assert.assertNotNull(terms);
-            Assert.assertTrue(terms.size() > 0);
-            terms.get(0).setTermDisplayName("updated-" + terms.get(0).getTermDisplayName());
-            terms.get(0).setTermName("updated-" + terms.get(0).getTermName());
-            worksCommon.setWorkTermGroupList(termList);
-
-            return worksCommon;
-    }
+       @Override
+       protected WorksCommon updateItemInstance(WorksCommon worksCommon) {
 
-    @Override
-    protected void compareUpdatedItemInstances(WorksCommon original,
-            WorksCommon updated) throws Exception {
-            
-            WorkTermGroupList originalTermList = original.getWorkTermGroupList();
-            Assert.assertNotNull(originalTermList);
-            List<WorkTermGroup> originalTerms = originalTermList.getWorkTermGroup();
-            Assert.assertNotNull(originalTerms);
-            Assert.assertTrue(originalTerms.size() > 0);
-            
-            WorkTermGroupList updatedTermList = updated.getWorkTermGroupList();
-            Assert.assertNotNull(updatedTermList);
-            List<WorkTermGroup> updatedTerms = updatedTermList.getWorkTermGroup();
-            Assert.assertNotNull(updatedTerms);
-            Assert.assertTrue(updatedTerms.size() > 0);
-            
-            Assert.assertEquals(updatedTerms.get(0).getTermDisplayName(),
-                originalTerms.get(0).getTermDisplayName(),
-                "Value in updated record did not match submitted data.");
-    }
+               WorkTermGroupList termList = worksCommon.getWorkTermGroupList();
+               Assert.assertNotNull(termList);
+               List<WorkTermGroup> terms = termList.getWorkTermGroup();
+               Assert.assertNotNull(terms);
+               Assert.assertTrue(terms.size() > 0);
+               terms.get(0).setTermDisplayName("updated-" + terms.get(0).getTermDisplayName());
+               terms.get(0).setTermName("updated-" + terms.get(0).getTermName());
+               worksCommon.setWorkTermGroupList(termList);
+
+               return worksCommon;
+       }
+
+       @Override
+       protected void compareUpdatedItemInstances(WorksCommon original, WorksCommon updated, boolean compareRevNumbers)
+                       throws Exception {
+
+               WorkTermGroupList originalTermList = original.getWorkTermGroupList();
+               Assert.assertNotNull(originalTermList);
+               List<WorkTermGroup> originalTerms = originalTermList.getWorkTermGroup();
+               Assert.assertNotNull(originalTerms);
+               Assert.assertTrue(originalTerms.size() > 0);
+
+               WorkTermGroupList updatedTermList = updated.getWorkTermGroupList();
+               Assert.assertNotNull(updatedTermList);
+               List<WorkTermGroup> updatedTerms = updatedTermList.getWorkTermGroup();
+               Assert.assertNotNull(updatedTerms);
+               Assert.assertTrue(updatedTerms.size() > 0);
+
+               Assert.assertEquals(updatedTerms.get(0).getTermDisplayName(), originalTerms.get(0).getTermDisplayName(),
+                               "Value in updated record did not match submitted data.");
+
+               if (compareRevNumbers == true) {
+                       Assert.assertEquals(original.getRev(), updated.getRev(), "Revision numbers should match.");
+               }
+       }
 
     @Override
     protected void verifyReadItemInstance(WorksCommon item)