Fix for #28

- Added test case, - Correctly considered error status from the check.
buildingSMART · Mar 6, 2024 · f967e1a · f967e1a
1 parent 4df7222
commit f967e1a
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/ids-lib/IdsSchema/XsNodes/XsRestriction.cs b/ids-lib/IdsSchema/XsNodes/XsRestriction.cs
@@ -131,7 +131,7 @@ protected internal override Audit.Status PerformAudit(AuditStateInformation stat
 		if (Base == BaseTypes.Invalid)
 			ret |= IdsErrorMessages.Report303RestrictionBadType(logger, this, BaseAsString);
         if (!Children.Any())
-            IdsErrorMessages.Report304RestrictionEmptyContent(logger, this);
+            ret |= IdsErrorMessages.Report304RestrictionEmptyContent(logger, this);
 		return ret;
     }
 }
diff --git a/ids-tool.tests/IssueFiles/Issue 28 - Empty restriction.ids b/ids-tool.tests/IssueFiles/Issue 28 - Empty restriction.ids
@@ -0,0 +1,30 @@
+<ids:ids xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/0.9.7/ids.xsd" xmlns:ids="http://standards.buildingsmart.org/IDS">
+  <!--edited with usBIM.IDSeditor 2.0.2.0 (http://www.accasoftware.com)-->
+  <ids:info>
+    <ids:title>New ids file2</ids:title>
+    <ids:milestone>jhnkjn3333</ids:milestone>
+  </ids:info>
+  <ids:specifications>
+    <ids:specification ifcVersion="IFC4X3" name="Nuova Specifica">
+      <ids:applicability minOccurs="1" maxOccurs="unbounded">
+        <ids:entity>
+          <ids:name>
+            <ids:simpleValue>IFCACTUATOR</ids:simpleValue>
+          </ids:name>
+        </ids:entity>
+        <ids:property dataType="IFCACCELERATIONMEASURE">
+          <ids:propertySet>
+            <ids:simpleValue>asca</ids:simpleValue>
+          </ids:propertySet>
+          <ids:baseName>
+            <xs:restriction base="xs:string" />
+          </ids:baseName>
+          <ids:value>
+            <ids:simpleValue>w</ids:simpleValue>
+          </ids:value>
+        </ids:property>
+      </ids:applicability>
+      <ids:requirements />
+    </ids:specification>
+  </ids:specifications>
+</ids:ids>
diff --git a/ids-tool.tests/IssueTests.cs b/ids-tool.tests/IssueTests.cs
@@ -40,10 +40,17 @@ public void Issue11_IfcLogicalIsValidDatatype()
 		}
 
 		[Fact]
-		public void Issue11_IfcPropertySetFound()
+		public void Issue25_IfcPropertySetFound()
 		{
 			var f = new FileInfo("IssueFiles/Issue 25 - Pset_ConstructionOccurence.ids");
 			LoggerAndAuditHelpers.FullAudit(f, XunitOutputHelper, IdsLib.Audit.Status.Ok);
 		}
+
+		[Fact]
+		public void Issue_28_EmptyRestriction()
+		{
+			var f = new FileInfo("IssueFiles/Issue 28 - Empty restriction.ids");
+			LoggerAndAuditHelpers.FullAudit(f, XunitOutputHelper, IdsLib.Audit.Status.IdsContentError, 1);
+		}
 	}
 }
diff --git a/ids-tool.tests/ids-tool.tests.csproj b/ids-tool.tests/ids-tool.tests.csproj
@@ -174,6 +174,9 @@
 		<None Update="IssueFiles\Issue 25 - Pset_ConstructionOccurence.ids">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
+		<None Update="IssueFiles\Issue 28 - Empty restriction.ids">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 		<None Update="ValidFiles\entities_enumeration.ids">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>