From 4341180c595bf62928b83f0d06e2cf12e74b8b36 Mon Sep 17 00:00:00 2001 From: Carlos Palma Date: Fri, 18 Jan 2019 10:19:36 +0100 Subject: [PATCH 1/3] Fixes governance/#36 Signed-off-by: Carlos Palma --- .../de/interactive_instruments/etf/sel/mapping/Types.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java b/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java index 295d731..8c886b6 100644 --- a/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java +++ b/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java @@ -143,5 +143,11 @@ public class Types { // WFS_2_0_TOT "9b6ef734-981e-4d60-aa81-d6730a1c6389", // ATOM_TOT - "49d881ae-b115-4b91-aabe-31d5791bce52"); + "49d881ae-b115-4b91-aabe-31d5791bce52", + // WMS 1.3 + "9981e87e-d642-43b3-ad5f-e77469075e74", + //WMTS 1.0 + "380b969c-215e-46f8-a4e9-16f002f7d6c3", + "ae35f7cd-86d9-475a-aa3a-e0bfbda2bb5f"); + } From fbb30b33d4df22729ed7cdcf763015cfa021ac7c Mon Sep 17 00:00:00 2001 From: Carlos Palma Date: Mon, 6 May 2019 17:16:40 +0200 Subject: [PATCH 2/3] Added the the TestObjecTypes for SOS and WCS on Types.java Signed-off-by: Carlos Palma --- .../de/interactive_instruments/etf/sel/mapping/Types.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java b/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java index 295d731..d0134ba 100644 --- a/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java +++ b/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java @@ -143,5 +143,9 @@ public class Types { // WFS_2_0_TOT "9b6ef734-981e-4d60-aa81-d6730a1c6389", // ATOM_TOT - "49d881ae-b115-4b91-aabe-31d5791bce52"); + "49d881ae-b115-4b91-aabe-31d5791bce52", + // WCS 1.0 + "dac58b52-3ffd-4eb5-96e3-64723d8f0f51", + // SOS 2.0 + "f897f313-55f0-4e51-928a-0e9869f5a1d6"); } From 9031499b20cc4115e072c3d0ad99cab93df1b71a Mon Sep 17 00:00:00 2001 From: Carlos Palma Date: Wed, 26 Jun 2019 17:10:22 +0200 Subject: [PATCH 3/3] added csw on Types.java --- .../etf/sel/mapping/Types.java | 224 +++++++++--------- 1 file changed, 113 insertions(+), 111 deletions(-) diff --git a/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java b/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java index e37d39b..26c267e 100644 --- a/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java +++ b/etf-sui-mapper/src/main/java/de/interactive_instruments/etf/sel/mapping/Types.java @@ -28,130 +28,132 @@ */ public class Types { - public final static TestItemTypeDto HTTP_REQUEST_STEP_IT = new TestItemTypeDto(); - public final static EID HTTP_REQUEST_STEP_ID = EidFactory.getDefault() - .createAndPreserveStr("6b16aa44-bdc7-4120-a790-4b74fc9ace62"); + public final static TestItemTypeDto HTTP_REQUEST_STEP_IT = new TestItemTypeDto(); + public final static EID HTTP_REQUEST_STEP_ID = EidFactory.getDefault() + .createAndPreserveStr("6b16aa44-bdc7-4120-a790-4b74fc9ace62"); - public final static TestItemTypeDto GROOVY_STEP_IT = new TestItemTypeDto(); - public final static EID GROOVY_STEP_ID = EidFactory.getDefault() - .createAndPreserveStr("90bdc939-bd42-41a0-9ef8-19e0ec04f89d"); + public final static TestItemTypeDto GROOVY_STEP_IT = new TestItemTypeDto(); + public final static EID GROOVY_STEP_ID = EidFactory.getDefault() + .createAndPreserveStr("90bdc939-bd42-41a0-9ef8-19e0ec04f89d"); - public final static TestItemTypeDto XPATH_MATCH_ASSERTION_IT = new TestItemTypeDto(); - public final static EID XPATH_MATCH_ASSERTION_ID = EidFactory.getDefault() - .createAndPreserveStr("73c00044-a592-450f-8aff-7fb1da91c1df"); + public final static TestItemTypeDto XPATH_MATCH_ASSERTION_IT = new TestItemTypeDto(); + public final static EID XPATH_MATCH_ASSERTION_ID = EidFactory.getDefault() + .createAndPreserveStr("73c00044-a592-450f-8aff-7fb1da91c1df"); - public final static TestItemTypeDto XQUERY_MATCH_ASSERTION_IT = new TestItemTypeDto(); - public final static EID XQUERY_MATCH_ASSERTION_ID = EidFactory.getDefault() - .createAndPreserveStr("5c28b666-4dda-43af-aa6e-1eed6212d8d8"); + public final static TestItemTypeDto XQUERY_MATCH_ASSERTION_IT = new TestItemTypeDto(); + public final static EID XQUERY_MATCH_ASSERTION_ID = EidFactory.getDefault() + .createAndPreserveStr("5c28b666-4dda-43af-aa6e-1eed6212d8d8"); - public final static TestItemTypeDto GROOVY_ASSERTION_IT = new TestItemTypeDto(); - public final static EID GROOVY_ASSERTION_ID = EidFactory.getDefault() - .createAndPreserveStr("fad9282c-1f1f-492b-b6ab-248430154310"); + public final static TestItemTypeDto GROOVY_ASSERTION_IT = new TestItemTypeDto(); + public final static EID GROOVY_ASSERTION_ID = EidFactory.getDefault() + .createAndPreserveStr("fad9282c-1f1f-492b-b6ab-248430154310"); - public final static TestItemTypeDto SCHEMA_ASSERTION_IT = new TestItemTypeDto(); - public final static EID SCHEMA_ASSERTION_ID = EidFactory.getDefault() - .createAndPreserveStr("5ee1ae1a-e79f-41bb-bfb0-62cef89ca460"); + public final static TestItemTypeDto SCHEMA_ASSERTION_IT = new TestItemTypeDto(); + public final static EID SCHEMA_ASSERTION_ID = EidFactory.getDefault() + .createAndPreserveStr("5ee1ae1a-e79f-41bb-bfb0-62cef89ca460"); - public final static TestItemTypeDto BASIC_ASSERTION_IT = new TestItemTypeDto(); - public final static EID BASIC_ASSERTION_ID = EidFactory.getDefault() - .createAndPreserveStr("e7e29c93-4c50-41c2-82d1-0f2db6a1abf6"); + public final static TestItemTypeDto BASIC_ASSERTION_IT = new TestItemTypeDto(); + public final static EID BASIC_ASSERTION_ID = EidFactory.getDefault() + .createAndPreserveStr("e7e29c93-4c50-41c2-82d1-0f2db6a1abf6"); - public final static TestItemTypeDto DISABLED_ASSERTION_IT = new TestItemTypeDto(); - public final static EID DISABLED_ASSERTION_ID = EidFactory.getDefault() - .createAndPreserveStr("7789efec-2112-4d6c-89ea-12c88c56a62a"); + public final static TestItemTypeDto DISABLED_ASSERTION_IT = new TestItemTypeDto(); + public final static EID DISABLED_ASSERTION_ID = EidFactory.getDefault() + .createAndPreserveStr("7789efec-2112-4d6c-89ea-12c88c56a62a"); - // Supported Test Item Types - public final static EidMap TEST_ITEM_TYPES = new DefaultEidMap() { - { - { - HTTP_REQUEST_STEP_IT.setLabel("HTTP Request Step"); - HTTP_REQUEST_STEP_IT.setId(HTTP_REQUEST_STEP_ID); - HTTP_REQUEST_STEP_IT - .setDescription("A HTTP Request Step is used to call any HTTP service through HTTP and HTTPS"); - HTTP_REQUEST_STEP_IT - .setReference("https://www.soapui.org/functional-testing/teststep-reference/http-request/.html"); - put(HTTP_REQUEST_STEP_IT.getId(), HTTP_REQUEST_STEP_IT); - } - { - GROOVY_STEP_IT.setLabel("Script Test Step"); - GROOVY_STEP_IT.setId(GROOVY_STEP_ID); - GROOVY_STEP_IT.setDescription("A Test Step which will execute the contained script each time it is run. " - + "Used to control the sequence of tests."); - GROOVY_STEP_IT.setReference("https://www.soapui.org/functional-testing/working-with-scripts.html"); - put(GROOVY_STEP_IT.getId(), GROOVY_STEP_IT); - } - { - XPATH_MATCH_ASSERTION_IT.setLabel("XPath Match Assertion"); - XPATH_MATCH_ASSERTION_IT.setId(XPATH_MATCH_ASSERTION_ID); - XPATH_MATCH_ASSERTION_IT.setDescription( - "The XPath assertion applies a XPath expression to the service response and fails if the resulting selection does not match the expected value."); - XPATH_MATCH_ASSERTION_IT.setReference( - "https://www.soapui.org/functional-testing/validating-messages/validating-xml-messages.html#1-The-XPath-Match-Assertion"); - put(XPATH_MATCH_ASSERTION_IT.getId(), XPATH_MATCH_ASSERTION_IT); - } - { - XQUERY_MATCH_ASSERTION_IT.setLabel("XQuery Match Assertion"); - XQUERY_MATCH_ASSERTION_IT.setId(XQUERY_MATCH_ASSERTION_ID); - XQUERY_MATCH_ASSERTION_IT.setDescription( - "The XQuery assertion applies a XQuery expression to the service response and fails if the resulting selection does not match the expected value."); - XQUERY_MATCH_ASSERTION_IT.setReference( - "https://www.soapui.org/functional-testing/validating-messages/validating-xml-messages.html#2-The-XQuery-Match-Assertion"); - put(XQUERY_MATCH_ASSERTION_IT.getId(), XQUERY_MATCH_ASSERTION_IT); - } - { - GROOVY_ASSERTION_IT.setLabel("Script Assertion"); - GROOVY_ASSERTION_IT.setId(GROOVY_ASSERTION_ID); - GROOVY_ASSERTION_IT - .setDescription("The Script assertion is used forcomplex validations of the service response."); - GROOVY_ASSERTION_IT.setReference( - "https://www.soapui.org/functional-testing/validating-messages/using-script-assertions.html"); - put(GROOVY_ASSERTION_IT.getId(), GROOVY_ASSERTION_IT); - } - { - SCHEMA_ASSERTION_IT.setLabel("Schema Validation Assertion"); - SCHEMA_ASSERTION_IT.setId(SCHEMA_ASSERTION_ID); - SCHEMA_ASSERTION_IT.setDescription( - "The Schema Validation assertion is used to validate a service response against a XML schema."); - SCHEMA_ASSERTION_IT.setReference("http://interactive-instruments.de"); - put(SCHEMA_ASSERTION_IT.getId(), SCHEMA_ASSERTION_IT); - } + // Supported Test Item Types + public final static EidMap TEST_ITEM_TYPES = new DefaultEidMap() { + { + { + HTTP_REQUEST_STEP_IT.setLabel("HTTP Request Step"); + HTTP_REQUEST_STEP_IT.setId(HTTP_REQUEST_STEP_ID); + HTTP_REQUEST_STEP_IT + .setDescription("A HTTP Request Step is used to call any HTTP service through HTTP and HTTPS"); + HTTP_REQUEST_STEP_IT + .setReference("https://www.soapui.org/functional-testing/teststep-reference/http-request/.html"); + put(HTTP_REQUEST_STEP_IT.getId(), HTTP_REQUEST_STEP_IT); + } + { + GROOVY_STEP_IT.setLabel("Script Test Step"); + GROOVY_STEP_IT.setId(GROOVY_STEP_ID); + GROOVY_STEP_IT.setDescription("A Test Step which will execute the contained script each time it is run. " + + "Used to control the sequence of tests."); + GROOVY_STEP_IT.setReference("https://www.soapui.org/functional-testing/working-with-scripts.html"); + put(GROOVY_STEP_IT.getId(), GROOVY_STEP_IT); + } + { + XPATH_MATCH_ASSERTION_IT.setLabel("XPath Match Assertion"); + XPATH_MATCH_ASSERTION_IT.setId(XPATH_MATCH_ASSERTION_ID); + XPATH_MATCH_ASSERTION_IT.setDescription( + "The XPath assertion applies a XPath expression to the service response and fails if the resulting selection does not match the expected value."); + XPATH_MATCH_ASSERTION_IT.setReference( + "https://www.soapui.org/functional-testing/validating-messages/validating-xml-messages.html#1-The-XPath-Match-Assertion"); + put(XPATH_MATCH_ASSERTION_IT.getId(), XPATH_MATCH_ASSERTION_IT); + } + { + XQUERY_MATCH_ASSERTION_IT.setLabel("XQuery Match Assertion"); + XQUERY_MATCH_ASSERTION_IT.setId(XQUERY_MATCH_ASSERTION_ID); + XQUERY_MATCH_ASSERTION_IT.setDescription( + "The XQuery assertion applies a XQuery expression to the service response and fails if the resulting selection does not match the expected value."); + XQUERY_MATCH_ASSERTION_IT.setReference( + "https://www.soapui.org/functional-testing/validating-messages/validating-xml-messages.html#2-The-XQuery-Match-Assertion"); + put(XQUERY_MATCH_ASSERTION_IT.getId(), XQUERY_MATCH_ASSERTION_IT); + } + { + GROOVY_ASSERTION_IT.setLabel("Script Assertion"); + GROOVY_ASSERTION_IT.setId(GROOVY_ASSERTION_ID); + GROOVY_ASSERTION_IT + .setDescription("The Script assertion is used forcomplex validations of the service response."); + GROOVY_ASSERTION_IT.setReference( + "https://www.soapui.org/functional-testing/validating-messages/using-script-assertions.html"); + put(GROOVY_ASSERTION_IT.getId(), GROOVY_ASSERTION_IT); + } + { + SCHEMA_ASSERTION_IT.setLabel("Schema Validation Assertion"); + SCHEMA_ASSERTION_IT.setId(SCHEMA_ASSERTION_ID); + SCHEMA_ASSERTION_IT.setDescription( + "The Schema Validation assertion is used to validate a service response against a XML schema."); + SCHEMA_ASSERTION_IT.setReference("http://interactive-instruments.de"); + put(SCHEMA_ASSERTION_IT.getId(), SCHEMA_ASSERTION_IT); + } - { - BASIC_ASSERTION_IT.setLabel("Basic Assertion"); - BASIC_ASSERTION_IT.setId(BASIC_ASSERTION_ID); - BASIC_ASSERTION_IT.setDescription("Basic Assertion"); - BASIC_ASSERTION_IT.setReference("http://interactive-instruments.de"); - put(BASIC_ASSERTION_IT.getId(), BASIC_ASSERTION_IT); - } + { + BASIC_ASSERTION_IT.setLabel("Basic Assertion"); + BASIC_ASSERTION_IT.setId(BASIC_ASSERTION_ID); + BASIC_ASSERTION_IT.setDescription("Basic Assertion"); + BASIC_ASSERTION_IT.setReference("http://interactive-instruments.de"); + put(BASIC_ASSERTION_IT.getId(), BASIC_ASSERTION_IT); + } - { - DISABLED_ASSERTION_IT.setLabel("Disabled"); - DISABLED_ASSERTION_IT.setId(DISABLED_ASSERTION_ID); - DISABLED_ASSERTION_IT.setDescription("Assertion which is disabled"); - DISABLED_ASSERTION_IT.setReference("http://interactive-instruments.de"); - put(DISABLED_ASSERTION_IT.getId(), DISABLED_ASSERTION_IT); - } - } - }; + { + DISABLED_ASSERTION_IT.setLabel("Disabled"); + DISABLED_ASSERTION_IT.setId(DISABLED_ASSERTION_ID); + DISABLED_ASSERTION_IT.setDescription("Assertion which is disabled"); + DISABLED_ASSERTION_IT.setReference("http://interactive-instruments.de"); + put(DISABLED_ASSERTION_IT.getId(), DISABLED_ASSERTION_IT); + } + } + }; - // Supported Test Object Types - public static final EidMap SUI_SUPPORTED_TEST_OBJECT_TYPES = TestObjectTypeDetectorManager.getTypes( - // SIMPLE_WEB_SERVICE_TOT - "88311f83-818c-46ed-8a9a-cec4f3707365", - // OGC Web Feature Service - "88311f83-818c-46ed-8a9a-cec4f3707365", - // WFS_2_0_TOT - "9b6ef734-981e-4d60-aa81-d6730a1c6389", - // ATOM_TOT - "49d881ae-b115-4b91-aabe-31d5791bce52", - // WCS 1.0 + // Supported Test Object Types + public static final EidMap SUI_SUPPORTED_TEST_OBJECT_TYPES = TestObjectTypeDetectorManager.getTypes( + // SIMPLE_WEB_SERVICE_TOT + "88311f83-818c-46ed-8a9a-cec4f3707365", + // OGC Web Feature Service + "88311f83-818c-46ed-8a9a-cec4f3707365", + // WFS_2_0_TOT + "9b6ef734-981e-4d60-aa81-d6730a1c6389", + // ATOM_TOT + "49d881ae-b115-4b91-aabe-31d5791bce52", + // WCS 1.0 "dac58b52-3ffd-4eb5-96e3-64723d8f0f51", // SOS 2.0 "f897f313-55f0-4e51-928a-0e9869f5a1d6", - // WMS 1.3 - "9981e87e-d642-43b3-ad5f-e77469075e74", - //WMTS 1.0 - "380b969c-215e-46f8-a4e9-16f002f7d6c3", - "ae35f7cd-86d9-475a-aa3a-e0bfbda2bb5f"); + // WMS 1.3 + "9981e87e-d642-43b3-ad5f-e77469075e74", + // WMTS 1.0 + "380b969c-215e-46f8-a4e9-16f002f7d6c3", + "ae35f7cd-86d9-475a-aa3a-e0bfbda2bb5f", + // WCS + "4b0fb35d-10f0-47df-bc0b-6d4548035ae2"); }