Skip to content

Commit fbb0a58

Browse files
committed
Updated NUnit3TestAdapter to version 4.0.0; fixed NUnit 4.0 warnings
1 parent 3bf6af5 commit fbb0a58

File tree

7 files changed

+87
-82
lines changed

7 files changed

+87
-82
lines changed

LinqToDBPostGisNetTopologySuite.Tests/GeometryConstructorsTests.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -211,19 +211,19 @@ public void TestSTMakePoint()
211211
.Insert();
212212

213213
var point1 = db.TestGeometries.Where(g => g.Id == 1);
214-
Assert.AreEqual(-71.1043443253471, point1.Select(g => g.Geometry.STX()).Single(), 0.0000000000001);
215-
Assert.AreEqual(42.3150676015829, point1.Select(g => g.Geometry.STY()).Single(), 0.0000000000001);
214+
Assert.AreEqual(-71.1043443253471, point1.Select(g => g.Geometry.STX()).Single().Value, 0.0000000000001);
215+
Assert.AreEqual(42.3150676015829, point1.Select(g => g.Geometry.STY()).Single().Value, 0.0000000000001);
216216

217217
var point2 = db.TestGeometries.Where(g => g.Id == 2);
218-
Assert.AreEqual(1, point2.Select(g => g.Geometry.STX()).Single(), 0.1);
219-
Assert.AreEqual(2, point2.Select(g => g.Geometry.STY()).Single(), 0.1);
220-
Assert.AreEqual(1.5, point2.Select(g => g.Geometry.STZ()).Single(), 0.1);
218+
Assert.AreEqual(1, point2.Select(g => g.Geometry.STX()).Single().Value, 0.1);
219+
Assert.AreEqual(2, point2.Select(g => g.Geometry.STY()).Single().Value, 0.1);
220+
Assert.AreEqual(1.5, point2.Select(g => g.Geometry.STZ()).Single().Value, 0.1);
221221

222222
var point3 = db.TestGeometries.Where(g => g.Id == 3);
223-
Assert.AreEqual(10, point3.Select(g => g.Geometry.STX()).Single(), 0.1);
224-
Assert.AreEqual(20, point3.Select(g => g.Geometry.STY()).Single(), 0.1);
225-
Assert.AreEqual(30, point3.Select(g => g.Geometry.STZ()).Single(), 0.1);
226-
Assert.AreEqual(-999, point3.Select(g => g.Geometry.STM()).Single(), 0.1);
223+
Assert.AreEqual(10, point3.Select(g => g.Geometry.STX()).Single().Value, 0.1);
224+
Assert.AreEqual(20, point3.Select(g => g.Geometry.STY()).Single().Value, 0.1);
225+
Assert.AreEqual(30, point3.Select(g => g.Geometry.STZ()).Single().Value, 0.1);
226+
Assert.AreEqual(-999, point3.Select(g => g.Geometry.STM()).Single().Value, 0.1);
227227
}
228228
}
229229

@@ -238,9 +238,9 @@ public void TestSTMakePointM()
238238
.Insert();
239239

240240
var point1 = db.TestGeometries.Where(g => g.Id == 1);
241-
Assert.AreEqual(10, point1.Select(g => g.Geometry.STX()).Single(), 0.1);
242-
Assert.AreEqual(20, point1.Select(g => g.Geometry.STY()).Single(), 0.1);
243-
Assert.AreEqual(-999, point1.Select(g => g.Geometry.STM()).Single(), 0.1);
241+
Assert.AreEqual(10, point1.Select(g => g.Geometry.STX()).Single().Value, 0.1);
242+
Assert.AreEqual(20, point1.Select(g => g.Geometry.STY()).Single().Value, 0.1);
243+
Assert.AreEqual(-999, point1.Select(g => g.Geometry.STM()).Single().Value, 0.1);
244244
}
245245
}
246246

@@ -287,8 +287,8 @@ public void TestSTPoint()
287287
.Insert();
288288

289289
var point1 = db.TestGeometries.Where(g => g.Id == 1);
290-
Assert.AreEqual(-71.104, point1.Select(g => g.Geometry.STX()).Single(), 0.001);
291-
Assert.AreEqual(42.315, point1.Select(g => g.Geometry.STY()).Single(), 0.001);
290+
Assert.AreEqual(-71.104, point1.Select(g => g.Geometry.STX()).Single().Value, 0.001);
291+
Assert.AreEqual(42.315, point1.Select(g => g.Geometry.STY()).Single().Value, 0.001);
292292
}
293293
}
294294

LinqToDBPostGisNetTopologySuite.Tests/GeometryEditorsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ public void TestSTQuantizeCoordinates()
759759
db.Select(() => GeometryEditors
760760
.STQuantizeCoordinates(
761761
GeometryConstructors.STMakePoint(100.123456, 0), 4)
762-
.STX()),
762+
.STX()).Value,
763763
1.0E-12);
764764

765765
Assert.IsNull(db.Select(() => GeometryEditors.STQuantizeCoordinates((NTSG)null, 0, 0, 0, 0)));

LinqToDBPostGisNetTopologySuite.Tests/LinearReferencingTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void TestSTLineLocatePoint()
142142

143143
Assert.AreEqual(0.4, result.Value, 1.0E-8);
144144

145-
Assert.AreEqual(0.4, db.Select(() => LinearReferencing.STLineLocatePoint(LineWkt, PointWkt)), 1.0E-8);
145+
Assert.AreEqual(0.4, db.Select(() => LinearReferencing.STLineLocatePoint(LineWkt, PointWkt)).Value, 1.0E-8);
146146

147147
Assert.IsNull(db.Select(() => LinearReferencing.STLineLocatePoint((NTSG)null, (NTSG)null)));
148148
}

LinqToDBPostGisNetTopologySuite.Tests/LinqToDBPostGisNetTopologySuite.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<ItemGroup>
88
<PackageReference Include="linq2db" Version="3.0.0" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
10-
<PackageReference Include="NUnit" Version="3.12.0" />
11-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
10+
<PackageReference Include="NUnit" Version="3.13.2" />
11+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
1212
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
1313
</ItemGroup>
1414

0 commit comments

Comments
 (0)