Merged PR 2514: Implemented final PartOf tests where filtering on predefined Type on Target r...

Implemented final PartOf tests where filtering on predefined Type on Target relation
Made possible by extension to Essentials.
Based on latest thinking of PDT inheritance at buildingSMART/IDS#240 (comment)

Author: andyward

Xbim.IDS.Validator.Common/Xbim.IDS.Validator.Common.csproj

@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="ids-lib" Version="1.0.56" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Xbim.Essentials" Version="6.0.414-develop" />
+    <PackageReference Include="Xbim.Essentials" Version="6.0.438-develop" />
     <PackageReference Include="Xbim.InformationSpecifications" Version="0.3.38" />
   </ItemGroup>
 

Xbim.IDS.Validator.Core.Tests/TestCases/PartOfTestCases.cs

@@ -22,9 +22,7 @@ public PartOfTestCases(ITestOutputHelper output) : base(output)
 
 
 
-            // Unsupported tests
-            { "pass-an_aggregate_may_specify_the_predefined_type_of_the_whole_1_2.ids", new [] { XbimSchemaVersion.Unsupported } }, // 
-            { "fail-an_aggregate_may_specify_the_predefined_type_of_the_whole_2_2.ids", new [] { XbimSchemaVersion.Unsupported } },
+            // Unsupported tests: None
 
         };
 
@@ -44,18 +42,6 @@ public async Task ExpectedPasses(string idsFile, params XbimSchemaVersion[] sche
         }
 
 
-       
-        [MemberData(nameof(GetUnsupportedPassTestCases))]
-        [SkippableTheory]
-        public async Task UnsupportedPasses(string idsFile)
-        {
-            var outcome = await VerifyIdsFile(idsFile);
-
-            Skip.If(outcome.Status != ValidationStatus.Pass, "Not yet supported");
-
-            outcome.Status.Should().Be(ValidationStatus.Pass);
-        }
-
 
 
 
@@ -75,17 +61,6 @@ public async Task ExpectedFailures(string idsFile, params XbimSchemaVersion[] sc
 
 
 
-        [MemberData(nameof(GetUnsupportedFailTestCases))]
-        [SkippableTheory]
-        public async Task UnsupportedFailures(string idsFile)
-        {
-            var outcome = await VerifyIdsFile(idsFile);
-
-
-            Skip.If(outcome.Status != ValidationStatus.Inconclusive, "Not yet supported");
-
-            outcome.Status.Should().Be(ValidationStatus.Fail);
-        }
 
         public static IEnumerable<object[]> GetFailureTestCases()
         {

Xbim.IDS.Validator.Core/Extensions/IfcRelationsExtensions.cs

@@ -131,12 +131,57 @@ private static bool MatchesPart(IIfcObjectDefinition obj, PartOfFacet facet)
             {
                 throw new ArgumentNullException(nameof(obj));
             }
-            // TODO: Limited support for Predefined Type only. Omits complex scenarios, Type Inheritance, Enums etc
+            // Based on latest thinking at https://github.com/buildingSMART/IDS/pull/240#issuecomment-1929367078
             return (facet.EntityType?.IfcType?.IsSatisfiedBy(obj.GetType().Name, true) == true) &&
-                (facet.EntityType?.PredefinedType == null || obj is IIfcObject p && facet.EntityType?.PredefinedType?.IsSatisfiedBy(p.ObjectType, true) == true)
+                (facet.EntityType?.PredefinedType == null || 
+                facet.EntityType?.PredefinedType?.IsSatisfiedBy(GetPredefinedType(obj), true) == true)
                 ;
         }
 
+        private static string? GetPredefinedType(IIfcObjectDefinition obj)
+        {
+            if(obj is IIfcObject o)
+            {
+                var definingType = o.IsTypedBy.FirstOrDefault()?.RelatingType;
+                if(definingType != null)
+                {
+                    return GetSubType(definingType);
+                }
+                else
+                {
+                    // No type
+                    return GetSubType(o);
+                }
+            }
+            else
+            {
+                return GetSubType(obj);
+            }
+        }
+
+        private static string? GetSubType(IIfcObjectDefinition definingType)
+        {
+            var pdt = definingType.GetPredefinedTypeValue();
+            if (pdt == null || pdt == "USERDEFINED")
+            {
+                return GetObjectType((IIfcObjectDefinition?)definingType) ?? pdt;
+            }
+            return pdt;
+        }
+
+
+        private static string? GetObjectType(IIfcObjectDefinition entity)
+        {
+            if (entity is IIfcObject obj)
+                return obj.ObjectType?.Value.ToString();
+            else if (entity is IIfcElementType type)
+                return type.ElementType?.Value.ToString();
+            else if (entity is IIfcTypeProcess process)
+                return process.ProcessType?.Value.ToString();
+            else
+                return null;
+        }
+
         private static IEnumerable<IIfcObjectDefinition> UnionAncestry(this IEnumerable<IIfcObjectDefinition> objs, PartOfRelation relation)
         {
             if (!objs.Any())