From 2b0bb7191ecbcdaf2f748533ae905f30dda141ce Mon Sep 17 00:00:00 2001
From: ankraft <an.kraft@googlemail.com>
Date: Mon, 21 Jan 2019 17:31:53 +0100
Subject: [PATCH] Removed BasicType "enum". Added BasicType "void". Added test
 case.

---
 SDT/schema4.0/src/domain.rng     |  2 +-
 SDT/schema4.0/src/domain.xsd     |  6 +++---
 SDT/schema4.0/test/void-test.xml | 23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 SDT/schema4.0/test/void-test.xml

diff --git a/SDT/schema4.0/src/domain.rng b/SDT/schema4.0/src/domain.rng
index b35d730..8c037eb 100644
--- a/SDT/schema4.0/src/domain.rng
+++ b/SDT/schema4.0/src/domain.rng
@@ -168,12 +168,12 @@
 			<value>byte</value>
 			<value>float</value>
 			<value>array</value>
-			<value>enum</value>
 			<value>date</value>
 			<value>time</value>
 			<value>datetime</value>
 			<value>blob</value>
 			<value>uri</value>
+			<value>void</value>
 		</choice>
 	</define>
 
diff --git a/SDT/schema4.0/src/domain.xsd b/SDT/schema4.0/src/domain.xsd
index 1071587..a600225 100644
--- a/SDT/schema4.0/src/domain.xsd
+++ b/SDT/schema4.0/src/domain.xsd
@@ -9,8 +9,8 @@
   - See the license text at [https://opensource.org/licenses/BSD-3-Clause for
   - full details.
 -->
-<xs:schema targetNamespace="http://homegatewayinitiative.org/xml/dal/3.0" 
-	   xmlns="http://homegatewayinitiative.org/xml/dal/3.0" 
+<xs:schema targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0" 
+	   xmlns="http://homegatewayinitiative.org/xml/dal/4.0" 
 	   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
 	  
  elementFormDefault="qualified">
@@ -136,12 +136,12 @@
       <xs:enumeration value="byte"/>
       <xs:enumeration value="float"/>
       <xs:enumeration value="array"/>
-      <xs:enumeration value="enum"/>
       <xs:enumeration value="date"/>
       <xs:enumeration value="time"/>
       <xs:enumeration value="datetime"/>
       <xs:enumeration value="blob"/>
       <xs:enumeration value="uri"/>
+      <xs:enumeration value="void"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:element name="Constraints">
diff --git a/SDT/schema4.0/test/void-test.xml b/SDT/schema4.0/test/void-test.xml
new file mode 100644
index 0000000..516bb7f
--- /dev/null
+++ b/SDT/schema4.0/test/void-test.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Test the void BasicType -->
+
+<Domain id="example2.SDT" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<Modules>
+		<ModuleClass name="TestVoid">
+			<Actions>
+				<Action name="TestVoidAction">
+					<DataType>
+						<SimpleType type="void"/>
+					</DataType>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="TestVoidDataPoint" writable="true">
+					<DataType>
+						<SimpleType type="void"/>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+	</Modules>
+</Domain>
\ No newline at end of file
-- 
GitLab