Improved test cases on Attribute facet

- Updating the ids-tool.CommandLine to Version=1.0.66 a few errors emerged in the test cases and development IDS files. - Some cases have been marked "invalid" instead of "fail" to highlight that the audit tool can spot their problems - Some restriction types were missing, and have been added. - Some restriction types have been fixed (e.g.. integer vs double).
CBenghi · Mar 26, 2024 · bd2162e · bd2162e
1 parent 4b1db14
commit bd2162e
Show file tree

Hide file tree

Showing 26 changed files with 50 additions and 48 deletions.
diff --git a/Development/IDS_SimpleBIM_examples.ids b/Development/IDS_SimpleBIM_examples.ids
@@ -27,7 +27,7 @@
 						<ids:simpleValue>Name</ids:simpleValue>
 					</ids:name>
 					<ids:value>
-						<xs:restriction>
+						<xs:restriction base="xs:string">
 							<xs:enumeration value="first allowed value for room"/>
 							<xs:enumeration value="second allowed value for room"/>
 							<xs:enumeration value="third allowed value for room"/>

diff --git a/Development/IDS_oma.ids b/Development/IDS_oma.ids
@@ -22,7 +22,7 @@
 						<ids:simpleValue>ObjectType</ids:simpleValue>
 					</ids:name>
 					<ids:value>
-						<xs:restriction>
+						<xs:restriction base="xs:string">
 							<xs:enumeration value="Assembly"/>
 							<xs:enumeration value="Ambulatory Health Care"/>
 							<xs:enumeration value="Educational"/>
@@ -190,7 +190,7 @@
 						<ids:simpleValue>PredefinedType</ids:simpleValue>
 					</ids:name>
 					<ids:value>
-						<xs:restriction>
+						<xs:restriction base="xs:string">
 							<xs:enumeration value="CONSTRUCTION"/>
 							<xs:enumeration value="FIRESAFETY"/>
 							<xs:enumeration value="LIGHTING"/>
@@ -885,7 +885,7 @@
 						<ids:simpleValue>OperationType</ids:simpleValue>
 					</ids:name>
 					<ids:value>
-						<xs:restriction>
+						<xs:restriction base="xs:string">
 							<xs:enumeration value="LIMIT_RATE_INBOUND"/>
 							<xs:enumeration value="LIMIT_RATE_OUTBOUND"/>
 							<xs:enumeration value="NOTDEFINED"/>

diff --git a/Documentation/testcases/attribute/fail-dates_are_treated_as_strings_1_2.ids b/Documentation/testcases/attribute/fail-dates_are_treated_as_strings_1_2.ids
@@ -5,7 +5,7 @@
     <description>Generated via code automation in the Ids Repository on github.</description>
   </info>
   <specifications>
-    <specification name="Dates are treated as strings 1/2" ifcVersion="IFC2X3 IFC4">
+    <specification name="Dates are treated as strings 1/2" ifcVersion="IFC4">
       <applicability maxOccurs="unbounded">
         <entity>
           <name>

diff --git a/...il-value_checks_always_fail_for_lists.ids → ...id-value_checks_always_fail_for_lists.ids b/...il-value_checks_always_fail_for_lists.ids → ...id-value_checks_always_fail_for_lists.ids
diff --git a/...il-value_checks_always_fail_for_lists.ifc → ...id-value_checks_always_fail_for_lists.ifc b/...il-value_checks_always_fail_for_lists.ifc → ...id-value_checks_always_fail_for_lists.ifc
diff --git a/...-value_checks_always_fail_for_objects.ids → ...-value_checks_always_fail_for_objects.ids b/...-value_checks_always_fail_for_objects.ids → ...-value_checks_always_fail_for_objects.ids
diff --git a/...-value_checks_always_fail_for_objects.ifc → ...-value_checks_always_fail_for_objects.ifc b/...-value_checks_always_fail_for_objects.ifc → ...-value_checks_always_fail_for_objects.ifc
diff --git a/...-value_checks_always_fail_for_selects.ids → ...-value_checks_always_fail_for_selects.ids b/...-value_checks_always_fail_for_selects.ids → ...-value_checks_always_fail_for_selects.ids
diff --git a/...-value_checks_always_fail_for_selects.ifc → ...-value_checks_always_fail_for_selects.ifc b/...-value_checks_always_fail_for_selects.ifc → ...-value_checks_always_fail_for_selects.ifc
diff --git a/...pass-dates_are_treated_as_strings_1_2.ids → ...pass-dates_are_treated_as_strings_2_2.ids b/...pass-dates_are_treated_as_strings_1_2.ids → ...pass-dates_are_treated_as_strings_2_2.ids
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="http://standards.buildingsmart.org/IDS">
   <info>
-    <title>Dates are treated as strings 1/2</title>
+    <title>Dates are treated as strings 2/2</title>
     <description>Generated via code automation in the Ids Repository on github.</description>
   </info>
   <specifications>
-    <specification name="Dates are treated as strings 1/2" ifcVersion="IFC4">
+    <specification name="Dates are treated as strings 2/2" ifcVersion="IFC4">
       <applicability maxOccurs="unbounded">
         <entity>
           <name>

diff --git a/...pass-dates_are_treated_as_strings_1_2.ifc → ...pass-dates_are_treated_as_strings_2_2.ifc b/...pass-dates_are_treated_as_strings_1_2.ifc → ...pass-dates_are_treated_as_strings_2_2.ifc
diff --git a/...estcases/attribute/pass-strict_numeric_checking_may_be_done_with_a_bounds_restriction.ids b/...estcases/attribute/pass-strict_numeric_checking_may_be_done_with_a_bounds_restriction.ids
@@ -19,7 +19,7 @@
             <simpleValue>RefractionIndex</simpleValue>
           </name>
           <value>
-            <xs:restriction base="xs:decimal">
+            <xs:restriction base="xs:double">
               <xs:minInclusive value="42" />
               <xs:maxInclusive value="42" />
             </xs:restriction>

diff --git a/Documentation/testcases/restriction/fail-a_bound_can_be_inclusive_1_3.ids b/Documentation/testcases/restriction/fail-a_bound_can_be_inclusive_1_3.ids
@@ -19,7 +19,7 @@
             <simpleValue>RefractionIndex</simpleValue>
           </name>
           <value>
-            <xs:restriction base="xs:integer">
+            <xs:restriction base="xs:double">
               <xs:minExclusive value="0" />
               <xs:maxExclusive value="10" />
             </xs:restriction>

diff --git a/Documentation/testcases/restriction/fail-a_bound_can_be_inclusive_3_3.ids b/Documentation/testcases/restriction/fail-a_bound_can_be_inclusive_3_3.ids
@@ -19,7 +19,7 @@
             <simpleValue>RefractionIndex</simpleValue>
           </name>
           <value>
-            <xs:restriction base="xs:integer">
+            <xs:restriction base="xs:double">
               <xs:minExclusive value="0" />
               <xs:maxExclusive value="10" />
             </xs:restriction>

diff --git a/Documentation/testcases/restriction/fail-a_bound_can_be_inclusive_4_4.ids b/Documentation/testcases/restriction/fail-a_bound_can_be_inclusive_4_4.ids
@@ -19,7 +19,7 @@
             <simpleValue>RefractionIndex</simpleValue>
           </name>
           <value>
-            <xs:restriction base="xs:integer">
+            <xs:restriction base="xs:double">
               <xs:minInclusive value="0" />
               <xs:maxInclusive value="10" />
             </xs:restriction>

diff --git a/...il-patterns_always_fail_on_any_number.ids → ...id-patterns_always_fail_on_any_number.ids b/...il-patterns_always_fail_on_any_number.ids → ...id-patterns_always_fail_on_any_number.ids
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="http://standards.buildingsmart.org/IDS">
   <info>
-    <title>Patterns always fail on any number</title>
+    <title>Patterns always invalid on any number</title>
     <description>Generated via code automation in the Ids Repository on github.</description>
   </info>
   <specifications>
-    <specification name="Patterns always fail on any number" ifcVersion="IFC2X3 IFC4">
+    <specification name="Patterns always invalid on any number" ifcVersion="IFC2X3 IFC4">
       <applicability minOccurs="0" maxOccurs="unbounded">
         <entity>
           <name>

diff --git a/...il-patterns_always_fail_on_any_number.ifc → ...id-patterns_always_fail_on_any_number.ifc b/...il-patterns_always_fail_on_any_number.ifc → ...id-patterns_always_fail_on_any_number.ifc
diff --git a/...only_work_on_strings_and_nothing_else.ids → ...only_work_on_strings_and_nothing_else.ids b/...only_work_on_strings_and_nothing_else.ids → ...only_work_on_strings_and_nothing_else.ids
diff --git a/...only_work_on_strings_and_nothing_else.ifc → ...only_work_on_strings_and_nothing_else.ifc b/...only_work_on_strings_and_nothing_else.ifc → ...only_work_on_strings_and_nothing_else.ifc
diff --git a/Documentation/testcases/restriction/pass-a_bound_can_be_inclusive_1_4.ids b/Documentation/testcases/restriction/pass-a_bound_can_be_inclusive_1_4.ids
@@ -19,7 +19,7 @@
             <simpleValue>RefractionIndex</simpleValue>
           </name>
           <value>
-            <xs:restriction base="xs:integer">
+            <xs:restriction base="xs:double">
               <xs:minInclusive value="0" />
               <xs:maxInclusive value="10" />
             </xs:restriction>

diff --git a/Documentation/testcases/restriction/pass-a_bound_can_be_inclusive_2_3.ids b/Documentation/testcases/restriction/pass-a_bound_can_be_inclusive_2_3.ids
@@ -19,7 +19,7 @@
             <simpleValue>RefractionIndex</simpleValue>
           </name>
           <value>
-            <xs:restriction base="xs:integer">
+            <xs:restriction base="xs:double">
               <xs:minExclusive value="0" />
               <xs:maxExclusive value="10" />
             </xs:restriction>

diff --git a/Documentation/testcases/restriction/pass-a_bound_can_be_inclusive_2_4.ids b/Documentation/testcases/restriction/pass-a_bound_can_be_inclusive_2_4.ids
@@ -19,7 +19,7 @@
             <simpleValue>RefractionIndex</simpleValue>
           </name>
           <value>
-            <xs:restriction base="xs:integer">
+            <xs:restriction base="xs:double">
               <xs:minInclusive value="0" />
               <xs:maxInclusive value="10" />
             </xs:restriction>

diff --git a/Documentation/testcases/restriction/pass-a_bound_can_be_inclusive_3_4.ids b/Documentation/testcases/restriction/pass-a_bound_can_be_inclusive_3_4.ids
@@ -19,7 +19,7 @@
             <simpleValue>RefractionIndex</simpleValue>
           </name>
           <value>
-            <xs:restriction base="xs:integer">
+            <xs:restriction base="xs:double">
               <xs:minInclusive value="0" />
               <xs:maxInclusive value="10" />
             </xs:restriction>

diff --git a/Documentation/testcases/scripts.md b/Documentation/testcases/scripts.md
@@ -245,15 +245,16 @@ Attribute: ''IsMilestone'',''FALSE''
 
 ``` ids attribute/fail-dates_are_treated_as_strings_1_2.ids
 Dates are treated as strings 1/2
+IFC4
 Entity: ''IFCCLASSIFICATION''
 Requirements:
 Attribute: ''EditionDate'',''2022-01-01''
 ```
 
-### Dates are treated as strings 1/2
+### Dates are treated as strings 2/2
 
-``` ids attribute/pass-dates_are_treated_as_strings_1_2.ids
-Dates are treated as strings 1/2
+``` ids attribute/pass-dates_are_treated_as_strings_2_2.ids
+Dates are treated as strings 2/2
 IFC4
 Entity: ''IFCCLASSIFICATION''
 Requirements:
@@ -510,7 +511,7 @@ Attribute: Pattern(''NumberOfRiser(s)?''),''42.3''
 Strict numeric checking may be done with a bounds restriction
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:
-Attribute: ''RefractionIndex'',xs:decimal MinInclusive(''42'') MaxInclusive(''42'')
+Attribute: ''RefractionIndex'',xs:double MinInclusive(''42'') MaxInclusive(''42'')
 ```
 
 ### Typecast checking may also occur within enumeration restrictions
@@ -529,7 +530,7 @@ Attribute: ''RefractionIndex'',xs:double Enumeration(''42'',''43'')
 
 ### Value checks always fail for lists
 
-``` ids attribute/fail-value_checks_always_fail_for_lists.ids
+``` ids attribute/invalid-value_checks_always_fail_for_lists.ids
 Value checks always fail for lists
 Entity: ''IFCCARTESIANPOINT''
 Requirements:
@@ -538,7 +539,7 @@ Attribute: ''Coordinates'',''Foobar''
 
 ### Value checks always fail for objects
 
-``` ids attribute/fail-value_checks_always_fail_for_objects.ids
+``` ids attribute/invalid-value_checks_always_fail_for_objects.ids
 Value checks always fail for objects
 IFC4
 Entity: ''IFCTASK''
@@ -548,7 +549,7 @@ Attribute: ''TaskTime'',''Foobar''
 
 ### Value checks always fail for selects
 
-``` ids attribute/fail-value_checks_always_fail_for_selects.ids
+``` ids attribute/invalid-value_checks_always_fail_for_selects.ids
 Value checks always fail for selects
 Entity: ''IFCSURFACESTYLERENDERING''
 Requirements:
@@ -2449,7 +2450,7 @@ Property: ''Pset_WallCommon'',''FireRating'',IFCLABEL,Pattern(''(-|[0-9]{2,3})\/
 A bound can be inclusive 1/3
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:
-Attribute: ''RefractionIndex'',xs:integer MinExclusive(''0'') MaxExclusive(''10'')
+Attribute: ''RefractionIndex'',xs:double MinExclusive(''0'') MaxExclusive(''10'')
 ```
 
 ### A bound can be inclusive 1/4
@@ -2458,7 +2459,7 @@ Attribute: ''RefractionIndex'',xs:integer MinExclusive(''0'') MaxExclusive(''10'
 A bound can be inclusive 1/4
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:
-Attribute: ''RefractionIndex'',xs:integer MinInclusive(''0'') MaxInclusive(''10'')
+Attribute: ''RefractionIndex'',xs:double MinInclusive(''0'') MaxInclusive(''10'')
 ```
 
 ### A bound can be inclusive 2/3
@@ -2467,7 +2468,7 @@ Attribute: ''RefractionIndex'',xs:integer MinInclusive(''0'') MaxInclusive(''10'
 A bound can be inclusive 2/3
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:
-Attribute: ''RefractionIndex'',xs:integer MinExclusive(''0'') MaxExclusive(''10'')
+Attribute: ''RefractionIndex'',xs:double MinExclusive(''0'') MaxExclusive(''10'')
 ```
 
 ### A bound can be inclusive 2/4
@@ -2476,7 +2477,7 @@ Attribute: ''RefractionIndex'',xs:integer MinExclusive(''0'') MaxExclusive(''10'
 A bound can be inclusive 2/4
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:
-Attribute: ''RefractionIndex'',xs:integer MinInclusive(''0'') MaxInclusive(''10'')
+Attribute: ''RefractionIndex'',xs:double MinInclusive(''0'') MaxInclusive(''10'')
 ```
 
 ### A bound can be inclusive 3/3
@@ -2485,7 +2486,7 @@ Attribute: ''RefractionIndex'',xs:integer MinInclusive(''0'') MaxInclusive(''10'
 A bound can be inclusive 3/3
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:
-Attribute: ''RefractionIndex'',xs:integer MinExclusive(''0'') MaxExclusive(''10'')
+Attribute: ''RefractionIndex'',xs:double MinExclusive(''0'') MaxExclusive(''10'')
 ```
 
 ### A bound can be inclusive 3/4
@@ -2494,7 +2495,7 @@ Attribute: ''RefractionIndex'',xs:integer MinExclusive(''0'') MaxExclusive(''10'
 A bound can be inclusive 3/4
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:
-Attribute: ''RefractionIndex'',xs:integer MinInclusive(''0'') MaxInclusive(''10'')
+Attribute: ''RefractionIndex'',xs:double MinInclusive(''0'') MaxInclusive(''10'')
 ```
 
 ### A bound can be inclusive 4/4
@@ -2503,7 +2504,7 @@ Attribute: ''RefractionIndex'',xs:integer MinInclusive(''0'') MaxInclusive(''10'
 A bound can be inclusive 4/4
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:
-Attribute: ''RefractionIndex'',xs:integer MinInclusive(''0'') MaxInclusive(''10'')
+Attribute: ''RefractionIndex'',xs:double MinInclusive(''0'') MaxInclusive(''10'')
 ```
 
 ### An enumeration matches case sensitively 1/3
@@ -2596,10 +2597,10 @@ Requirements:
 Attribute: ''Name'',MinLength(''2'') MaxLength(''3'')
 ```
 
-### Patterns always fail on any number
+### Patterns always invalid on any number
 
-``` ids restriction/fail-patterns_always_fail_on_any_number.ids
-Patterns always fail on any number
+``` ids restriction/invalid-patterns_always_fail_on_any_number.ids
+Patterns always invalid on any number
 Optional
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:
@@ -2608,7 +2609,7 @@ Attribute: ''RefractionIndex'',Pattern(''.*'')
 
 ### Patterns only work on strings and nothing else
 
-``` ids restriction/fail-patterns_only_work_on_strings_and_nothing_else.ids
+``` ids restriction/invalid-patterns_only_work_on_strings_and_nothing_else.ids
 Patterns only work on strings and nothing else
 Entity: ''IFCSURFACESTYLEREFRACTION''
 Requirements:

diff --git a/SchemaProject/program.cs b/SchemaProject/program.cs
@@ -115,16 +115,6 @@ private static void RegenIDS()
 				buffer.AppendLine(line);
 			}
 		}
-
-		// extra IDSs
-		foreach (var item in allIDSs.Except(newIDSs))
-		{
-			string t = IdsHelpers.CreateDiffReportHtml(item);
-			var reportFileName = Path.ChangeExtension(item, "html");
-			File.WriteAllText(reportFileName, t);
-			Console.WriteLine($"Extra IDS report generated: {reportFileName}");
-		}
-
 		// extra ifcs
 		foreach (var item in testCasesFolder.GetFiles("*.ifc", SearchOption.AllDirectories))
 		{
@@ -134,15 +124,26 @@ private static void RegenIDS()
 				var invalidFileName = item.FullName.Replace("fail-", "invalid-");
 				if (missingIfcFileNames.Contains(invalidFileName))
 				{
-					// File.Move(item.FullName, invalidFileName);
-					Console.WriteLine("A matching invalid IFC is required, should you rename this?");
+					File.Move(item.FullName, invalidFileName);
+					// Console.WriteLine("A matching invalid IFC is required, should you rename this?");
 				}
 				//else if (allIfcFound)
 				//{
 				//	// item.Delete();
 				//}
 			}
 		}
+
+		// extra IDSs
+		foreach (var item in allIDSs.Except(newIDSs))
+		{
+			string t = IdsHelpers.CreateDiffReportHtml(item);
+			var reportFileName = Path.ChangeExtension(item, "html");
+			File.WriteAllText(reportFileName, t);
+			Console.WriteLine($"Extra IDS report generated: {reportFileName}");
+		}
+
+
 		if (allIfcFound)
 		{
 			Message("All scripting IFC files found", ConsoleColor.Green);

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Nuke.Common" Version="6.3.0" />
-    <PackageReference Include="ids-tool.CommandLine" Version="1.0.64" />
+    <PackageReference Include="ids-tool.CommandLine" Version="1.0.66" />
     <PackageDownload Include="dotnet-xscgen" Version="[2.1.1094]" />
   </ItemGroup>