diff --git a/Directory.Packages.props b/Directory.Packages.props
index d86ca569..bc20fba3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -13,12 +13,10 @@
-
+
-
-
-
+
@@ -34,4 +32,4 @@
-
+
\ No newline at end of file
diff --git a/tests/Speckle.Objects.Tests.Unit/Geometry/ArcTests.cs b/tests/Speckle.Objects.Tests.Unit/Geometry/ArcTests.cs
index d6dc9d52..fe50e4c2 100644
--- a/tests/Speckle.Objects.Tests.Unit/Geometry/ArcTests.cs
+++ b/tests/Speckle.Objects.Tests.Unit/Geometry/ArcTests.cs
@@ -1,10 +1,11 @@
using NUnit.Framework;
+using Shouldly;
using Speckle.Objects.Geometry;
using Speckle.Sdk.Common;
+using Xunit;
namespace Speckle.Objects.Tests.Unit.Geometry;
-[TestFixture, TestOf(typeof(Arc))]
public class ArcTests
{
private Plane TestPlaneCounterClockwise
@@ -39,7 +40,7 @@ private Plane TestPlaneClockwise
}
}
- [Test]
+ [Fact]
public void CanCreateArc_HalfCircle_CounterClockwise()
{
const string UNITS = Units.Meters;
@@ -52,17 +53,14 @@ public void CanCreateArc_HalfCircle_CounterClockwise()
units = UNITS,
};
- Assert.That(Point.Distance(counterClockwiseArc.midPoint, new Point(0, 1, 0, UNITS)), Is.EqualTo(0).Within(0.0001));
- Assert.That(
- Point.Distance(counterClockwiseArc.plane.origin, new Point(0, 0, 0, UNITS)),
- Is.EqualTo(0).Within(0.0001)
- );
- Assert.That(counterClockwiseArc.measure - Math.PI, Is.EqualTo(0).Within(0.0001));
- Assert.That(counterClockwiseArc.radius, Is.EqualTo(1).Within(0.0001));
- Assert.That(counterClockwiseArc.length, Is.EqualTo(Math.PI).Within(0.0001));
+ Point.Distance(counterClockwiseArc.midPoint, new Point(0, 1, 0, UNITS)).ShouldBe(0, 0.0001);
+ Point.Distance(counterClockwiseArc.plane.origin, new Point(0, 0, 0, UNITS)).ShouldBe(0, 0.0001);
+ (counterClockwiseArc.measure - Math.PI).ShouldBe(0, 0.0001);
+ counterClockwiseArc.radius.ShouldBe(1, 0.0001);
+ counterClockwiseArc.length.ShouldBe(Math.PI, 0.0001);
}
- [Test]
+ [Fact]
public void CanCreateArc_HalfCircle_Clockwise()
{
const string UNITS = Units.Meters;
@@ -75,13 +73,10 @@ public void CanCreateArc_HalfCircle_Clockwise()
units = UNITS,
};
- Assert.That(Point.Distance(counterClockwiseArc.midPoint, new Point(0, 1, 0, UNITS)), Is.EqualTo(0).Within(0.0001));
- Assert.That(
- Point.Distance(counterClockwiseArc.plane.origin, new Point(0, 0, 0, UNITS)),
- Is.EqualTo(0).Within(0.0001)
- );
- Assert.That(counterClockwiseArc.measure - Math.PI, Is.EqualTo(0).Within(0.0001));
- Assert.That(counterClockwiseArc.radius, Is.EqualTo(1).Within(0.0001));
- Assert.That(counterClockwiseArc.length, Is.EqualTo(Math.PI).Within(0.0001));
+ Point.Distance(counterClockwiseArc.midPoint, new Point(0, 1, 0, UNITS)).ShouldBe(0, 0.0001);
+ Point.Distance(counterClockwiseArc.plane.origin, new Point(0, 0, 0, UNITS)).ShouldBe(0, 0.0001);
+ (counterClockwiseArc.measure - Math.PI).ShouldBe(0, 0.0001);
+ counterClockwiseArc.radius.ShouldBe(1, 0.0001);
+ counterClockwiseArc.length.ShouldBe(Math.PI, 0.0001);
}
}
diff --git a/tests/Speckle.Objects.Tests.Unit/Geometry/BoxTests.cs b/tests/Speckle.Objects.Tests.Unit/Geometry/BoxTests.cs
index 05a83663..44b225fa 100644
--- a/tests/Speckle.Objects.Tests.Unit/Geometry/BoxTests.cs
+++ b/tests/Speckle.Objects.Tests.Unit/Geometry/BoxTests.cs
@@ -1,10 +1,11 @@
using NUnit.Framework;
+using Shouldly;
using Speckle.Objects.Geometry;
using Speckle.Sdk.Common;
+using Xunit;
namespace Speckle.Objects.Tests.Unit.Geometry;
-[TestFixture, TestOf(typeof(Box))]
public class BoxTests
{
private Plane TestPlane
@@ -23,7 +24,7 @@ private Plane TestPlane
}
}
- [Test]
+ [Fact]
public void CanCreateBox()
{
const string UNITS = Units.Meters;
@@ -36,7 +37,7 @@ public void CanCreateBox()
units = UNITS,
};
- Assert.That(box.area, Is.EqualTo(2 * (2 * 4 + 2 * 6 + 4 * 6)).Within(0.0001));
- Assert.That(box.volume, Is.EqualTo(2 * 4 * 6).Within(0.0001));
+ box.area.ShouldBe(2 * (2 * 4 + 2 * 6 + 4 * 6), 0.0001);
+ box.volume.ShouldBe(2 * 4 * 6, 0.0001);
}
}
diff --git a/tests/Speckle.Objects.Tests.Unit/Geometry/CircleTests.cs b/tests/Speckle.Objects.Tests.Unit/Geometry/CircleTests.cs
index 12501ce8..9f5f8a8b 100644
--- a/tests/Speckle.Objects.Tests.Unit/Geometry/CircleTests.cs
+++ b/tests/Speckle.Objects.Tests.Unit/Geometry/CircleTests.cs
@@ -1,10 +1,11 @@
using NUnit.Framework;
+using Shouldly;
using Speckle.Objects.Geometry;
using Speckle.Sdk.Common;
+using Xunit;
namespace Speckle.Objects.Tests.Unit.Geometry;
-[TestFixture, TestOf(typeof(Circle))]
public class CircleTests
{
private Plane TestPlane
@@ -23,7 +24,7 @@ private Plane TestPlane
}
}
- [Test]
+ [Fact]
public void CanCreateCircle()
{
const string UNITS = Units.Meters;
@@ -34,7 +35,7 @@ public void CanCreateCircle()
units = UNITS,
};
- Assert.That(circle.length, Is.EqualTo(2 * Math.PI * 5).Within(0.0001));
- Assert.That(circle.area, Is.EqualTo(Math.PI * 5 * 5).Within(0.0001));
+ circle.length.ShouldBe(2 * Math.PI * 5, 0.0001);
+ circle.area.ShouldBe(Math.PI * 5 * 5, 0.0001);
}
}
diff --git a/tests/Speckle.Objects.Tests.Unit/Geometry/MeshTests.cs b/tests/Speckle.Objects.Tests.Unit/Geometry/MeshTests.cs
index dae8dca6..a1c972f3 100644
--- a/tests/Speckle.Objects.Tests.Unit/Geometry/MeshTests.cs
+++ b/tests/Speckle.Objects.Tests.Unit/Geometry/MeshTests.cs
@@ -1,26 +1,31 @@
using NUnit.Framework;
+using Shouldly;
using Speckle.Objects.Geometry;
using Speckle.Sdk.Common;
+using Xunit;
namespace Speckle.Objects.Tests.Unit.Geometry;
-[TestFixture, TestOf(typeof(Mesh))]
public class MeshTests
{
- private static Mesh[] s_testCaseSource = { CreateBlenderStylePolygon(), CreateRhinoStylePolygon() };
+ public static readonly IEnumerable