Skip to content

Commit

Permalink
Merge pull request #777 from inspire-eu-validation/issue-822
Browse files Browse the repository at this point in the history 
Reviewed and approved.
  • Loading branch information
@jenriquesoriano
jenriquesoriano authored Sep 21, 2022
2 parents cf8d700 + 4a41cbd commit ef3d460
Show file tree
Hide file tree
Showing 4 changed files with 161 additions and 4 deletions.
5 changes: 5 additions & 0 deletions include-metadata/TranslationTemplateBundle-EIDb02cc4ae-60e1-47a5-8e5a-7f9769ffd113.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,5 +350,10 @@
<TranslationTemplate language="en" name="TR.fallbackInfo">The server experienced a several unexpected error. Please, try again later. If the problem persist, please contact with the helpdesk.</TranslationTemplate>
</translationTemplates>
</LangTranslationTemplateCollection>
<LangTranslationTemplateCollection name="TR.manual.testManual85">
<translationTemplates>
<TranslationTemplate language="en" name="TR.manual.testManual85">Check manually that for each harmonised layer according to IR IOP, the title is mapped to the harmonised title defined by IR IOP.</TranslationTemplate>
</translationTemplates>
</LangTranslationTemplateCollection>
</translationTemplateCollections>
</TranslationTemplateBundle>
10 changes: 10 additions & 0 deletions include-metadata/TranslationTemplateBundle-EIDfa68eb83-a25a-4009-84dd-036de4539c93.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,5 +280,15 @@
<TranslationTemplate language="en" name="TR.invalidLegendFormat">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.</TranslationTemplate>
</translationTemplates>
</LangTranslationTemplateCollection>
<LangTranslationTemplateCollection name="TR.manual.testManual33">
<translationTemplates>
<TranslationTemplate language="en" name="TR.manual.testManual33">Check manually that for each harmonised layer according to IR IOP, the title is mapped to the harmonised title defined by IR IOP.</TranslationTemplate>
</translationTemplates>
</LangTranslationTemplateCollection>
<LangTranslationTemplateCollection name="TR.manual.testManual39">
<translationTemplates>
<TranslationTemplate language="en" name="TR.manual.testManual39">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.</TranslationTemplate>
</translationTemplates>
</LangTranslationTemplateCollection>
</translationTemplateCollections>
</TranslationTemplateBundle>
107 changes: 103 additions & 4 deletions service/vs-wms-soapui-project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1831,6 +1831,49 @@ layers.each{layer ->
}</script>
</con:config>
</con:testStep>
<con:testStep type="httprequest" name="manual-check" id="426bb089-0b78-4ee5-afe8-a1c0b484d1ca">
<con:settings />
<con:config method="GET" xsi:type="con:HttpRequest" id="8f42a026-848a-4235-96e2-1e4ae0451425" name="manual-check" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<con:settings>
<con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
</con:settings>
<con:endpoint>${#Project#serviceEndpoint}</con:endpoint>
<con:request />
<con:assertion type="GroovyScriptAssertion" id="5490fc45-e697-4db4-8d78-95694a452fb9" name="manual-check-layer-title">
<con:configuration>
<scriptText>import de.interactive_instruments.etf.suim.*
Assert a = new Assert(messageExchange, context, log, Assert.INSPIRE_DS_NS);
a.exists(
'//zzzz',
'TR.manual.testManual33'
);</scriptText>
</con:configuration>
</con:assertion>
<con:credentials>
<con:authType>No Authorization</con:authType>
</con:credentials>
<con:jmsConfig JMSDeliveryMode="PERSISTENT" />
<con:jmsPropertyConfig />
<con:parameters>
<con:parameter>
<con:name>request</con:name>
<con:value>GetCapabilities</con:value>
<con:style>QUERY</con:style>
<con:default>GetCapabilities</con:default>
<con:path xsi:nil="true" />
<con:description xsi:nil="true" />
</con:parameter>
<con:parameter>
<con:name>service</con:name>
<con:value>${#Project#service}</con:value>
<con:style>QUERY</con:style>
<con:default>${#Project#service}</con:default>
<con:path xsi:nil="true" />
<con:description xsi:nil="true" />
</con:parameter>
</con:parameters>
</con:config>
</con:testStep>
<con:properties />
</con:testCase>
<con:testCase id="a8fff5a7-3c9c-4d41-b7d3-6a906ea8b4b5" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="at34-getcapabilities-layer-abstract" searchProperties="true">
Expand Down Expand Up @@ -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');
Expand All @@ -2132,6 +2171,66 @@ if(layers.Name.size() != layers.Name.unique().size()){
</con:testStep>
<con:properties />
</con:testCase>
<con:testCase id="79e0e223-e67f-4d5b-9165-40c9f367ed3b" failOnError="false" failTestCaseOnErrors="false" keepSession="false" maxResults="0" name="at39bis-getcapabilities-harmonised-layer-name" searchProperties="true">
<con:description>
<![CDATA[<p>Test that at least a harmonised layer according to <a href="http://inspire.ec.europa.eu/id/ats/view-service/master/iso-19128/README#ref_IR_IOP" target="_blank">IR IOP</a> is present, which layer name shall comply with the harmonised layer name defined in Article 14 of <a href="http://inspire.ec.europa.eu/id/ats/view-service/master/iso-19128/README#ref_IR_IOP" target="_blank">IR IOP</a>.</p>
<p>More information: <a href="http://inspire.ec.europa.eu/id/ats/view-service/master/iso-19128/at39bis-getcapabilities-harmonised-layer-name" target="_blank">Harmonised Layer Name</a></p>]]>
</con:description>
<con:settings />
<con:testStep type="testcasedependency" name="check-initial-testcase" id="956d6394-2eea-481e-b46f-0cc9f39d1fc2">
<con:settings />
<con:config xsi:type="con:RunTestCaseStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<con:targetTestCase>452f3b7c-9db1-47c7-9621-6f76b761feea</con:targetTestCase>
<con:properties />
<con:returnProperties />
<con:runMode>PARALLELL</con:runMode>
</con:config>
</con:testStep>
<con:testStep type="httprequest" name="manual-check" id="5a3215eb-0616-445a-89bc-c2d9e39f78f0">
<con:settings />
<con:config method="GET" xsi:type="con:HttpRequest" id="ddf7a23b-1b16-4b9a-a355-cd2e0e52501e" name="manual-check" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<con:settings>
<con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
</con:settings>
<con:endpoint>${#Project#serviceEndpoint}</con:endpoint>
<con:request />
<con:assertion type="GroovyScriptAssertion" id="e988a1e5-de23-44e6-bfde-5062cfcfac21" name="manual-check-harmonised-layer-name">
<con:configuration>
<scriptText>import de.interactive_instruments.etf.suim.*
Assert a = new Assert(messageExchange, context, log, Assert.INSPIRE_DS_NS);
a.exists(
'//zzzz',
'TR.manual.testManual39'
);</scriptText>
</con:configuration>
</con:assertion>
<con:credentials>
<con:authType>No Authorization</con:authType>
</con:credentials>
<con:jmsConfig JMSDeliveryMode="PERSISTENT" />
<con:jmsPropertyConfig />
<con:parameters>
<con:parameter>
<con:name>request</con:name>
<con:value>GetCapabilities</con:value>
<con:style>QUERY</con:style>
<con:default>GetCapabilities</con:default>
<con:path xsi:nil="true" />
<con:description xsi:nil="true" />
</con:parameter>
<con:parameter>
<con:name>service</con:name>
<con:value>${#Project#service}</con:value>
<con:style>QUERY</con:style>
<con:default>${#Project#service}</con:default>
<con:path xsi:nil="true" />
<con:description xsi:nil="true" />
</con:parameter>
</con:parameters>
</con:config>
</con:testStep>
<con:properties />
</con:testCase>
<con:testCase id="c8f3aa9a-fdbc-4267-9964-602f471efdd0" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="at40-getcapabilities-layer-crs" searchProperties="true">
<con:description>
<![CDATA[<p>Test that a supported CRS is provided based on ETRS89 for continental Europe and on ITRS outside continental Europe.</p>
Expand Down
43 changes: 43 additions & 0 deletions service/vs-wmts-soapui-project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1329,6 +1329,49 @@ layers.each{layer->
}</script>
</con:config>
</con:testStep>
<con:testStep type="httprequest" name="manual-check" id="111f008e-faef-461d-905e-4862e52c3fb5">
<con:settings />
<con:config method="GET" xsi:type="con:HttpRequest" id="2bbed62e-7b82-4269-99d4-6bba2378a3ae" name="manual-check" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<con:settings>
<con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
</con:settings>
<con:endpoint>${#Project#serviceEndpoint}</con:endpoint>
<con:request />
<con:assertion type="GroovyScriptAssertion" id="a57c2d87-aaa3-40f9-9d2f-3694f6b658f6" name="manual-check-layer-title">
<con:configuration>
<scriptText>import de.interactive_instruments.etf.suim.*
Assert a = new Assert(messageExchange, context, log, Assert.INSPIRE_DS_NS);
a.exists(
'//zzzz',
'TR.manual.testManual85'
);</scriptText>
</con:configuration>
</con:assertion>
<con:credentials>
<con:authType>No Authorization</con:authType>
</con:credentials>
<con:jmsConfig JMSDeliveryMode="PERSISTENT" />
<con:jmsPropertyConfig />
<con:parameters>
<con:parameter>
<con:name>request</con:name>
<con:value>GetCapabilities</con:value>
<con:style>QUERY</con:style>
<con:default>GetCapabilities</con:default>
<con:path xsi:nil="true" />
<con:description xsi:nil="true" />
</con:parameter>
<con:parameter>
<con:name>service</con:name>
<con:value>${#Project#service}</con:value>
<con:style>QUERY</con:style>
<con:default>${#Project#service}</con:default>
<con:path xsi:nil="true" />
<con:description xsi:nil="true" />
</con:parameter>
</con:parameters>
</con:config>
</con:testStep>
<con:properties />
</con:testCase>
<con:testCase id="014232e3-18f4-4314-93b3-f9f1d810d26a" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="at86-getcapabilities-layer-abstract" searchProperties="true">
Expand Down

0 comments on commit ef3d460

Please sign in to comment.