From f3e9e498b216f03a948e37314127ff766271ba7c Mon Sep 17 00:00:00 2001 From: dperezBM <33548409+dperezBM@users.noreply.github.com> Date: Mon, 19 Sep 2022 10:23:24 +0200 Subject: [PATCH 1/2] layer title manual check added --- ...IDb02cc4ae-60e1-47a5-8e5a-7f9769ffd113.xml | 5 + ...IDfa68eb83-a25a-4009-84dd-036de4539c93.xml | 10 ++ service/vs-wms-soapui-project.xml | 107 +++++++++++++++++- service/vs-wmts-soapui-project.xml | 43 +++++++ 4 files changed, 161 insertions(+), 4 deletions(-) diff --git a/include-metadata/TranslationTemplateBundle-EIDb02cc4ae-60e1-47a5-8e5a-7f9769ffd113.xml b/include-metadata/TranslationTemplateBundle-EIDb02cc4ae-60e1-47a5-8e5a-7f9769ffd113.xml index 91269017..f70c14ba 100644 --- a/include-metadata/TranslationTemplateBundle-EIDb02cc4ae-60e1-47a5-8e5a-7f9769ffd113.xml +++ b/include-metadata/TranslationTemplateBundle-EIDb02cc4ae-60e1-47a5-8e5a-7f9769ffd113.xml @@ -350,5 +350,10 @@ The server experienced a several unexpected error. Please, try again later. If the problem persist, please contact with the helpdesk. + + + Check manually that for each harmonised layer according to IR IOP, the title is mapped to the harmonised title defined by IR IOP. + + diff --git a/include-metadata/TranslationTemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml b/include-metadata/TranslationTemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml index deb6ea65..f9b57c31 100644 --- a/include-metadata/TranslationTemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml +++ b/include-metadata/TranslationTemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml @@ -280,5 +280,15 @@ The legend format is invalid. The validator is expecting '{LegendURL}', but the defined legend format is '{Content-Type}'. Please, review your code and try again. + + + Check manually that for each harmonised layer according to IR IOP, the title is mapped to the harmonised title defined by IR IOP. + + + + + Please check manually that the WMS under test is related to a harmonized dataset and at least a harmonised layer according to IR IOP shall be present. + + diff --git a/service/vs-wms-soapui-project.xml b/service/vs-wms-soapui-project.xml index 8834ee9f..4563ea63 100644 --- a/service/vs-wms-soapui-project.xml +++ b/service/vs-wms-soapui-project.xml @@ -1831,6 +1831,49 @@ layers.each{layer -> } + + + + + <xml-fragment/> + + ${#Project#serviceEndpoint} + + + + import de.interactive_instruments.etf.suim.* +Assert a = new Assert(messageExchange, context, log, Assert.INSPIRE_DS_NS); +a.exists( + '//zzzz', + 'TR.manual.testManual33' +); + + + + No Authorization + + + + + + request + GetCapabilities + QUERY + GetCapabilities + + + + + service + ${#Project#service} + QUERY + ${#Project#service} + + + + + + @@ -2119,10 +2162,6 @@ layers.each{layer-> } } } -if(invalidLayers.size() > 0){ - String[] assertParams = ['layerid', invalidLayers.join(', ')]; - throw new TranslatableAssertionError('TR.notHarmonisedValue', assertParams); -} if(layers.Name.size() != layers.Name.unique().size()){ throw new TranslatableAssertionError('TR.notUniqueLayerName'); @@ -2132,6 +2171,66 @@ if(layers.Name.size() != layers.Name.unique().size()){ + + + Test that at least a harmonised layer according to IR IOP is present, which layer name shall comply with the harmonised layer name defined in Article 14 of IR IOP.

+

More information: Layer Name

]]> + + + + + + 452f3b7c-9db1-47c7-9621-6f76b761feea + + + PARALLELL + + + + + + + <xml-fragment/> + + ${#Project#serviceEndpoint} + + + + import de.interactive_instruments.etf.suim.* + Assert a = new Assert(messageExchange, context, log, Assert.INSPIRE_DS_NS); +a.exists( + '//zzzz', + 'TR.manual.testManual39' +); + + + + No Authorization + + + + + + request + GetCapabilities + QUERY + GetCapabilities + + + + + service + ${#Project#service} + QUERY + ${#Project#service} + + + + + + + + Test that a supported CRS is provided based on ETRS89 for continental Europe and on ITRS outside continental Europe.

diff --git a/service/vs-wmts-soapui-project.xml b/service/vs-wmts-soapui-project.xml index deca3ff6..14f033a5 100644 --- a/service/vs-wmts-soapui-project.xml +++ b/service/vs-wmts-soapui-project.xml @@ -1329,6 +1329,49 @@ layers.each{layer-> } + + + + + <xml-fragment/> + + ${#Project#serviceEndpoint} + + + + import de.interactive_instruments.etf.suim.* + Assert a = new Assert(messageExchange, context, log, Assert.INSPIRE_DS_NS); +a.exists( + '//zzzz', + 'TR.manual.testManual85' +); + + + + No Authorization + + + + + + request + GetCapabilities + QUERY + GetCapabilities + + + + + service + ${#Project#service} + QUERY + ${#Project#service} + + + + + + From 4a41cbdc749599c1e638b082b5f86951927661e2 Mon Sep 17 00:00:00 2001 From: dperezBM <33548409+dperezBM@users.noreply.github.com> Date: Tue, 20 Sep 2022 13:43:04 +0200 Subject: [PATCH 2/2] at39bis links updated --- ...TemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml | 2 +- service/vs-wms-soapui-project.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include-metadata/TranslationTemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml b/include-metadata/TranslationTemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml index f9b57c31..955a2c23 100644 --- a/include-metadata/TranslationTemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml +++ b/include-metadata/TranslationTemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml @@ -287,7 +287,7 @@ - Please check manually that the WMS under test is related to a harmonized dataset and at least a harmonised layer according to IR IOP shall be present. + Check manually that the WMS under test is related to a harmonized dataset and at least a harmonised layer according to IR IOP shall be present. diff --git a/service/vs-wms-soapui-project.xml b/service/vs-wms-soapui-project.xml index 4563ea63..1ec1ae68 100644 --- a/service/vs-wms-soapui-project.xml +++ b/service/vs-wms-soapui-project.xml @@ -2173,8 +2173,8 @@ if(layers.Name.size() != layers.Name.unique().size()){ - Test that at least a harmonised layer according to IR IOP is present, which layer name shall comply with the harmonised layer name defined in Article 14 of IR IOP.

-

More information: Layer Name

]]> + Test that at least a harmonised layer according to IR IOP is present, which layer name shall comply with the harmonised layer name defined in Article 14 of IR IOP.

+

More information: Harmonised Layer Name

]]>