Updated property sets.

Added test for issue #25
buildingSMART · Mar 6, 2024 · 4df7222 · 4df7222
1 parent 6903f38
commit 4df7222
Show file tree

Hide file tree

Showing 16 changed files with 218 additions and 173 deletions.
diff --git a/ids-lib.codegen/ids-lib.codegen.csproj b/ids-lib.codegen/ids-lib.codegen.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-1.final" />
-    <PackageReference Include="Xbim.Essentials" Version="6.0.443-develop" />
-    <PackageReference Include="Xbim.Properties" Version="6.0.10" />
+    <PackageReference Include="Xbim.Essentials" Version="6.0.445" />
+    <PackageReference Include="Xbim.Properties" Version="6.0.11" />
     <PackageReference Include="XmlDocMarkdown.Core" Version="2.9.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/ids-lib/IfcSchema/SchemaInfo.Attributes.g.cs b/ids-lib/IfcSchema/SchemaInfo.Attributes.g.cs
@@ -1,4 +1,4 @@
-// generated code via ids-lib.codegen using Xbim.Essentials 6.0.0.443 - any changes made directly here will be lost
+// generated code via ids-lib.codegen using Xbim.Essentials 6.0.445.0 - any changes made directly here will be lost
 
 using System;
 

diff --git a/ids-lib/IfcSchema/SchemaInfo.ClassAndAttributeNames.g.cs b/ids-lib/IfcSchema/SchemaInfo.ClassAndAttributeNames.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// This code was automatically generated with information from Xbim.Essentials 6.0.0.443.
+// This code was automatically generated with information from Xbim.Essentials 6.0.445.0.
 // Any changes made to this file will be lost.
 
 using System;

diff --git a/ids-lib/IfcSchema/SchemaInfo.MeasureNames.g.cs b/ids-lib/IfcSchema/SchemaInfo.MeasureNames.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// This code was automatically generated with information from Xbim.Essentials 6.0.0.443.
+// This code was automatically generated with information from Xbim.Essentials 6.0.445.0.
 // Any changes made to this file will be lost.
 
 using System;

diff --git a/ids-lib/IfcSchema/SchemaInfo.ObjectTypes.g.cs b/ids-lib/IfcSchema/SchemaInfo.ObjectTypes.g.cs
@@ -1,4 +1,4 @@
-// programmatically generated from ids-lib.codegen using Xbim 6.0.0.443
+// programmatically generated from ids-lib.codegen using Xbim 6.0.445.0
 using System.Collections.Generic;
 
 namespace IdsLib.IfcSchema;

diff --git a/ids-lib/IfcSchema/SchemaInfo.PartOfRelations.g.cs b/ids-lib/IfcSchema/SchemaInfo.PartOfRelations.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// This code was automatically generated with information from Xbim.Essentials 6.0.0.443.
+// This code was automatically generated with information from Xbim.Essentials 6.0.445.0.
 // Any changes made to this file will be lost.
 
 using System;

diff --git a/ids-lib/IfcSchema/SchemaInfo.Properties.g.cs b/ids-lib/IfcSchema/SchemaInfo.Properties.g.cs
diff --git a/ids-lib/IfcSchema/SchemaInfo.Schemas.g.cs b/ids-lib/IfcSchema/SchemaInfo.Schemas.g.cs
@@ -1,4 +1,4 @@
-// generated code via ids-lib.codegen using Xbim.Essentials 6.0.0.443, any changes to this file will be lost at next regeneration
+// generated code via ids-lib.codegen using Xbim.Essentials 6.0.445.0, any changes to this file will be lost at next regeneration
 
 using System.Linq;
 

diff --git a/ids-lib/LibraryInformation.cs b/ids-lib/LibraryInformation.cs
@@ -26,5 +26,5 @@ public static class LibraryInformation
 	/// <summary>
 	/// Static field with hardcoded DLL version number. 
 	/// </summary>
-	public static string AssemblyVersion => "1.0.64";
+	public static string AssemblyVersion => "1.0.65";
 }
diff --git a/ids-lib/ids-lib.csproj b/ids-lib/ids-lib.csproj
@@ -20,7 +20,7 @@
 		<PackageReleaseNotes>First implementation.</PackageReleaseNotes>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<!-- Github actions are setup so that when this version is bumped the nuget package is uploaded -->
-		<AssemblyVersion>1.0.64</AssemblyVersion>
+		<AssemblyVersion>1.0.65</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/ids-tool.tests/IdsSchemaTests.cs b/ids-tool.tests/IdsSchemaTests.cs
@@ -100,6 +100,7 @@ public async void BuildingSmartWebServerShouldReturnSchemaCorrectly(string url)
 
 			var c = new HttpClient();
             var t = await c.GetAsync(url);
+
             var tp = t.Content.Headers.ContentType;
             Skip.If(tp is null, "contentype is null");
             Skip.If(!acceptable.Contains(tp.ToString()), $"contentype is `{tp}` is not in the acceptable range.");

diff --git a/ids-tool.tests/IfcPredefinedPropertiesTests.cs b/ids-tool.tests/IfcPredefinedPropertiesTests.cs
@@ -94,7 +94,8 @@ public void IfcPropertyNameCoherenceAcrossSchemas()
                     unexpectedMeasureTypes++;
                 }
             }
-            unexpectedMeasureTypes.Should().Be(516, "these are the acknowledged variations");
+            var expectedCount = 526;
+            unexpectedMeasureTypes.Should().Be(expectedCount, $"{expectedCount} is the count of acknowledged variations");
         }
     }
 }
diff --git a/ids-tool.tests/IssueFiles/Issue 25 - Pset_ConstructionOccurence.ids b/ids-tool.tests/IssueFiles/Issue 25 - Pset_ConstructionOccurence.ids
@@ -0,0 +1,32 @@
+<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 (http://www.accasoftware.com)-->
+  <ids:info>
+    <ids:title>PilotTest</ids:title>
+  </ids:info>
+  <ids:specifications>
+    <ids:specification ifcVersion="IFC4X3" name="Specification IfcPile">
+      <ids:applicability maxOccurs="unbounded">
+        <ids:entity>
+          <ids:name>
+            <ids:simpleValue>IFCPILE</ids:simpleValue>
+          </ids:name>
+        </ids:entity>
+      </ids:applicability>
+      <ids:requirements>
+        <ids:property dataType="IFCLABEL" instructions="The model number and/or unit designator assigned by the manufacturer of the manufactured item.">
+          <ids:propertySet>
+            <ids:simpleValue>Pset_ConstructionOccurence</ids:simpleValue>
+          </ids:propertySet>
+          <ids:baseName>
+            <ids:simpleValue>ModelNumber</ids:simpleValue>
+          </ids:baseName>
+          <ids:value>
+            <xs:restriction base="xs:string">
+              <xs:pattern value="PIL-\d{3}" />
+            </xs:restriction>
+          </ids:value>
+        </ids:property>
+      </ids:requirements>
+    </ids:specification>
+  </ids:specifications>
+</ids:ids>
diff --git a/ids-tool.tests/IssueTests.cs b/ids-tool.tests/IssueTests.cs
@@ -38,5 +38,12 @@ public void Issue11_IfcLogicalIsValidDatatype()
 			var f = new FileInfo("IssueFiles/Issue 11 - IfcLogical.ids");
 			LoggerAndAuditHelpers.FullAudit(f, XunitOutputHelper, IdsLib.Audit.Status.Ok);
 		}
+
+		[Fact]
+		public void Issue11_IfcPropertySetFound()
+		{
+			var f = new FileInfo("IssueFiles/Issue 25 - Pset_ConstructionOccurence.ids");
+			LoggerAndAuditHelpers.FullAudit(f, XunitOutputHelper, IdsLib.Audit.Status.Ok);
+		}
 	}
 }
diff --git a/ids-tool.tests/ids-tool.tests.csproj b/ids-tool.tests/ids-tool.tests.csproj
@@ -12,7 +12,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FluentAssertions" Version="6.10.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 		<PackageReference Include="NSubstitute" Version="5.1.0" />
 		<PackageReference Include="xunit" Version="2.4.2" />
@@ -171,6 +171,9 @@
 		<None Update="IssueFiles\Issue 09 - XML structure.ids">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
+		<None Update="IssueFiles\Issue 25 - Pset_ConstructionOccurence.ids">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 		<None Update="ValidFiles\entities_enumeration.ids">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
@@ -188,10 +191,6 @@
 		</None>
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="IssueFiles\IDS Repo\" />
-	</ItemGroup>
-
 
 
 </Project>
diff --git a/ids-tool/ids-tool.csproj b/ids-tool/ids-tool.csproj
@@ -16,7 +16,7 @@
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageTags>IDS, buildingSmart</PackageTags>
 		<!-- Github actions are setup so that when this version is bumped the nuget package is uploaded -->
-		<AssemblyVersion>1.0.64</AssemblyVersion>
+		<AssemblyVersion>1.0.65</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<RepositoryUrl>https://github.com/buildingSMART/IDS-Audit-tool.git</RepositoryUrl>