Adjusted Organization service tests to reflect changes that prevent more than one...

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 d2e5f688f22fabebbdd11cd01ead3fa4471d797e..8aa8b57b2fc1e7332e7acf84c0c99210d695e85e 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
@@ -65,7 +65,8 @@ import org.testng.annotations.Test;
  */
 public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest<OrgauthoritiesCommon, OrganizationsCommon> {
 
-    /** The logger. */
+    private static final int MAX_CONTACTS = 1;
+       /** The logger. */
     private final String CLASS_NAME = OrgAuthorityServiceTest.class.getName();
     private final Logger logger = LoggerFactory.getLogger(CLASS_NAME);
 
@@ -272,21 +273,6 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest<Orgaut
         return newID;
     }
 
-    /**
-     * Creates the contact list.
-     *
-     * @param testName the test name
-     * @throws Exception the exception
-     */
-    @Test(dataProvider = "testName", groups = {"createList"},
-               dependsOnMethods = {"createItemList"})
-    public void createContactList(String testName) throws Exception {
-        // Add contacts to the initially-created, known item record.
-        for (int j = 0; j < nItemsToCreateInList; j++) {
-            createContact(testName);
-        }
-    }
-
     // ---------------------------------------------------------------
     // CRUD tests : READ tests
     // ---------------------------------------------------------------
@@ -712,7 +698,7 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest<Orgaut
         // In addition, there will be 'nItemsToCreateInList'
         // additional items created by the createItemList test,
         // all associated with the same parent resource.
-        int nExpectedItems = nItemsToCreateInList + 1;
+        int nExpectedItems = MAX_CONTACTS;
         if (logger.isDebugEnabled()) {
             logger.debug(testName + ": Expected "
                     + nExpectedItems + " items; got: " + nItemsReturned);

diff --git a/services/pom.xml b/services/pom.xml
index 01fb2e2f4c3c77f4ba4d7a0860b0089cf8ed42bd..3c51e7acc8db3a90b180152f5c1a8c8f222b93bb 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -15,7 +15,7 @@
        <properties>
                <annox.version>0.5.0</annox.version>
                <jaxb2-basics.version>0.6.2</jaxb2-basics.version>
-               <maven-jaxb2-plugin.version>0.13.1</maven-jaxb2-plugin.version>
+               <maven-jaxb2-plugin.version>0.13.3</maven-jaxb2-plugin.version>
                <jaxb.version>2.2.11</jaxb.version>
                <resteasy.version>3.0.19.Final</resteasy.version>
                <mysql.driver.version>5.1.8</mysql.driver.version>