From ff071ca13234e5edc831b80e1a86e22b7e3a1d66 Mon Sep 17 00:00:00 2001
From: Alex Robin <alex.robin@sensiasoft.com>
Date: Wed, 4 Sep 2024 23:35:41 +0200
Subject: [PATCH] [SensorML] Added missing requirement and abstract test in
 json core

---
 .../abstract_tests/json/core/ATS_class.adoc   | 12 ++++++++++++
 .../abstract_tests/json/core/ATS_test1.adoc   |  9 +++++++++
 .../json-core/requirements_class.adoc         | 10 ----------
 .../sections/annex-abstract-test-suite.adoc   | 15 +++++++++------
 .../sections/clause_8.1_json_core.adoc        | 19 ++++++++++---------
 5 files changed, 40 insertions(+), 25 deletions(-)
 create mode 100644 sensorml/standard/abstract_tests/json/core/ATS_class.adoc
 create mode 100644 sensorml/standard/abstract_tests/json/core/ATS_test1.adoc
 delete mode 100644 sensorml/standard/requirements/json-core/requirements_class.adoc

diff --git a/sensorml/standard/abstract_tests/json/core/ATS_class.adoc b/sensorml/standard/abstract_tests/json/core/ATS_class.adoc
new file mode 100644
index 00000000..97f66986
--- /dev/null
+++ b/sensorml/standard/abstract_tests/json/core/ATS_class.adoc
@@ -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[]
\ No newline at end of file
diff --git a/sensorml/standard/abstract_tests/json/core/ATS_test1.adoc b/sensorml/standard/abstract_tests/json/core/ATS_test1.adoc
new file mode 100644
index 00000000..58cae720
--- /dev/null
+++ b/sensorml/standard/abstract_tests/json/core/ATS_test1.adoc
@@ -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`.
+====
diff --git a/sensorml/standard/requirements/json-core/requirements_class.adoc b/sensorml/standard/requirements/json-core/requirements_class.adoc
deleted file mode 100644
index c62a5a02..00000000
--- a/sensorml/standard/requirements/json-core/requirements_class.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[requirement,model=ogc]
-.Core Schema
-====
-[%metadata]
-type:: class
-identifier:: /req/json-core
-subject:: JSON Document
-inherit:: {swecommon-spec-url}/req/json-block-components
-indirect-dependency:: /req/model/coreProcess
-====
\ No newline at end of file
diff --git a/sensorml/standard/sections/annex-abstract-test-suite.adoc b/sensorml/standard/sections/annex-abstract-test-suite.adoc
index a600d1fa..a8e1d948 100644
--- a/sensorml/standard/sections/annex-abstract-test-suite.adoc
+++ b/sensorml/standard/sections/annex-abstract-test-suite.adoc
@@ -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[]
 
 
diff --git a/sensorml/standard/sections/clause_8.1_json_core.adoc b/sensorml/standard/sections/clause_8.1_json_core.adoc
index f96b6e79..e6595840 100644
--- a/sensorml/standard/sections/clause_8.1_json_core.adoc
+++ b/sensorml/standard/sections/clause_8.1_json_core.adoc
@@ -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.
@@ -255,12 +265,3 @@ include::../schemas/json/examples/spec/configuration.json[]
 ----
 
 
-
-===== Feature of Interest
-
-
-
-
-===== Inputs, Outputs and Parameters
-
-