Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Ignore whitespace during serialisation #7

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Fix: Ignore whitespace during serialisation #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8143e0
Fix: Ignore whitespace during serialisation
andyward May 9, 2023
be38011
Fixed paths for non-windows clients
andyward Sep 13, 2023
e757484
Bumped version
andyward Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 91 additions & 1 deletion Xbim.InformationSpecifications.NewTests/IoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,97 @@ public void CanLoadOptionalFacet()
var attr = spec.Requirement.Facets.FirstOrDefault();
attr.Should().BeOfType<AttributeFacet>();
spec.Requirement.RequirementOptions.Should().HaveCount(1);
spec.Requirement.RequirementOptions!.First().Should().Be(RequirementCardinalityOptions.Optional);
spec.Requirement.RequirementOptions![0].Should().Be(RequirementCardinalityOptions.Optional);

}

[Fact]
public void ShouldIgnoreWhitespaceInElements()
{
var f = new FileInfo(@"bsFiles/others/SimpleValueString_whitepace.ids");
Xids.CanLoad(f).Should().BeTrue();

var x = Xids.Load(f);
x.Should().NotBeNull();

var spec = x!.AllSpecifications().FirstOrDefault();
spec.Should().NotBeNull();


var facets = spec!.Requirement!.Facets.Union(spec.Applicability.Facets);
foreach (var facet in facets)
{
switch(facet)
{
case IfcTypeFacet type:
ValidateConstraint(type.IfcType, "string");
ValidateConstraint(type.PredefinedType, "string");
break
;
case AttributeFacet attr:
ValidateConstraint(attr.AttributeName, "string");
ValidateConstraint(attr.AttributeValue, "string");
break;

case IfcPropertyFacet prop:
ValidateConstraint(prop.PropertySetName, "string");
ValidateConstraint(prop.PropertyName, "string");
ValidateConstraint(prop.PropertyValue, "string");
break;

case IfcClassificationFacet cls:
ValidateConstraint(cls.ClassificationSystem, "string");
ValidateConstraint(cls.Identification, "string");
break;

case MaterialFacet mat:
ValidateConstraint(mat.Value, "string");
break;

case PartOfFacet part:
ValidateConstraint(part.EntityType!.IfcType, "string");
ValidateConstraint(part.EntityType!.PredefinedType, "string");
break;

default:
Assert.Fail($"Not implemented {facet.GetType().Name}");
break;
}
}


}

private void ValidateConstraint(ValueConstraint? constraint, string expected)
{
constraint.Should().NotBeNull();
if(constraint!.IsSingleExact(out var value))
{
value.ToString().Should().Be(expected);
}
else
{
if(constraint.AcceptedValues!.Count() > 1)
{
foreach(var enumValue in constraint.AcceptedValues!)
{
enumValue.IsSatisfiedBy(expected, constraint, false).Should().BeTrue();
}
}
else
{
var complexConstraint = constraint.AcceptedValues!.FirstOrDefault();
switch (complexConstraint)
{
case PatternConstraint p:
p.Pattern.Should().Be(expected);
break;
case RangeConstraint r:
r.MinValue.Should().Be(expected);
break;
}
}
}
}


Expand Down
3 changes: 3 additions & 0 deletions Xbim.InformationSpecifications.NewTests/Xbim.InformationSpecifications.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@
<None Update="bsFiles\others\pass-name_restrictions_will_match_any_result_1_3.ids">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="bsFiles\others\SimpleValueString_whitepace.ids">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Files\FutureFormat.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
172 changes: 172 additions & 0 deletions Xbim.InformationSpecifications.NewTests/bsFiles/others/SimpleValueString_whitepace.ids
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Created with Liquid Technologies Online Tools 1.0 (https://www.liquid-technologies.com) -->
<ids:ids xmlns:ids="http://standards.buildingsmart.org/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 ids_09.xsd">
<ids:info>
<ids:title>string</ids:title>
<ids:copyright>string</ids:copyright>
<ids:version>string</ids:version>
<ids:description>string</ids:description>
<ids:author>^@).Uj</ids:author>
<ids:date>2007-09-18</ids:date>
<ids:purpose>string</ids:purpose>
<ids:milestone>string</ids:milestone>
</ids:info>
<ids:specifications>
<ids:specification name="string" ifcVersion="IFC4 IFC2X3 IFC4X3 IFC2X3 IFC4 IFC2X3" description="string" instructions="string" minOccurs="1" maxOccurs="unbounded">
<ids:applicability>
<ids:entity>
<ids:name>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:name>
<ids:predefinedType>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:predefinedType>
</ids:entity>

<ids:classification>
<ids:value>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:value>
<ids:system>
<xs:restriction base="xs:string">
<xs:enumeration value="string"/>
<xs:enumeration value="string"/>
</xs:restriction>
</ids:system>
</ids:classification>
<ids:attribute>
<ids:name>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:name>
<ids:value>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:value>
</ids:attribute>
<ids:property>
<ids:propertySet>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:propertySet>
<ids:name>
<xs:restriction base="xs:string">
<xs:pattern value="string" />
</xs:restriction>
</ids:name>
<ids:value>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:value>
</ids:property>
<ids:material>
<ids:value>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:value>
</ids:material>
<ids:partOf relation="IfcRelAssignsToGroup">
<ids:entity>
<ids:name>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:name>
<ids:predefinedType>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:predefinedType>
</ids:entity>
</ids:partOf>
</ids:applicability>
<ids:requirements description="string">
<ids:entity>
<ids:name>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:name>
<ids:predefinedType>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:predefinedType>
</ids:entity>
<ids:partOf instructions="string" relation="IfcRelAggregates" minOccurs="1" maxOccurs="unbounded">
<ids:entity>
<ids:name>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:name>
<ids:predefinedType>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:predefinedType>
</ids:entity>
</ids:partOf>
<ids:classification uri="https://www.liquid-technologies.com" instructions="string" minOccurs="1" maxOccurs="unbounded">
<ids:value>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:value>
<ids:system>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:system>
</ids:classification>
<ids:attribute instructions="string">
<ids:name>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:name>
<ids:value>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:value>
</ids:attribute>
<ids:property uri="https://www.liquid-technologies.com" instructions="string" minOccurs="1" maxOccurs="unbounded">
<ids:propertySet>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:propertySet>
<ids:name>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:name>
<ids:value>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:value>
</ids:property>
<ids:material uri="https://www.liquid-technologies.com" instructions="string" minOccurs="1" maxOccurs="unbounded">
<ids:value>
<ids:simpleValue>
string
</ids:simpleValue>
</ids:value>
</ids:material>
</ids:requirements>
</ids:specification>
</ids:specifications>
</ids:ids>
2 changes: 1 addition & 1 deletion Xbim.InformationSpecifications/Values/ExactConstraint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ExactConstraint : IValueConstraintComponent, IEquatable<ExactConstr
/// <param name="value">The value of the constraint, expressed as a string</param>
public ExactConstraint(string value)
{
Value = value;
Value = value.Trim();
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Xbim.InformationSpecifications/Xbim.InformationSpecifications.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<AssemblyName>Xbim.InformationSpecifications</AssemblyName>
<RootNamespace>Xbim.InformationSpecifications</RootNamespace>
<!-- Remember to update the hardcoded AssemblyVersion property in XIDS-->
<AssemblyVersion>0.3.33</AssemblyVersion>
<AssemblyVersion>0.3.34</AssemblyVersion>
<!-- Remember to update the hardcoded AssemblyVersion property in XIDS-->
<FileVersion>$(AssemblyVersion)</FileVersion>
<Version>$(AssemblyVersion)</Version>
Expand Down
2 changes: 1 addition & 1 deletion Xbim.InformationSpecifications/Xids.AssemblyVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ public partial class Xids
/// This is useful for environments that do not allow to load information from the DLL dynamically
/// (e.g. Blazor).
/// </summary>
public static string AssemblyVersion => "0.3.33";
public static string AssemblyVersion => "0.3.34";
}
}
Loading