From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 4 Jun 2010 18:46:30 +0000 (+0000)
Subject: CSPACE-2077: Moved assertion that checks for number of authority references returned... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=05fc182371628c740b9719da86f28ddb7bd40e40;p=tmp%2Fjakarta-migration.git

CSPACE-2077: Moved assertion that checks for number of authority references returned out of a conditional block; added debug message for authrefs returned, in all AuthRefsTests of services.
---

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 b8103304b..d70ab4aad 100644
--- 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 d5b42d419..9b5ece86d 100644
--- 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 44bfb8314..e0c0cd917 100644
--- 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 3c80b2478..6845b0537 100644
--- 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 6b95b3ad3..d7c3670cb 100644
--- 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 a58dc1a6b..7fb6ad7f9 100644
--- 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 d9404fd9b..af7e80070 100644
--- 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!");
         }
     }