From 253f09220123a78e0d1251a70f4fce41df943dd8 Mon Sep 17 00:00:00 2001 From: remillet Date: Sun, 24 Apr 2016 21:33:38 -0700 Subject: [PATCH] CSPACE-6937-A: Starting process of adding SAS specific tests. --- .../services/client/AccountClient.java | 8 + .../services/client/AccountRoleClient.java | 8 + .../client/test/AccountRoleServiceTest.java | 5 + .../client/test/AccountServiceTest.java | 9 +- .../services/client/AcquisitionClient.java | 8 + .../client/test/AcquisitionAuthRefsTest.java | 9 +- .../client/test/AcquisitionServiceTest.java | 11 +- .../common/vocabulary/AuthorityResource.java | 2 +- .../AuthorityItemDocumentModelHandler.java | 8 +- .../services/client/PermissionClient.java | 11 +- .../services/client/PermissionRoleClient.java | 10 ++ .../services/client/RoleClient.java | 11 +- .../services/client/RolePermissionClient.java | 12 +- .../test/PermissionRoleServiceTest.java | 10 +- .../client/test/PermissionServiceTest.java | 10 +- .../test/RolePermissionServiceTest.java | 11 +- .../client/test/RoleServiceTest.java | 7 +- .../services/client/BatchClient.java | 8 + .../client/test/BatchServiceTest.java | 15 +- .../services/client/BlobClient.java | 8 + .../client/test/BlobAuthRefsTest.java | 9 +- .../services/client/test/BlobScaleTest.java | 7 +- .../services/client/test/BlobServiceTest.java | 7 +- .../client/CitationAuthorityClient.java | 11 ++ .../test/CitationAuthorityServiceTest.java | 13 +- ...bstractCommonListPoxServiceClientImpl.java | 8 + .../client/AbstractPoxServiceClientImpl.java | 10 +- .../client/AbstractServiceClientImpl.java | 162 ++++++++++++------ .../services/client/AuthorityClientImpl.java | 18 +- .../client/CollectionSpaceClient.java | 2 + .../test/AbstractAuthorityServiceTest.java | 39 ++++- .../services/client/test/BaseServiceTest.java | 7 + .../collectionspace-client.properties | 19 +- .../sas-collectionspace-client.properties | 13 ++ .../client/CollectionObjectClient.java | 10 +- .../test/CollectionObjectAuthRefsTest.java | 9 +- .../test/CollectionObjectSearchTest.java | 6 + .../test/CollectionObjectServiceTest.java | 12 +- .../client/ConceptAuthorityClient.java | 11 ++ .../test/ConceptAuthorityServiceTest.java | 13 +- .../services/client/ConditioncheckClient.java | 10 +- .../test/ConditioncheckAuthRefsTest.java | 11 +- .../test/ConditioncheckServiceTest.java | 8 +- .../services/client/ConservationClient.java | 10 +- .../client/test/ConservationAuthRefsTest.java | 12 +- .../client/test/ConservationServiceTest.java | 9 +- .../AuthorityWithContactsClientImpl.java | 10 +- .../services/client/ContactClient.java | 10 +- .../client/test/ContactServiceTest.java | 14 +- .../services/client/DimensionClient.java | 8 + .../client/test/DimensionServiceTest.java | 7 +- .../services/client/ExhibitionClient.java | 10 +- .../client/test/ExhibitionServiceTest.java | 12 +- .../services/client/GroupClient.java | 8 + .../client/test/GroupServiceTest.java | 15 +- .../services/client/IdClient.java | 11 +- .../services/id/IdServiceTest.java | 13 +- .../services/client/IntakeClient.java | 10 +- .../client/test/IntakeAuthRefsTest.java | 11 +- .../client/test/IntakeServiceTest.java | 5 + .../test/OrganizationAuthRefDocsTest.java | 12 +- .../client/test/PersonAuthRefDocsTest.java | 13 +- .../services/client/LoaninClient.java | 10 +- .../client/test/LoaninAuthRefsTest.java | 10 +- .../client/test/LoaninServiceTest.java | 8 +- .../services/client/LoanoutClient.java | 10 +- .../client/test/LoanoutAuthRefsTest.java | 6 +- .../client/test/LoanoutServiceTest.java | 10 +- .../client/LocationAuthorityClient.java | 11 ++ .../client/LocationAuthorityClientUtils.java | 1 - .../test/LocationAuthorityServiceTest.java | 15 +- .../client/MaterialAuthorityClient.java | 11 ++ .../client/MaterialAuthorityClientUtils.java | 6 +- .../test/MaterialAuthorityServiceTest.java | 17 +- .../services/client/MediaClient.java | 10 +- .../client/test/MediaAuthRefsTest.java | 9 +- .../client/test/MediaServiceTest.java | 9 +- .../client/test/MovementAuthRefsTest.java | 10 +- .../client/test/MovementServiceTest.java | 23 ++- .../client/test/MovementSortByTest.java | 9 +- .../services/client/ObjectExitClient.java | 10 +- .../client/test/ObjectExitAuthRefsTest.java | 9 +- .../client/test/ObjectExitServiceTest.java | 12 +- .../services/client/OrgAuthorityClient.java | 16 ++ .../client/test/OrgAuthorityAuthRefsTest.java | 10 +- .../client/test/OrgAuthorityServiceTest.java | 17 +- .../client/PersonAuthorityClient.java | 17 +- .../test/PersonAuthoritySearchTest.java | 11 +- .../test/PersonAuthorityServicePerfTest.java | 11 +- .../test/PersonAuthorityServiceTest.java | 71 +++++--- .../services/client/PlaceAuthorityClient.java | 11 ++ .../test/PlaceAuthorityServiceTest.java | 20 ++- .../services/client/PublicItemClient.java | 10 +- .../client/test/PublicItemServiceTest.java | 8 +- .../services/client/RelationClient.java | 8 + .../client/test/RelationServiceTest.java | 8 +- .../services/client/ReportClient.java | 10 +- .../client/test/ReportServiceTest.java | 9 +- .../test/AuthenticationServiceTest.java | 9 +- .../client/test/AuthorizationServiceTest.java | 8 +- .../client/test/MultiTenancyTest.java | 9 +- .../services/client/ServiceGroupClient.java | 8 + .../client/test/ServiceGroupServiceTest.java | 13 +- .../client/TaxonomyAuthorityClient.java | 11 ++ .../test/TaxonomyAuthorityServiceTest.java | 19 +- .../client/ValuationcontrolClient.java | 10 +- .../test/ValuationcontrolServiceTest.java | 15 +- .../services/client/VocabularyClient.java | 11 ++ .../client/test/VocabularyServiceTest.java | 16 +- .../services/client/WorkAuthorityClient.java | 11 ++ .../client/test/WorkAuthorityServiceTest.java | 16 +- .../client/test/WorkflowServiceTest.java | 8 +- 112 files changed, 1013 insertions(+), 400 deletions(-) create mode 100644 services/client/src/main/resources/sas-collectionspace-client.properties diff --git a/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java b/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java index 9f74353e0..738ff3aa0 100644 --- a/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java +++ b/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java @@ -43,6 +43,14 @@ public class AccountClient extends AbstractServiceClientImpl { public static final String SERVICE_NAME = "accountroles"; + public AccountRoleClient() { + super(); + } + + public AccountRoleClient(String clientPropertiesFilename) { + super(clientPropertiesFilename); + } + @Override public String getServiceName() { return AccountRoleClient.SERVICE_NAME; diff --git a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java index c31019d4b..aead4d2c9 100644 --- a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java +++ b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java @@ -136,6 +136,11 @@ public class AccountRoleServiceTest extends AbstractServiceTestImpl protected CollectionSpaceClient getClientInstance() { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } + + + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse) diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java index e8dfa70ab..c6012e830 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java @@ -23,6 +23,7 @@ package org.collectionspace.services.client.test; import java.util.List; + import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -34,17 +35,14 @@ import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.api.GregorianCalendarDateTimeUtils; import org.collectionspace.services.jaxb.AbstractCommonList; - import org.collectionspace.services.acquisition.AcquisitionsCommon; import org.collectionspace.services.acquisition.AcquisitionDateGroupList; import org.collectionspace.services.acquisition.AcquisitionSourceList; import org.collectionspace.services.acquisition.OwnerList; -import org.jboss.resteasy.client.ClientResponse; import org.collectionspace.services.acquisition.StructuredDateGroup; import org.testng.Assert; import org.testng.annotations.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,6 +81,11 @@ public class AcquisitionServiceTest extends AbstractPoxServiceTestImpl Response result = null; ServiceContext ctx = createServiceContext(getItemServiceName(), existingCtx.getUriInfo()); - if (existingCtx != null) { + if (existingCtx != null && existingCtx.getCurrentRepositorySession() != null) { ctx.setCurrentRepositorySession(existingCtx.getCurrentRepositorySession()); ctx.setProperties(existingCtx.getProperties()); } diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java index 4153c69cf..3e1f19200 100644 --- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java +++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java @@ -473,7 +473,7 @@ public abstract class AuthorityItemDocumentModelHandler } } // - // If the workflow states are different, we need to update the local's to reflects the remote's + // Check to see if we need to update the local items's workflow state to reflect that of the remote's // List transitionList = getTransitionList(sasWorkflowState, localItemWorkflowState); if (transitionList.isEmpty() == false) { @@ -504,8 +504,10 @@ public abstract class AuthorityItemDocumentModelHandler /** * We need to move the local item to the SAS workflow state. This might involve multiple transitions. - * See table at https://wiki.collectionspace.org/pages/viewpage.action?pageId=162496556 - * @throws DocumentException + * + * WIKI: + * See table at https://wiki.collectionspace.org/pages/viewpage.action?pageId=162496564 + * */ private List getTransitionList(String sasWorkflowState, String localItemWorkflowState) throws DocumentException { List result = new ArrayList(); diff --git a/services/authorization-mgt/client/src/main/java/org/collectionspace/services/client/PermissionClient.java b/services/authorization-mgt/client/src/main/java/org/collectionspace/services/client/PermissionClient.java index 5517119dd..97ee6de56 100644 --- a/services/authorization-mgt/client/src/main/java/org/collectionspace/services/client/PermissionClient.java +++ b/services/authorization-mgt/client/src/main/java/org/collectionspace/services/client/PermissionClient.java @@ -41,7 +41,16 @@ public class PermissionClient extends AbstractServiceClientImpl { + + public PermissionRoleClient() { + super(); + } + + public PermissionRoleClient(String clientPropertiesFilename) { + super(clientPropertiesFilename); + } + @Override public String getServiceName() { throw new UnsupportedOperationException(); //FIXME: REM - http://issues.collectionspace.org/browse/CSPACE-3497 diff --git a/services/authorization-mgt/client/src/main/java/org/collectionspace/services/client/RoleClient.java b/services/authorization-mgt/client/src/main/java/org/collectionspace/services/client/RoleClient.java index 69f8abb96..ce0bab706 100644 --- a/services/authorization-mgt/client/src/main/java/org/collectionspace/services/client/RoleClient.java +++ b/services/authorization-mgt/client/src/main/java/org/collectionspace/services/client/RoleClient.java @@ -29,6 +29,7 @@ package org.collectionspace.services.client; import javax.ws.rs.core.Response; + import org.collectionspace.services.authorization.AccountRole; import org.collectionspace.services.authorization.Role; import org.collectionspace.services.authorization.RolesList; @@ -45,7 +46,15 @@ public class RoleClient extends AbstractServiceClientImpl { - @Override + + public RolePermissionClient() { + super(); + } + + public RolePermissionClient(String clientPropertiesFilename) { + super(clientPropertiesFilename); + } + + @Override public String getServiceName() { throw new UnsupportedOperationException(); //FIXME: REM - http://issues.collectionspace.org/browse/CSPACE-3498 } diff --git a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionRoleServiceTest.java b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionRoleServiceTest.java index 608e3d215..9873aa3f2 100644 --- a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionRoleServiceTest.java +++ b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionRoleServiceTest.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Hashtable; import java.util.List; + import javax.ws.rs.core.Response; import org.collectionspace.services.authorization.perms.EffectType; @@ -35,7 +36,6 @@ import org.collectionspace.services.authorization.PermissionRole; import org.collectionspace.services.authorization.PermissionValue; import org.collectionspace.services.authorization.Role; import org.collectionspace.services.authorization.RoleValue; - import org.collectionspace.services.client.CollectionSpaceClient; import org.collectionspace.services.client.PermissionClient; import org.collectionspace.services.client.PermissionFactory; @@ -43,13 +43,10 @@ import org.collectionspace.services.client.PermissionRoleClient; import org.collectionspace.services.client.PermissionRoleFactory; import org.collectionspace.services.client.RoleClient; import org.collectionspace.services.client.RoleFactory; - import org.collectionspace.services.client.test.AbstractServiceTestImpl; -import org.collectionspace.services.client.test.ServiceRequestType; import org.testng.Assert; import org.testng.annotations.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; @@ -150,6 +147,11 @@ public class PermissionRoleServiceTest extends AbstractServiceTestImpl @@ -70,6 +62,11 @@ public class BatchServiceTest extends AbstractPoxServiceTestImpl { protected CollectionSpaceClient getClientInstance() { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } + + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } @Override protected AbstractCommonList getCommonList(Response response) { diff --git a/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobScaleTest.java b/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobScaleTest.java index b03b84de5..c0caf6b2e 100644 --- a/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobScaleTest.java +++ b/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobScaleTest.java @@ -44,6 +44,11 @@ public class BlobScaleTest extends BaseServiceTest { return new BlobClient(); } + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + return new BlobClient(clientPropertiesFilename); + } + @Override protected String getServicePathComponent() { return BlobClient.SERVICE_PATH_COMPONENT; @@ -173,6 +178,4 @@ public class BlobScaleTest extends BaseServiceTest { public int random(int min, int max) { return min + (int)(generator.nextFloat() * ((max - min) + 1)); } - - } diff --git a/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobServiceTest.java b/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobServiceTest.java index 2f95c99ef..b767284da 100644 --- a/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobServiceTest.java +++ b/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobServiceTest.java @@ -41,11 +41,9 @@ import org.collectionspace.services.blob.MeasuredPartGroup; import org.testng.Assert; import org.testng.annotations.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput; import org.jboss.resteasy.plugins.providers.multipart.OutputPart; @@ -88,6 +86,11 @@ public class BlobServiceTest extends AbstractPoxServiceTestImpl implements CollectionSpacePoxClient { - @Override + public AbstractPoxServiceClientImpl(String clientPropertiesFilename) { + super(clientPropertiesFilename); + } + + public AbstractPoxServiceClientImpl() { + super(); + } + + @Override public Response create(PoxPayloadOut xmlPayload) { return getProxy().create(xmlPayload.getBytes()); } diff --git a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java index 64c948d1c..d72a9d854 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java @@ -26,6 +26,7 @@ package org.collectionspace.services.client; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; @@ -130,6 +131,51 @@ public abstract class AbstractServiceClientImpl { */ abstract protected CollectionSpaceClient getClientInstance(); + /** + * Gets the client. + * + * @return the client + */ + abstract protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename); + /* * Subclasses can override this method to return their AbstractCommonList subclass */ diff --git a/services/client/src/main/resources/collectionspace-client.properties b/services/client/src/main/resources/collectionspace-client.properties index d077dd6be..80e23d4ae 100644 --- a/services/client/src/main/resources/collectionspace-client.properties +++ b/services/client/src/main/resources/collectionspace-client.properties @@ -1,18 +1,13 @@ -#url of the collectionspace server +# +# URL of the CollectionSpace server and user credentials +# cspace.url=http://localhost:8180/cspace-services/ -#cspace.url=http://qa.collectionspace.org:8180/cspace-services/ - -#cspace.url=http://localhost:8200/cspace-services/ -#for sockspy: -#cspace.url=http://localhost:8280/cspace-services/ - cspace.ssl=false cspace.auth=true -# default user -#cspace.user=admin@core.collectionspace.org -cspace.user=admin@testsci.collectionspace.org +cspace.user=admin@core.collectionspace.org cspace.password=Administrator -# default tenant +# +# default tenant information +# cspace.tenant=1 -# the tenantID of the numbered tenant: cspace.tenantID=core.collectionspace.org \ No newline at end of file diff --git a/services/client/src/main/resources/sas-collectionspace-client.properties b/services/client/src/main/resources/sas-collectionspace-client.properties new file mode 100644 index 000000000..a4e246213 --- /dev/null +++ b/services/client/src/main/resources/sas-collectionspace-client.properties @@ -0,0 +1,13 @@ +# +# URL of the CollectionSpace server and user credentials +# +cspace.url=http://localhost:8180/cspace-services/ +cspace.ssl=false +cspace.auth=true +cspace.user=admin@testsci.collectionspace.org +cspace.password=Administrator +# +# default tenant information +# +cspace.tenant=2 +cspace.tenantID=testsci.collectionspace.org \ No newline at end of file diff --git a/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java b/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java index fbce0537f..f6cf4f603 100644 --- a/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java +++ b/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java @@ -47,7 +47,15 @@ public class CollectionObjectClient extends AbstractCommonListPoxServiceClientIm public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME; public static final String SERVICE_COMMON_PART_NAME = SERVICE_NAME + PART_LABEL_SEPARATOR + PART_COMMON_LABEL; - @Override + public CollectionObjectClient() { + super(); + } + + public CollectionObjectClient(String clientPropertiesFilename) { + super(clientPropertiesFilename); + } + + @Override public String getServiceName() { return SERVICE_NAME; } 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 6cfecef6f..9e7383129 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 @@ -56,12 +56,9 @@ import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.organization.OrgTermGroup; import org.collectionspace.services.person.PersonTermGroup; -import org.jboss.resteasy.client.ClientResponse; - import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -78,6 +75,11 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest getCommonListType() { return AbstractCommonList.class; } + } diff --git a/services/conservation/client/src/test/java/org/collectionspace/services/client/test/ConservationServiceTest.java b/services/conservation/client/src/test/java/org/collectionspace/services/client/test/ConservationServiceTest.java index b4b505685..1cdd51b22 100644 --- a/services/conservation/client/src/test/java/org/collectionspace/services/client/test/ConservationServiceTest.java +++ b/services/conservation/client/src/test/java/org/collectionspace/services/client/test/ConservationServiceTest.java @@ -24,12 +24,12 @@ package org.collectionspace.services.client.test; //import java.util.ArrayList; import java.util.List; + import javax.ws.rs.core.Response; import org.collectionspace.services.client.AbstractCommonListUtils; import org.collectionspace.services.client.CollectionSpaceClient; import org.collectionspace.services.client.ConservationClient; - import org.collectionspace.services.client.PayloadInputPart; import org.collectionspace.services.client.PayloadOutputPart; import org.collectionspace.services.client.PoxPayloadIn; @@ -40,9 +40,7 @@ import org.collectionspace.services.conservation.ConservatorsList; import org.collectionspace.services.conservation.ConservationStatusGroup; import org.collectionspace.services.conservation.ConservationStatusGroupList; -import org.jboss.resteasy.client.ClientResponse; import org.testng.Assert; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,6 +72,11 @@ public class ConservationServiceTest extends AbstractPoxServiceTestImpl implements AuthorityWithContactsClient { + public AuthorityWithContactsClientImpl(String clientPropertiesFilename) { + super(clientPropertiesFilename); + } + + public AuthorityWithContactsClientImpl() { + super(); + } + @Override public Response createContact(String parentcsid, String itemcsid, PoxPayloadOut xmlPayload) { diff --git a/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java b/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java index d9e6488d8..c2d165d6c 100644 --- a/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java +++ b/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java @@ -33,7 +33,15 @@ public class ContactClient extends AbstractCommonListPoxServiceClientImpl getClientInstance() { return new GroupClient(); } - + + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + return new GroupClient(clientPropertiesFilename); + } + @Override protected AbstractCommonList getCommonList(Response response) { return response.readEntity(AbstractCommonList.class); @@ -84,7 +83,7 @@ public class GroupServiceTest extends AbstractPoxServiceTestImpl { protected CollectionSpaceClient getClientInstance() { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } + + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse) diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java index e95c8e67b..0a13b8a4a 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java @@ -68,6 +68,11 @@ public class IntakeServiceTest extends AbstractPoxServiceTestImpl { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } - /* (non-Javadoc) + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } + + /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse) */ @Override diff --git a/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java b/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java index f611c1aba..32d36c1f0 100644 --- a/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java +++ b/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java @@ -33,7 +33,15 @@ public class LoaninClient extends AbstractCommonListPoxServiceClientImpl { protected CollectionSpaceClient getClientInstance() { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } - + + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } + /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse) */ diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninServiceTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninServiceTest.java index 6b87d4e15..1eb2a7460 100644 --- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninServiceTest.java +++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninServiceTest.java @@ -24,6 +24,7 @@ package org.collectionspace.services.client.test; //import java.util.ArrayList; import java.util.List; + import javax.ws.rs.core.Response; import org.collectionspace.services.client.AbstractCommonListUtils; @@ -39,9 +40,7 @@ import org.collectionspace.services.loanin.LenderGroup; import org.collectionspace.services.loanin.LenderGroupList; import org.collectionspace.services.loanin.LoansinCommon; -import org.jboss.resteasy.client.ClientResponse; import org.testng.Assert; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,6 +73,11 @@ public class LoaninServiceTest extends AbstractPoxServiceTestImpl { protected CollectionSpaceClient getClientInstance() { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } + + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse) diff --git a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java index 36d00af2a..d0779dbce 100644 --- a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java +++ b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java @@ -23,7 +23,7 @@ package org.collectionspace.services.client.test; import java.util.List; -import javax.ws.rs.core.MediaType; + import javax.ws.rs.core.Response; import org.collectionspace.services.client.AbstractCommonListUtils; @@ -39,10 +39,7 @@ import org.collectionspace.services.loanout.LoanStatusGroup; import org.collectionspace.services.loanout.LoanStatusGroupList; import org.collectionspace.services.loanout.LoansoutCommon; -import org.jboss.resteasy.client.ClientResponse; - import org.testng.Assert; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,6 +67,11 @@ public class LoanoutServiceTest extends AbstractPoxServiceTestImpl shelf1Map = new HashMap(); // TODO Make loc type and status be controlled vocabs. shelf1Map.put(LocationJAXBSchema.SHORT_IDENTIFIER, TEST_SHORTID); @@ -136,7 +139,7 @@ public class LocationAuthorityServiceTest extends AbstractAuthorityServiceTest materialMap = new HashMap(); // TODO Make material type and status be controlled vocabs. materialMap.put(MaterialJAXBSchema.SHORT_IDENTIFIER, TEST_MATERIAL_SHORT_IDENTIFIER); @@ -128,7 +131,7 @@ public class MaterialAuthorityServiceTest extends AbstractAuthorityServiceTest { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } + @Override protected AbstractCommonList getCommonList(Response response) { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class diff --git a/services/media/client/src/test/java/org/collectionspace/services/client/test/MediaServiceTest.java b/services/media/client/src/test/java/org/collectionspace/services/client/test/MediaServiceTest.java index b690e1c86..3986cc09a 100644 --- a/services/media/client/src/test/java/org/collectionspace/services/client/test/MediaServiceTest.java +++ b/services/media/client/src/test/java/org/collectionspace/services/client/test/MediaServiceTest.java @@ -25,6 +25,7 @@ package org.collectionspace.services.client.test; import java.io.File; import java.net.URL; import java.util.List; + import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -37,13 +38,10 @@ import org.collectionspace.services.media.LanguageList; import org.collectionspace.services.media.MediaCommon; import org.collectionspace.services.media.SubjectList; -import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput; import org.jboss.resteasy.plugins.providers.multipart.OutputPart; - import org.testng.Assert; import org.testng.annotations.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,6 +93,11 @@ public class MediaServiceTest extends AbstractPoxServiceTestImpl { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } - /* (non-Javadoc) + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } + + /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse) */ @Override diff --git a/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementServiceTest.java b/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementServiceTest.java index 4a37cbcb1..8f48f2fa1 100644 --- a/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementServiceTest.java +++ b/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementServiceTest.java @@ -23,26 +23,18 @@ package org.collectionspace.services.client.test; import java.util.List; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import org.collectionspace.services.client.CollectionSpaceClient; import org.collectionspace.services.client.MovementClient; +import org.collectionspace.services.client.PayloadOutputPart; import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.movement.MovementsCommon; import org.collectionspace.services.movement.MovementMethodsList; - -import org.jboss.resteasy.client.ClientResponse; - -import org.collectionspace.services.client.AbstractCommonListUtils; -import org.collectionspace.services.client.PayloadInputPart; -import org.collectionspace.services.client.PayloadOutputPart; -import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.api.GregorianCalendarDateTimeUtils; + import org.testng.Assert; import org.testng.annotations.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,9 +55,8 @@ public class MovementServiceTest extends final String SERVICE_NAME = "movements"; final String SERVICE_PATH_COMPONENT = "movements"; - private final static String TIMESTAMP_UTC = GregorianCalendarDateTimeUtils - .timestampUTC(); - + private final static String TIMESTAMP_UTC = + GregorianCalendarDateTimeUtils.timestampUTC(); /* * (non-Javadoc) * @@ -257,4 +248,10 @@ public class MovementServiceTest extends public void CRUDTests(String testName) { // TODO Auto-generated method stub } + + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + // TODO Auto-generated method stub + return null; + } } diff --git a/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementSortByTest.java b/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementSortByTest.java index eb020ff11..0ce3a876e 100644 --- a/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementSortByTest.java +++ b/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementSortByTest.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Locale; + import javax.ws.rs.core.Response; import org.collectionspace.services.MovementJAXBSchema; @@ -40,13 +41,10 @@ import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.movement.MovementsCommon; import org.collectionspace.services.jaxb.AbstractCommonList; -import org.jboss.resteasy.client.ClientResponse; - import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,6 +84,11 @@ public class MovementSortByTest extends BaseServiceTest { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } + /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse) */ diff --git a/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java b/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java index d8f754aa7..acd23cc49 100644 --- a/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java +++ b/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java @@ -33,7 +33,15 @@ public class ObjectExitClient extends AbstractCommonListPoxServiceClientImpl throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } - @Override + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + throw new UnsupportedOperationException(); //method not supported (or needed) in this test class + } + + @Override protected AbstractCommonList getCommonList(Response response) { throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } diff --git a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitServiceTest.java b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitServiceTest.java index a42697e23..824163f06 100644 --- a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitServiceTest.java +++ b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitServiceTest.java @@ -25,24 +25,17 @@ package org.collectionspace.services.client.test; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.collectionspace.services.client.AbstractCommonListUtils; import org.collectionspace.services.client.CollectionSpaceClient; import org.collectionspace.services.client.ObjectExitClient; import org.collectionspace.services.client.PayloadOutputPart; -import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.objectexit.ObjectexitCommon; -import org.jboss.resteasy.client.ClientResponse; - import org.testng.Assert; -import org.testng.annotations.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * ObjectExitServiceTest, carries out tests against a deployed and running ObjectExit Service.

* $LastChangedRevision: $ @@ -69,6 +62,11 @@ public class ObjectExitServiceTest extends AbstractPoxServiceTestImpl testOrgMap = new HashMap(); @@ -173,7 +175,7 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest terms, Map itemRepeatableFieldProperties) { final String testName = "createItemInAuthority"; @@ -281,7 +282,9 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest entry : allResourceItemIdsCreated.entrySet()) { + itemResourceId = entry.getKey(); + parentResourceId = entry.getValue(); + // Note: Any non-success responses from the delete operation + // below are ignored and not reported. + Response response = client.deleteItem(parentResourceId, itemResourceId); + try { + int status = response.getStatus(); + if (status != Response.Status.OK.getStatusCode()) { + logger.debug(String.format("Could not deleted authority item '%s' in authority '%s'.", + itemResourceId, parentResourceId)); + } + } finally { + response.close(); + } + } + // Clean up item using the SAS client resources. + client = (PersonAuthorityClient) this.getSASClientInstance(); for (Map.Entry entry : allResourceItemIdsCreated.entrySet()) { itemResourceId = entry.getKey(); parentResourceId = entry.getValue(); @@ -1297,7 +1313,9 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest sanjoseMap = new HashMap(); // TODO Make place type and status be controlled vocabs. sanjoseMap.put(PlaceJAXBSchema.SHORT_IDENTIFIER, TEST_SHORTID); @@ -141,7 +144,7 @@ public class PlaceAuthorityServiceTest extends AbstractAuthorityServiceTest getCommonListType() { return (Class)RelationsCommonList.class; diff --git a/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java b/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java index f8ad53fc9..15f3b4794 100644 --- a/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java +++ b/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java @@ -55,7 +55,15 @@ public class ReportClient extends AbstractCommonListPoxServiceClientImpl getCommonListType() { // TODO Auto-generated method stub return null; - } + } } diff --git a/services/security/client/src/test/java/org/collectionspace/services/security/client/test/AuthorizationServiceTest.java b/services/security/client/src/test/java/org/collectionspace/services/security/client/test/AuthorizationServiceTest.java index 264d04445..04e5bbf6d 100644 --- a/services/security/client/src/test/java/org/collectionspace/services/security/client/test/AuthorizationServiceTest.java +++ b/services/security/client/src/test/java/org/collectionspace/services/security/client/test/AuthorizationServiceTest.java @@ -68,12 +68,10 @@ import org.collectionspace.services.client.test.BaseServiceTest; import org.collectionspace.services.dimension.DimensionsCommon; import org.collectionspace.services.intake.IntakesCommon; import org.collectionspace.services.jaxb.AbstractCommonList; - import org.testng.Assert; import org.testng.annotations.Test; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -236,6 +234,12 @@ public class AuthorizationServiceTest extends BaseServiceTest { protected CollectionSpaceClient getClientInstance() { return null; } + + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + return null; + } /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse) diff --git a/services/servicegroup/client/src/main/java/org/collectionspace/services/client/ServiceGroupClient.java b/services/servicegroup/client/src/main/java/org/collectionspace/services/client/ServiceGroupClient.java index 6a1904ff4..09eb8e1ae 100644 --- a/services/servicegroup/client/src/main/java/org/collectionspace/services/client/ServiceGroupClient.java +++ b/services/servicegroup/client/src/main/java/org/collectionspace/services/client/ServiceGroupClient.java @@ -33,6 +33,14 @@ public class ServiceGroupClient extends AbstractCommonListPoxServiceClientImpl return new ServiceGroupClient(); } + @Override + protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) { + return new ServiceGroupClient(clientPropertiesFilename); + } + @Override protected AbstractCommonList getCommonList(Response response) { return response.readEntity(AbstractCommonList.class); diff --git a/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java b/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java index 0c3542d8c..99a45d757 100644 --- a/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java +++ b/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java @@ -51,6 +51,17 @@ public class TaxonomyAuthorityClient extends AuthorityClientImpl getClientInstance(String clientPropertiesFilename) { + return new TaxonomyAuthorityClient(clientPropertiesFilename); + } + /** * Creates the item in authority. * @@ -118,7 +122,7 @@ public class TaxonomyAuthorityServiceTest extends AbstractAuthorityServiceTest taxonMap = new HashMap(); // Fields present in all authority records. @@ -166,7 +169,7 @@ public class TaxonomyAuthorityServiceTest extends AbstractAuthorityServiceTest itemInfo = new HashMap(); String shortId = createIdentifier(); itemInfo.put(AuthorityItemJAXBSchema.SHORT_IDENTIFIER, shortId); itemInfo.put(AuthorityItemJAXBSchema.DISPLAY_NAME, "display-" + shortId); result = VocabularyClientUtils.createItemInVocabulary(authorityId, - null /*knownResourceRefName*/, itemInfo, client); + null /*knownResourceRefName*/, itemInfo, (VocabularyClient) client); allResourceItemIdsCreated.put(result, authorityId); return result; @@ -100,13 +105,11 @@ public class VocabularyServiceTest extends AbstractAuthorityServiceTest workMap = new HashMap(); // TODO Make work type and status be controlled vocabs. workMap.put(WorkJAXBSchema.SHORT_IDENTIFIER, TEST_WORK_SHORT_IDENTIFIER); @@ -145,7 +149,7 @@ public class WorkAuthorityServiceTest extends AbstractAuthorityServiceTest