Skip to content

Commit f1c7df2

Browse files
authored
DYN-9537: Fix unit tests for cross version schemas support (DynamoDS#16571)
1 parent bdb5449 commit f1c7df2

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

test/DynamoCoreTests/UnitsOfMeasureTests.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,11 @@ public void CanCreateForgeUnitType_FromFutureTypeString()
779779
var unitType = Unit.ByTypeID($"{milimeters}-99.9.9");
780780
Assert.NotNull(unitType);
781781
Assert.AreEqual("Millimeters", unitType.Name);
782-
Assert.AreEqual($"{milimeters}-2.0.0", unitType.TypeId);
782+
783+
// Depending on the test system, the latest known version could be either -2.0.0 or -1.0.1
784+
var expectedVersions = new[] { $"{milimeters}-2.0.0", $"{milimeters}-1.0.1" };
785+
Assert.That(expectedVersions, Contains.Item(unitType.TypeId),
786+
$"Expected TypeId to be one of the known versions, but got: {unitType.TypeId}");
783787
}
784788
[Test, Category("UnitTests")]
785789
public void CanCreateForgeUnitType_FromPastTypeString()
@@ -788,7 +792,11 @@ public void CanCreateForgeUnitType_FromPastTypeString()
788792
var unitType = Unit.ByTypeID($"{milimeters}-0.0.1");
789793
Assert.NotNull(unitType);
790794
Assert.AreEqual("Millimeters", unitType.Name);
791-
Assert.AreEqual($"{milimeters}-2.0.0", unitType.TypeId);
795+
796+
// Depending on the test system, the latest known version could be either -2.0.0 or -1.0.1
797+
var expectedVersions = new[] { $"{milimeters}-2.0.0", $"{milimeters}-1.0.1" };
798+
Assert.That(expectedVersions, Contains.Item(unitType.TypeId),
799+
$"Expected TypeId to be one of the known versions, but got: {unitType.TypeId}");
792800
}
793801
[Test, Category("UnitTests")]
794802
public void ForgeUnitEquality()

test/DynamoCoreWpf3Tests/UnitsUITests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ public void ForgeUnitDropdownsLoadWithMalformedData()
198198
Assert.AreNotEqual("autodesk.unit.quantity:force", GetTypeName<DynamoUnits.Quantity>(node3.CachedValue.Data));
199199
Assert.AreEqual("autodesk.unit.quantity:flowPerVolume", GetTypeName<DynamoUnits.Quantity>(node3.CachedValue.Data));
200200
Assert.AreEqual("autodesk.unit.symbol:mm", GetTypeName<DynamoUnits.Symbol>(node4.CachedValue.Data));
201-
Assert.AreEqual("autodesk.unit.unit:maxwells", GetTypeName<DynamoUnits.Unit>(node5.CachedValue.Data));
202201
Assert.AreEqual("autodesk.unit.unit:meters", GetTypeName<DynamoUnits.Unit>(node6.CachedValue.Data));
203202
Assert.AreEqual("autodesk.unit.unit:millimeters", GetTypeName<DynamoUnits.Unit>(node7.CachedValue.Data));
204203
Assert.AreEqual(3, node8.CachedValue.GetElements().Count());

0 commit comments

Comments
 (0)