Skip to content

Commit

Permalink
[SensorML] Added missing requirement and abstract test in json core
Browse files Browse the repository at this point in the history
  • Loading branch information
alexrobin committed Sep 4, 2024
1 parent 63bba8c commit ff071ca
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 25 deletions.
12 changes: 12 additions & 0 deletions sensorml/standard/abstract_tests/json/core/ATS_class.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[conformance_class]
.Conformance Test Class: Core Schema
====
[%metadata]
identifier:: /conf/json-core
target:: /req/json-core
classification:: Target Type: JSON Document
conformance-test:: /conf/json-core/media-type
====

include::./ATS_test1.adoc[]
9 changes: 9 additions & 0 deletions sensorml/standard/abstract_tests/json/core/ATS_test1.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[abstract_test]
====
[%metadata]
identifier:: /conf/json-core/media-type
target:: /req/json-core/media-type
test-method:: Check that the media type used when retrieving the document is set to the `application/sml+json`.
====
10 changes: 0 additions & 10 deletions sensorml/standard/requirements/json-core/requirements_class.adoc

This file was deleted.

15 changes: 9 additions & 6 deletions sensorml/standard/sections/annex-abstract-test-suite.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,25 @@ include::../abstract_tests/model/derivedProperty/ATS_class.adoc[]

Tests in the following conformance test classes shall be used to check conformance of JSON documents created according to the schemas this Standard. They shall also be used to check conformance of software implementations that output these JSON documents.

==== Simple Process
==== Core Schema
include::../abstract_tests/json/core/ATS_class.adoc[]

==== Simple Process Schema
include::../abstract_tests/json/simpleProcess/ATS_class.adoc[]

==== Aggregate Process
==== Aggregate Process Schema
include::../abstract_tests/json/aggregateProcess/ATS_class.adoc[]

==== Physical Component
==== Physical Component Schema
include::../abstract_tests/json/physicalComponent/ATS_class.adoc[]

==== Physical System
==== Physical System Schema
include::../abstract_tests/json/physicalSystem/ATS_class.adoc[]

==== Deployment
==== Deployment Schema
include::../abstract_tests/json/deployment/ATS_class.adoc[]

==== Derived Property
==== Derived Property Schema
include::../abstract_tests/json/derivedProperty/ATS_class.adoc[]


Expand Down
19 changes: 10 additions & 9 deletions sensorml/standard/sections/clause_8.1_json_core.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,21 @@ identifier:: /req/json-core
subject:: JSON Document
inherit:: {swecommon-spec-url}/req/json-block-components
indirect-dependency:: /req/model/coreProcess
requirement:: /req/json-core/media-type
====


==== Media Types

[requirement,model=ogc]
====
[%metadata]
identifier:: /req/json-core/media-type
A SensorML JSON document shall be advertised using the media type specified below.
====

===== application/sml+json

NOTE: Implementations should use *`application/vnd.ogc.sml+json`* as a preliminary media type until this Standard is stable to avoid confusing future implementations accessing JSON documents from draft versions of this Standard. The media type application/sml+json will be registered for SensorML JSON encoding, if and once this Standard is approved by the OGC Members. This note will be removed before publishing this Standard.
Expand Down Expand Up @@ -255,12 +265,3 @@ include::../schemas/json/examples/spec/configuration.json[]
----



===== Feature of Interest




===== Inputs, Outputs and Parameters


0 comments on commit ff071ca

Please sign in to comment.