Menu
▾
▴
[ogsa-dai svn] SF.net SVN: ogsa-dai:[2094] ogsa-dai/trunk/server-tests/presentation/core/ src/test/ext/java/uk/org/ogsadai/test/server/ServerServiceTest.java
|
From: <amy...@us...> - 2012-08-13 14:35:07
|
Revision: 2094
http://ogsa-dai.svn.sourceforge.net/ogsa-dai/?rev=2094&view=rev
Author: amykrause
Date: 2012-08-13 14:34:59 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
Removed test for unused feature 'resolve' which is unsupported by Jersey presentation layer.
Removed Paths:
-------------
ogsa-dai/trunk/server-tests/presentation/core/src/test/ext/java/uk/org/ogsadai/test/server/ServerServiceTest.java
Deleted: ogsa-dai/trunk/server-tests/presentation/core/src/test/ext/java/uk/org/ogsadai/test/server/ServerServiceTest.java
===================================================================
--- ogsa-dai/trunk/server-tests/presentation/core/src/test/ext/java/uk/org/ogsadai/test/server/ServerServiceTest.java 2012-08-13 14:18:17 UTC (rev 2093)
+++ ogsa-dai/trunk/server-tests/presentation/core/src/test/ext/java/uk/org/ogsadai/test/server/ServerServiceTest.java 2012-08-13 14:34:59 UTC (rev 2094)
@@ -1,183 +0,0 @@
-// Copyright (c) The University of Edinburgh, 2007-2009.
-//
-// LICENCE-START
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-// LICENCE-END
-
-package uk.org.ogsadai.test.server;
-
-import junit.framework.TestCase;
-
-import uk.org.ogsadai.client.toolkit.DataRequestExecutionResource;
-import uk.org.ogsadai.client.toolkit.Server;
-import uk.org.ogsadai.client.toolkit.exception.ResourceUnknownException;
-import uk.org.ogsadai.resource.ResourceID;
-import uk.org.ogsadai.resource.ResourceType;
-import uk.org.ogsadai.test.server.ServerTestProperties;
-import uk.org.ogsadai.test.server.TestServerProxyFactory;
-import uk.org.ogsadai.test.server.Utility;
-import uk.org.ogsadai.util.xml.XML;
-
-/**
- * General server tests. This class expects
- * test properties to be provided in a file whose location is
- * specified in a system property,
- * <code>ogsadai.test.properties</code>. The following properties need
- * to be provided:
- * <ul>
- * <li>General server test properties:
- * <ul>
- * <li>
- * <code>server.url</code> - server URL (depends on server type).
- * </li>
- * <li>
- * <code>server.proxy.factory</code> - name of class used to create
- * client toolkit proxty server (depends on server type).
- * </li>
- * <li>
- * <code>server.version</code> - server version ID (depends on server type).
- * </li>
- * <li>
- * <code>server.drer.id</code> - DRER ID on test server.
- * </li>
- * <li>
- * Additional properties may be required depending on the server type.
- * </li>
- * </ul>
- * </li>
- * <li>
- * Test-specific properties.
- * <ul>
- * <li>
- * <code>server.drer.property.list</code> - comma-separated list of
- * one or more test properties in this file that provide DRER IDs.
- * </li>
- * <li>
- * <code>server.data.resource.property.list</code> - comma-separated
- * list of one or more test properties in this file that provide data
- * resource IDs.
- * </li>
- * </ul>
- * </li>
- * </ul>
- *
- * @author The OGSA-DAI Project Team
- */
-public class ServerServiceTest extends TestCase
-{
- /** Copyright notice. */
- private static final String COPYRIGHT_NOTICE =
- "Copyright (c) The University of Edinburgh, 2007-2009.";
-
- /** Expected DRERs property name. */
- public static final String DRERS = "server.drer.property.list";
- /** Expected data resources property name. */
- public static final String DATA_RESOURCES = "server.data.resource.property.list";
-
- /** Test properties. */
- private final ServerTestProperties mProperties;
- /** Basic (unsecure) server. */
- private Server mServer;
-
- /**
- * Constructor.
- *
- * @param name
- * Test case name.
- * @throws Exception
- * If any problems arise in reading the test properties.
- */
- public ServerServiceTest(String name)
- throws Exception
- {
- super(name);
- mProperties = new ServerTestProperties();
- }
-
- /**
- * {@inheritDoc}
- */
- public void setUp() throws Exception
- {
- mServer = TestServerProxyFactory.getServerProxy(mProperties);
- }
-
- /**
- * Run test for command line.
- *
- * @param args
- * Not used.
- */
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(ServerServiceTest.class);
- }
-
- /**
- * Tests the resolve method.
- *
- * @throws Exception if an unexpected error occurs.
- */
- public void testResolve() throws Exception
- {
- DataRequestExecutionResource drer =
- mServer.getDataRequestExecutionResource(mProperties.getDRERID());
- String epr = mServer.resolve(
- drer.getResourceID(),
- ResourceType.DATA_REQUEST_EXECUTION_RESOURCE);
-
- // Check the returned string has the resource ID and the service URL
- assertTrue(
- "EPR must contain the resource ID",
- epr.indexOf(drer.getResourceID().toString()) > 0);
-
- assertTrue(
- "EPR must contain the service URL",
- epr.indexOf(mProperties.getServerURL()) > 0);
-
- // Confirm that the EPR is valid XML by converting it to a document
- try
- {
- XML.toDocument(epr);
- }
- catch (Exception e)
- {
- fail("EPR must be valid XML");
- }
- }
-
- /**
- * Tests the resolve method with an incorrect resource ID.
- *
- * @throws Exception if an unexpected error occurs.
- */
- public void testResolveWithUnknownResourceID() throws Exception
- {
- ResourceID badResourceID = new ResourceID("ABadResourceID");
- try
- {
- mServer.resolve(
- badResourceID,
- ResourceType.DATA_REQUEST_EXECUTION_RESOURCE);
- fail("Expected a ResourceUnknownException");
- }
- catch(ResourceUnknownException e)
- {
- assertEquals(
- "ResourceUnknownException must contain the expected ID",
- badResourceID,
- e.getResourceID());
- }
- }
-}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|