From 12135c09a5acb50b79b86e4aca957dc0882bd5e6 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 16 Mar 2023 17:21:12 +0100
Subject: [PATCH] Reorganising test resources

---
 src/test/resources/grsf_profile.xsd           | 14 -----
 .../profile_schemas/grsf_profile.xsd          | 51 +++++++++++++++++++
 .../{ => profile_schemas}/profile5.xsd        |  0
 .../{ => profiles}/AssessmentUnit.xml         | 16 ++++--
 .../metadatafield_example.xml}                |  0
 5 files changed, 63 insertions(+), 18 deletions(-)
 delete mode 100644 src/test/resources/grsf_profile.xsd
 create mode 100644 src/test/resources/profile_schemas/grsf_profile.xsd
 rename src/test/resources/{ => profile_schemas}/profile5.xsd (100%)
 rename src/test/resources/{ => profiles}/AssessmentUnit.xml (96%)
 rename src/test/resources/{metadatafield.xml => profiles/metadatafield_example.xml} (100%)

diff --git a/src/test/resources/grsf_profile.xsd b/src/test/resources/grsf_profile.xsd
deleted file mode 100644
index 0cedbd4..0000000
--- a/src/test/resources/grsf_profile.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
-    vc:minVersion="1.1">
-
-<xs:redefine schemaLocation="profile5.xsd">
-  <xs:complexType name="Extra">
-    <xs:element name="country"/>
-  </xs:complexType>
-</xs:redefine>
-
-
-</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/profile_schemas/grsf_profile.xsd b/src/test/resources/profile_schemas/grsf_profile.xsd
new file mode 100644
index 0000000..852a74e
--- /dev/null
+++ b/src/test/resources/profile_schemas/grsf_profile.xsd
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+    vc:minVersion="1.1">
+
+	<xs:redefine schemaLocation="profile5.xsd">
+		<xs:complexType name="Extra">
+			<xs:complexContent>
+				<xs:extension base="Extra">
+					<xs:sequence>
+						<xs:element type="GRSFType" name="grsf" minOccurs="1" maxOccurs="1" />
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:redefine>
+
+	<xs:complexType name="GRSFType">
+		<xs:sequence>
+			<xs:element type="xs:string" name="srcField" minOccurs="1" maxOccurs="1" />
+			<xs:element type="xs:string" name="srcType" minOccurs="1" maxOccurs="1" />
+			<xs:element type="xs:string" name="mandatory" minOccurs="1" maxOccurs="1" />
+			<xs:element type="xs:boolean" name="isSensitive" minOccurs="1" maxOccurs="1" />
+			<xs:element name="dstTypes" minOccurs="1" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element type="DestinationType" name="dstType" minOccurs="1" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+        </xs:sequence>
+	</xs:complexType>
+
+	<xs:simpleType name="BaseDestinationType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Field"/>
+			<xs:enumeration value="Resource"/>
+			<xs:enumeration value="TimeSeries"/>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:complexType name="DestinationType">	
+	    <xs:simpleContent>
+        	<xs:extension base="BaseDestinationType">
+            	<xs:attribute type="xs:string" name="maxOccur" />
+        	</xs:extension>
+    	</xs:simpleContent>
+	</xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/profile5.xsd b/src/test/resources/profile_schemas/profile5.xsd
similarity index 100%
rename from src/test/resources/profile5.xsd
rename to src/test/resources/profile_schemas/profile5.xsd
diff --git a/src/test/resources/AssessmentUnit.xml b/src/test/resources/profiles/AssessmentUnit.xml
similarity index 96%
rename from src/test/resources/AssessmentUnit.xml
rename to src/test/resources/profiles/AssessmentUnit.xml
index 8057225..8d92dac 100644
--- a/src/test/resources/AssessmentUnit.xml
+++ b/src/test/resources/profiles/AssessmentUnit.xml
@@ -235,7 +235,9 @@
 				<srcField>catches</srcField>
 				<mandatory>false</mandatory>
 				<isSensitive>true</isSensitive>
-				<type>TimeSeries</type>
+				<dstTypes>
+					<dstType>TimeSeries</dstType>
+				</dstTypes>
 			</grsf>
 		</extra>
 	</metadatafield>
@@ -256,7 +258,9 @@
 				<srcField>landings</srcField>
 				<mandatory>false</mandatory>
 				<isSensitive>true</isSensitive>
-				<type>TimeSeries</type>
+				<dstTypes>
+					<dstType>TimeSeries</dstType>
+				</dstTypes>
 			</grsf>
 		</extra>
 	</metadatafield>
@@ -272,7 +276,9 @@
 				<srcField></srcField>
 				<mandatory>aggregated</mandatory>
 				<isSensitive>false</isSensitive>
-				<type>Field</type>
+				<dstTypes>
+					<dstType>Field</dstType>
+				</dstTypes>
 			</grsf>
 		</extra>
 	</metadatafield>
@@ -289,7 +295,9 @@
 				<srcField></srcField>
 				<mandatory>aggregated</mandatory>
 				<isSensitive>false</isSensitive>
-				<type>Field</type>
+				<dstTypes>
+					<dstType>Field</dstType>
+				</dstTypes>
 			</grsf>
 		</extra>
 	</metadatafield>
diff --git a/src/test/resources/metadatafield.xml b/src/test/resources/profiles/metadatafield_example.xml
similarity index 100%
rename from src/test/resources/metadatafield.xml
rename to src/test/resources/profiles/metadatafield_example.xml