diff --git a/src/main/java/org/opengis/cite/wps20/CommonFixture.java b/src/main/java/org/opengis/cite/wps20/CommonFixture.java index c141a1d..9afe3bf 100644 --- a/src/main/java/org/opengis/cite/wps20/CommonFixture.java +++ b/src/main/java/org/opengis/cite/wps20/CommonFixture.java @@ -72,10 +72,10 @@ public void initCommonFixture(ITestContext testContext) { if (null != obj) { this.client = Client.class.cast(obj); } - obj = testContext.getSuite().getAttribute(SuiteAttribute.TEST_SUBJECT.getName()); + /*obj = testContext.getSuite().getAttribute(SuiteAttribute.TEST_SUBJECT.getName()); if (null == obj) { throw new SkipException("Test subject not found in ITestContext."); - } + }*/ /* Define SERVICE_URL parameter */ Object ServiceUrlObj = testContext.getSuite().getAttribute(SuiteAttribute.SERVICE_URL.getName()); diff --git a/src/main/java/org/opengis/cite/wps20/SuiteFixtureListener.java b/src/main/java/org/opengis/cite/wps20/SuiteFixtureListener.java index ce4c54a..0dcc427 100644 --- a/src/main/java/org/opengis/cite/wps20/SuiteFixtureListener.java +++ b/src/main/java/org/opengis/cite/wps20/SuiteFixtureListener.java @@ -57,7 +57,7 @@ public void onFinish(ISuite suite) { void processSuiteParameters(ISuite suite) { Map params = suite.getXmlSuite().getParameters(); TestSuiteLogger.log(Level.CONFIG, "Suite parameters\n" + params.toString()); - String iutParam = params.get(TestRunArg.IUT.toString()); + /*String iutParam = params.get(TestRunArg.IUT.toString()); if ((null == iutParam) || iutParam.isEmpty()) { throw new IllegalArgumentException("Required test run parameter not found: " + TestRunArg.IUT.toString()); } @@ -77,16 +77,16 @@ void processSuiteParameters(ISuite suite) { } catch (Exception x) { throw new RuntimeException("Failed to parse resource retrieved from " + iutRef, x); } - suite.setAttribute(SuiteAttribute.TEST_SUBJECT.getName(), iutDoc); + suite.setAttribute(SuiteAttribute.TEST_SUBJECT.getName(), iutDoc);*/ /* Define SERVICE_URL parameter */ - String ServiceUrlParam = params.get(TestRunArg.SERVICE_URL.toString()); + String ServiceUrlParam = params.get(TestRunArg.IUT.toString()); if ((null == ServiceUrlParam) || ServiceUrlParam.isEmpty()) { throw new IllegalArgumentException( - "Required test run parameter not found: " + TestRunArg.SERVICE_URL.toString()); + "Required test run parameter not found: " + TestRunArg.IUT.toString()); } - String ServiceUrlRefString = params.get(TestRunArg.SERVICE_URL.toString()); - suite.setAttribute(SuiteAttribute.SERVICE_URL.getName(), URI.create(ServiceUrlRefString)); + //mapping TestRunArg.IUT to SuiteAttribute.SERVICE_URL + suite.setAttribute(SuiteAttribute.SERVICE_URL.getName(), URI.create(ServiceUrlParam)); /* Define SERVICE_URL parameter */ String EchoProcessIdParam = params.get(TestRunArg.ECHO_PROCESS_ID.toString()); @@ -136,8 +136,9 @@ void processSuiteParameters(ISuite suite) { if (TestSuiteLogger.isLoggable(Level.FINE)) { StringBuilder logMsg = new StringBuilder("Parsed resource retrieved from "); - logMsg.append(iutRef).append("\n"); - logMsg.append(XMLUtils.writeNodeToString(iutDoc)); + //logMsg.append(iutRef).append("\n"); + //logMsg.append(XMLUtils.writeNodeToString(iutDoc)); + logMsg.append(ServiceUrlParam).append("\n"); TestSuiteLogger.log(Level.FINE, logMsg.toString()); } } diff --git a/src/main/java/org/opengis/cite/wps20/TestRunArg.java b/src/main/java/org/opengis/cite/wps20/TestRunArg.java index 3ea694c..0567dac 100644 --- a/src/main/java/org/opengis/cite/wps20/TestRunArg.java +++ b/src/main/java/org/opengis/cite/wps20/TestRunArg.java @@ -10,13 +10,14 @@ public enum TestRunArg { * metadata about it. */ IUT, - SERVICE_URL, - ECHO_PROCESS_ID, + ECHO_PROCESS_ID + /*SERVICE_URL, GC_XML_URI, DP_XML_URI, EX_SNC_XML_URI, EX_ANC_XML_URI, - EX_ATO_XML_URI; + EX_ATO_XML_URI*/ + ; @Override public String toString() { diff --git a/src/main/scripts/ctl/wps20-suite.ctl b/src/main/scripts/ctl/wps20-suite.ctl index fe09881..40f50e6 100644 --- a/src/main/scripts/ctl/wps20-suite.ctl +++ b/src/main/scripts/ctl/wps20-suite.ctl @@ -40,6 +40,11 @@
  • Synchronous WPS
  • Asynchronous WPS
  • +

    To quality for Compliance certification, a product has to:

    +
    Implementation under test

    Location of IUT (absolute http: or file: URI)

    +

    Location of IUT (absolute http: URI)

    -

    -

    -

    Endpoint for testing WPS Service

    - -