CSPACE-2077: Moved assertion that checks for number of authority references returned...

diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
index b8103304bfc09cb0c46fc3aa7870b026e9f41eb8..d70ab4aad376ec6c4ed01ae577cee310b5cdc785 100644 (file)
--- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
+++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
@@ -247,11 +247,19 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest {
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
         AuthorityRefList list = res2.getEntity();
 
+        List<AuthorityRefList.AuthorityRefItem> items = list.getAuthorityRefItem();
+        int numAuthRefsFound = items.size();
+        if(logger.isDebugEnabled()){
+            logger.debug("Expected " + NUM_AUTH_REFS_EXPECTED +
+                " authority references, found " + numAuthRefsFound);
+        }
+        Assert.assertEquals(numAuthRefsFound, NUM_AUTH_REFS_EXPECTED,
+            "Did not find all expected authority references! " +
+            "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound);
+
         // Optionally output additional data about list members for debugging.
         boolean iterateThroughList = true;
         if(iterateThroughList && logger.isDebugEnabled()){
-            List<AuthorityRefList.AuthorityRefItem> items =
-                    list.getAuthorityRefItem();
             int i = 0;
             for(AuthorityRefList.AuthorityRefItem item : items){
                 logger.debug(testName + ": list-item[" + i + "] Field:" +
@@ -264,7 +272,6 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest {
                         item.getUri());
                 i++;
             }
-            Assert.assertEquals(i, NUM_AUTH_REFS_EXPECTED, "Did not find all authrefs!");
         }
     }
 

diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
index d5b42d41979766f49c750ddbfcc5c4f78203facb..9b5ece86d8bb17dcedee96741e77c6d036f32ad9 100644 (file)
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
@@ -289,12 +289,20 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
                 invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
         AuthorityRefList list = res2.getEntity();
+        
+        List<AuthorityRefList.AuthorityRefItem> items = list.getAuthorityRefItem();
+        int numAuthRefsFound = items.size();
+        if(logger.isDebugEnabled()){
+            logger.debug("Expected " + NUM_AUTH_REFS_EXPECTED +
+                " authority references, found " + numAuthRefsFound);
+        }
+        Assert.assertEquals(numAuthRefsFound, NUM_AUTH_REFS_EXPECTED,
+            "Did not find all expected authority references! " +
+            "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound);
 
         // Optionally output additional data about list members for debugging.
         boolean iterateThroughList = true;
-        if(iterateThroughList && logger.isDebugEnabled()){
-            List<AuthorityRefList.AuthorityRefItem> items =
-                    list.getAuthorityRefItem();
+        if(iterateThroughList && logger.isDebugEnabled()){;
             int i = 0;
             for(AuthorityRefList.AuthorityRefItem item : items){
                 logger.debug(testName + ": list-item[" + i + "] Field:" +
@@ -307,7 +315,6 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
                         item.getUri());
                 i++;
             }
-            Assert.assertEquals(i, NUM_AUTH_REFS_EXPECTED, "Did not find all authrefs!");
         }
     }
 

diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java
index 44bfb8314914635a694f7fd8bce26c38ec89d674..e0c0cd917de0091e089a839cf3262b4626870fe1 100644 (file)
--- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java
+++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java
@@ -257,12 +257,20 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
                 invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
         AuthorityRefList list = res2.getEntity();
+        
+        List<AuthorityRefList.AuthorityRefItem> items = list.getAuthorityRefItem();
+        int numAuthRefsFound = items.size();
+        if(logger.isDebugEnabled()){
+            logger.debug("Expected " + NUM_AUTH_REFS_EXPECTED +
+                " authority references, found " + numAuthRefsFound);
+        }
+        Assert.assertEquals(numAuthRefsFound, NUM_AUTH_REFS_EXPECTED,
+            "Did not find all expected authority references! " +
+            "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound);
 
         // Optionally output additional data about list members for debugging.
         boolean iterateThroughList = true;
         if(iterateThroughList && logger.isDebugEnabled()){
-            List<AuthorityRefList.AuthorityRefItem> items =
-                    list.getAuthorityRefItem();
             int i = 0;
             for(AuthorityRefList.AuthorityRefItem item : items){
                 logger.debug(testName + ": list-item[" + i + "] Field:" +
@@ -275,7 +283,6 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
                         item.getUri());
                 i++;
             }
-            Assert.assertEquals(i, NUM_AUTH_REFS_EXPECTED, "Did not find all authrefs!");
         }
     }
 

diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
index 3c80b24783c9ef87d59600d39c375805b0f0dcd0..6845b0537ec91f3b69e43680558181ec3e72a219 100644 (file)
--- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
+++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
@@ -262,12 +262,20 @@ public class LoaninAuthRefsTest extends BaseServiceTest {
                 invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
         AuthorityRefList list = res2.getEntity();
+        
+        List<AuthorityRefList.AuthorityRefItem> items = list.getAuthorityRefItem();
+        int numAuthRefsFound = items.size();
+        if(logger.isDebugEnabled()){
+            logger.debug("Expected " + NUM_AUTH_REFS_EXPECTED +
+                " authority references, found " + numAuthRefsFound);
+        }
+        Assert.assertEquals(numAuthRefsFound, NUM_AUTH_REFS_EXPECTED,
+            "Did not find all expected authority references! " +
+            "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound);
 
         // Optionally output additional data about list members for debugging.
         boolean iterateThroughList = true;
         if(iterateThroughList && logger.isDebugEnabled()){
-            List<AuthorityRefList.AuthorityRefItem> items =
-                    list.getAuthorityRefItem();
             int i = 0;
             for(AuthorityRefList.AuthorityRefItem item : items){
                 logger.debug(testName + ": list-item[" + i + "] Field:" +
@@ -280,7 +288,6 @@ public class LoaninAuthRefsTest extends BaseServiceTest {
                         item.getUri());
                 i++;
             }
-            Assert.assertEquals(i, NUM_AUTH_REFS_EXPECTED, "Did not find all authrefs!");
         }
     }
 

diff --git a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java
index 6b95b3ad3bd773709924329a638cf716dbf9e2aa..d7c3670cb9669470c3ed51b53732e94986ea854d 100644 (file)
--- a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java
+++ b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java
@@ -256,11 +256,19 @@ public class LoanoutAuthRefsTest extends BaseServiceTest {
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
         AuthorityRefList list = res2.getEntity();
 
+        List<AuthorityRefList.AuthorityRefItem> items = list.getAuthorityRefItem();
+        int numAuthRefsFound = items.size();
+        if(logger.isDebugEnabled()){
+            logger.debug("Expected " + NUM_AUTH_REFS_EXPECTED +
+                " authority references, found " + numAuthRefsFound);
+        }
+        Assert.assertEquals(numAuthRefsFound, NUM_AUTH_REFS_EXPECTED,
+            "Did not find all expected authority references! " +
+            "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound);
+            
         // Optionally output additional data about list members for debugging.
         boolean iterateThroughList = true;
         if(iterateThroughList && logger.isDebugEnabled()){
-            List<AuthorityRefList.AuthorityRefItem> items =
-                    list.getAuthorityRefItem();
             int i = 0;
             for(AuthorityRefList.AuthorityRefItem item : items){
                 logger.debug(testName + ": list-item[" + i + "] Field:" +
@@ -273,7 +281,6 @@ public class LoanoutAuthRefsTest extends BaseServiceTest {
                         item.getUri());
                 i++;
             }
-            Assert.assertEquals(i, NUM_AUTH_REFS_EXPECTED, "Did not find all authrefs!");
         }
     }
 

diff --git a/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementAuthRefsTest.java b/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementAuthRefsTest.java
index a58dc1a6bc7afef91b314bb1f13f50fb57f98c1f..7fb6ad7f9b0a7559d03d6080651bcb973c79ae42 100644 (file)
--- a/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementAuthRefsTest.java
+++ b/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementAuthRefsTest.java
@@ -242,12 +242,20 @@ public class MovementAuthRefsTest extends BaseServiceTest {
                 invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
         AuthorityRefList list = res2.getEntity();
+        
+        List<AuthorityRefList.AuthorityRefItem> items = list.getAuthorityRefItem();
+        int numAuthRefsFound = items.size();
+        if(logger.isDebugEnabled()){
+            logger.debug("Expected " + NUM_AUTH_REFS_EXPECTED +
+                " authority references, found " + numAuthRefsFound);
+        }
+        Assert.assertEquals(numAuthRefsFound, NUM_AUTH_REFS_EXPECTED,
+            "Did not find all expected authority references! " +
+            "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound);
 
         // Optionally output additional data about list members for debugging.
         boolean iterateThroughList = true;
         if(iterateThroughList && logger.isDebugEnabled()){
-            List<AuthorityRefList.AuthorityRefItem> items =
-                    list.getAuthorityRefItem();
             int i = 0;
             for(AuthorityRefList.AuthorityRefItem item : items){
                 logger.debug(testName + ": list-item[" + i + "] Field:" +
@@ -260,7 +268,6 @@ public class MovementAuthRefsTest extends BaseServiceTest {
                         item.getUri());
                 i++;
             }
-            Assert.assertEquals(i, NUM_AUTH_REFS_EXPECTED, "Did not find all authrefs!");
         }
     }
 

diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java
index d9404fd9bb0b1a878cc42b06937f11e828a2babc..af7e800703ba67d6f95445c471568e9fbaed9833 100644 (file)
--- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java
+++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java
@@ -316,12 +316,20 @@ public class OrgAuthorityAuthRefsTest extends BaseServiceTest {
             invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
         AuthorityRefList list = res2.getEntity();
+        
+        List<AuthorityRefList.AuthorityRefItem> items = list.getAuthorityRefItem();
+        int numAuthRefsFound = items.size();
+        if(logger.isDebugEnabled()){
+            logger.debug("Expected " + NUM_AUTH_REFS_EXPECTED +
+                " authority references, found " + numAuthRefsFound);
+        }
+        Assert.assertEquals(numAuthRefsFound, NUM_AUTH_REFS_EXPECTED,
+            "Did not find all expected authority references! " +
+            "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound);
 
         // Optionally output additional data about list members for debugging.
         boolean iterateThroughList = true;
         if(iterateThroughList && logger.isDebugEnabled()){
-            List<AuthorityRefList.AuthorityRefItem> items =
-                list.getAuthorityRefItem();
             int i = 0;
             for(AuthorityRefList.AuthorityRefItem item : items){
                 logger.debug(testName + ": list-item[" + i + "] Field:" +
@@ -333,7 +341,6 @@ public class OrgAuthorityAuthRefsTest extends BaseServiceTest {
                     item.getUri());
                 i++;
             }
-            Assert.assertEquals(i, NUM_AUTH_REFS_EXPECTED, "Did not find all authrefs!");
         }
     }