From: Aron Roberts Date: Fri, 21 May 2010 21:39:45 +0000 (+0000) Subject: CSPACE-384: Additional trivial cleanup of base classes in client test framework. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e5c2a1d31b7893b70acc98b42220790384d3aa34;p=tmp%2Fjakarta-migration.git CSPACE-384: Additional trivial cleanup of base classes in client test framework. --- diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java index bd0e1faf3..5d50a7394 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java +++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java @@ -23,8 +23,6 @@ */ package org.collectionspace.services.client.test; -//import java.util.List; - import java.util.ArrayList; import java.util.List; @@ -40,12 +38,19 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.Test; /** - * FIXME: http://issues.collectionspace.org/browse/CSPACE-1685 - * AbstractServiceTest, abstract base class for the client tests to be performed - * to test an entity or relation service. + * AbstractServiceTest. + * + * Abstract base class for client tests of entity and relation services. + * Abstract methods are provided for a set of CRUD + List tests to be invoked. * * For Javadoc descriptions of this class's methods, see the ServiceTest interface. + * + * $LastChangedRevision$ + * $LastChangedDate$ */ + +// FIXME: http://issues.collectionspace.org/browse/CSPACE-1685 + public abstract class AbstractServiceTestImpl extends BaseServiceTest implements ServiceTest { /** The logger. */ diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java b/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java index 9c47fc20f..cb055a641 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java +++ b/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java @@ -1,14 +1,4 @@ -/** - * BaseServiceTest.java - * - * {Purpose of This Class} - * - * {Other Notes Relating to This Class (Optional)} - * - * $LastChangedBy: $ - * $LastChangedRevision: $ - * $LastChangedDate: $ - * +/** * This document is a part of the source code and related artifacts * for CollectionSpace, an open source collections management system * for museums and related institutions: @@ -16,13 +6,20 @@ * http://www.collectionspace.org * http://wiki.collectionspace.org * - * Copyright © 2009 {Contributing Institution} + * Copyright (c) 2009 Regents of the University of California * * Licensed under the Educational Community License (ECL), Version 2.0. * You may not use this file except in compliance with this License. * * You may obtain a copy of the ECL 2.0 License at + * * https://source.collectionspace.org/collection-space/LICENSE.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.collectionspace.services.client.test; @@ -31,7 +28,6 @@ import java.io.File; import java.io.InputStream; import java.io.StringWriter; import java.lang.reflect.Method; -//import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.MultivaluedMap; @@ -63,10 +59,16 @@ import org.collectionspace.services.client.CollectionSpaceClient; import org.collectionspace.services.jaxb.AbstractCommonList; /** - * FIXME: http://issues.collectionspace.org/browse/CSPACE-1685 - * The Class BaseServiceTest. - * @param + * BaseServiceTest. + * + * Base abstract class on which client tests of services are based. + * + * $LastChangedRevision$ + * $LastChangedDate$ */ + +// FIXME: http://issues.collectionspace.org/browse/CSPACE-1685 + public abstract class BaseServiceTest { //Maven's base directory -i.e., the one containing the current pom.xml