Unit tests code simplifying and cleanup

Author: apdevelop

LinqToDBPostGisNetTopologySuite.Tests/Entities/TestGeometryEntity.cs

@@ -7,9 +7,15 @@ namespace LinqToDBPostGisNetTopologySuite.Tests.Entities
     [Table("test_geometry", Schema = "public")]
     public class TestGeometryEntity
     {
+        /// <summary>
+        /// Identifier (Primary Key)
+        /// </summary>
         [Column("id"), PrimaryKey, NotNull]
         public int Id { get; set; }
 
+        /// <summary>
+        /// Geometry data
+        /// </summary>
         [Column("geom"), Nullable]
         public NTSG Geometry { get; set; }
 

LinqToDBPostGisNetTopologySuite.Tests/GeometryAccessorsTests.cs

@@ -2,9 +2,6 @@
 
 using LinqToDB;
 using NUnit.Framework;
-using NTSG = NetTopologySuite.Geometries;
-
-using LinqToDBPostGisNetTopologySuite.Tests.Entities;
 
 namespace LinqToDBPostGisNetTopologySuite.Tests
 {
@@ -25,13 +22,12 @@ public void TestGeometryType()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt = "LINESTRING(77.29 29.07,77.42 29.26,77.27 29.31,77.29 29.07)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry = db.TestGeometries.Select(g => GeometryInput.STGeomFromText(wkt)).Single();
-                db.Update(new TestGeometryEntity(1, geometry));
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
+
+                var geometryType = db.TestGeometries.Select(g => g.Geometry.GeometryType()).Single();
 
-                Assert.AreEqual("LINESTRING", db.TestGeometries.Select(g => g.Geometry.GeometryType()).Single());
+                Assert.AreEqual("LINESTRING", geometryType);
             }
         }
 
@@ -40,27 +36,15 @@ public void TestSTBoundary()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt1 = "LINESTRING(100 150,50 60, 70 80, 160 170)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => GeometryInput.STGeomFromText(wkt1)).Single();
-                db.Update(new TestGeometryEntity(1, geometry1));
-
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
                 const string wkt2 = "POLYGON (( 10 130, 50 190, 110 190, 140 150, 150 80, 100 10, 20 40, 10 130), (70 40, 100 50, 120 80, 80 110, 50 90, 70 40))";
-                db.Insert(new TestGeometryEntity(2, null));
-                var geometry2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => GeometryInput.STGeomFromText(wkt2)).Single();
-                db.Update(new TestGeometryEntity(2, geometry2));
-
-                var boundary1 = db.TestGeometries
-                    .Where(g => g.Id == 1)
-                    .Select(g => g.Geometry.STBoundary().STAsText())
-                    .Single();
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+
+                var boundary1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STBoundary().STAsText()).Single();
                 Assert.AreEqual("MULTIPOINT(100 150,160 170)", boundary1);
 
-                var boundary2 = db.TestGeometries
-                    .Where(g => g.Id == 2)
-                    .Select(g => g.Geometry.STBoundary().STAsText())
-                    .Single();
+                var boundary2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STBoundary().STAsText()).Single();
                 Assert.AreEqual("MULTILINESTRING((10 130,50 190,110 190,140 150,150 80,100 10,20 40,10 130),(70 40,100 50,120 80,80 110,50 90,70 40))", boundary2);
             }
         }
@@ -70,15 +54,10 @@ public void TestSTDimension()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt = "GEOMETRYCOLLECTION(LINESTRING(1 1,0 0),POINT(0 0))";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry = db.TestGeometries.Select(g => GeometryInput.STGeomFromText(wkt)).Single();
-                db.Update(new TestGeometryEntity(1, geometry));
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
 
-                var dimension = db.TestGeometries
-                    .Select(g => g.Geometry.STDimension())
-                    .Single();
+                var dimension = db.TestGeometries.Select(g => g.Geometry.STDimension()).Single();
 
                 Assert.AreEqual(1, dimension);
             }
@@ -89,15 +68,10 @@ public void TestSTEndPoint()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt = "LINESTRING(1 1, 2 2, 3 3)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry = db.TestGeometries.Select(g => GeometryInput.STGeomFromText(wkt)).Single();
-                db.Update(new TestGeometryEntity(1, geometry));
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
 
-                var endPoint = db.TestGeometries
-                    .Select(g => g.Geometry.STEndPoint().STAsText())
-                    .Single();
+                var endPoint = db.TestGeometries.Select(g => g.Geometry.STEndPoint().STAsText()).Single();
 
                 Assert.AreEqual("POINT(3 3)", endPoint);
             }
@@ -108,15 +82,10 @@ public void TestSTEnvelope()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt = "LINESTRING(0 0, 1 3)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry = db.TestGeometries.Select(g => GeometryInput.STGeomFromText(wkt)).Single();
-                db.Update(new TestGeometryEntity(1, geometry));
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
 
-                var envelope = db.TestGeometries
-                    .Select(g => g.Geometry.STEnvelope().STAsText())
-                    .Single();
+                var envelope = db.TestGeometries.Select(g => g.Geometry.STEnvelope().STAsText()).Single();
 
                 Assert.AreEqual("POLYGON((0 0,0 3,1 3,1 0,0 0))", envelope);
             }
@@ -127,18 +96,11 @@ public void TestSTIsEmpty()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt1 = "GEOMETRYCOLLECTION EMPTY";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => GeometryInput.STGeomFromText(wkt1)).Single();
-                db.Update(new TestGeometryEntity(1, geometry1));
-
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
                 const string wkt2 = "POLYGON((1 2, 3 4, 5 6, 1 2))";
-                db.Insert(new TestGeometryEntity(2, null));
-                var geometry2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => GeometryInput.STGeomFromText(wkt2)).Single();
-                db.Update(new TestGeometryEntity(2, geometry2));
-
-                db.Insert(new TestGeometryEntity(3, null));
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+                db.TestGeometries.Value(g => g.Id, 3).Value(p => p.Geometry, () => null).Insert();
 
                 Assert.IsTrue(db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STIsEmpty()).Single());
                 Assert.IsFalse(db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STIsEmpty()).Single());
@@ -151,16 +113,10 @@ public void TestSTIsValid()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt1 = "LINESTRING(0 0, 1 1)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => GeometryInput.STGeomFromText(wkt1)).Single();
-                db.Update(new TestGeometryEntity(1, geometry1));
-
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
                 const string wkt2 = "POLYGON((0 0, 1 1, 1 2, 1 1, 0 0))";
-                db.Insert(new TestGeometryEntity(2, null));
-                var geometry2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => GeometryInput.STGeomFromText(wkt2)).Single();
-                db.Update(new TestGeometryEntity(2, geometry2));
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
 
                 Assert.IsTrue(db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STIsValid()).Single());
                 Assert.IsFalse(db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STIsValid()).Single());
@@ -172,28 +128,16 @@ public void TestSTNumGeometries()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt1 = "LINESTRING(77.29 29.07,77.42 29.26,77.27 29.31,77.29 29.07)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => GeometryInput.STGeomFromText(wkt1)).Single();
-                db.Update(new TestGeometryEntity(1, geometry1));
-
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
                 const string wkt2 = "GEOMETRYCOLLECTION(MULTIPOINT(-2 3 , -2 2), LINESTRING(5 5, 10 10), POLYGON((-7 4.2, -7.1 5, -7.1 4.3, -7 4.2)))";
-                db.Insert(new TestGeometryEntity(2, null));
-                var geometry2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => GeometryInput.STGeomFromText(wkt2)).Single();
-                db.Update(new TestGeometryEntity(2, geometry2));
-
-                var num1 = db.TestGeometries
-                    .Where(g => g.Id == 1)
-                    .Select(g => g.Geometry.STNumGeometries())
-                    .Single();
-                Assert.AreEqual(1, num1);
-
-                var num2 = db.TestGeometries
-                    .Where(g => g.Id == 2)
-                    .Select(g => g.Geometry.STNumGeometries())
-                    .Single();
-                Assert.AreEqual(3, num2);
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+
+                var numGeometries1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STNumGeometries()).Single();
+                Assert.AreEqual(1, numGeometries1);
+
+                var numGeometries2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STNumGeometries()).Single();
+                Assert.AreEqual(3, numGeometries2);
             }
         }
 
@@ -202,13 +146,12 @@ public void TestSTNumPoints()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt = "LINESTRING(77.29 29.07,77.42 29.26,77.27 29.31,77.29 29.07)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry = db.TestGeometries.Select(g => GeometryInput.STGeomFromText(wkt)).Single();
-                db.Update(new TestGeometryEntity(1, geometry));
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
+
+                var numPoints = db.TestGeometries.Select(g => g.Geometry.STNumPoints()).Single();
 
-                Assert.AreEqual(4, db.TestGeometries.Select(g => g.Geometry.STNumPoints()).Single());
+                Assert.AreEqual(4, numPoints);
             }
         }
 
@@ -217,16 +160,10 @@ public void TestSTXYZM()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                // TODO: shared method
                 const string wkt1 = "POINT(1 2 3 4)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => GeometryInput.STGeomFromText(wkt1)).Single();
-                db.Update(new TestGeometryEntity(1, geometry1));
-
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
                 const string wkt2 = "POINT(1 2)";
-                db.Insert(new TestGeometryEntity(2, null));
-                var geometry2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => GeometryInput.STGeomFromText(wkt2)).Single();
-                db.Update(new TestGeometryEntity(2, geometry2));
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
 
                 var query1 = db.TestGeometries.Where(g => g.Id == 1);
                 Assert.AreEqual(1, query1.Select(g => g.Geometry.STX()).Single());

LinqToDBPostGisNetTopologySuite.Tests/GeometryInputTests.cs

@@ -1,11 +1,7 @@
-using System;
-using System.Linq;
+using System.Linq;
 
 using LinqToDB;
 using NUnit.Framework;
-using NTSG = NetTopologySuite.Geometries;
-
-using LinqToDBPostGisNetTopologySuite.Tests.Entities;
 
 namespace LinqToDBPostGisNetTopologySuite.Tests
 {
@@ -27,9 +23,7 @@ public void TestSTGeomFromText()
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
                 const string wkt1 = "POINT(100 250)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry1 = db.TestGeometries.Select(g => GeometryInput.STGeomFromText(wkt1)).Single();
-                db.Update(new TestGeometryEntity(1, geometry1));
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
 
                 var srid1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STSrId()).Single();
                 Assert.AreEqual(0, srid1);
@@ -38,9 +32,7 @@ public void TestSTGeomFromText()
                 Assert.AreEqual("POINT(100 250)", ewkt1);
 
                 const string wkt2 = "POINT(100 250)";
-                db.Insert(new TestGeometryEntity(2, null));
-                var geometry2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => GeometryInput.STGeomFromText(wkt2, SRID3857)).Single();
-                db.Update(new TestGeometryEntity(2, geometry2));
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2, SRID3857)).Insert();
 
                 var srid2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STSrId()).Single();
                 Assert.AreEqual(SRID3857, srid2);

LinqToDBPostGisNetTopologySuite.Tests/GeometryOutputTests.cs

@@ -3,9 +3,6 @@
 
 using LinqToDB;
 using NUnit.Framework;
-using NTSG = NetTopologySuite.Geometries;
-
-using LinqToDBPostGisNetTopologySuite.Tests.Entities;
 
 namespace LinqToDBPostGisNetTopologySuite.Tests
 {
@@ -27,14 +24,12 @@ public void TestSTAsBinary()
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
                 const string wkt = "POINT(2.0 4.0)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry = db.TestGeometries.Select(g => GeometryInput.STGeomFromText(wkt)).Single();
-                db.Update(new TestGeometryEntity(1, geometry));
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
 
                 var wkb = db.TestGeometries.Select(g => g.Geometry.STAsBinary()).Single();
 
                 Assert.AreEqual(21, wkb.Length);
-                Assert.AreEqual(1, wkb[0]); // Depends on server machine endianness
+                Assert.AreEqual(1, wkb[0]); // TODO: depends on server machine endianness
                 Assert.AreEqual(1, BitConverter.ToUInt32(wkb, 1));
                 Assert.AreEqual(2, BitConverter.ToDouble(wkb, 5));
                 Assert.AreEqual(4, BitConverter.ToDouble(wkb, 13));
@@ -47,18 +42,14 @@ public void TestSTAsGeoJSON()
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
                 const string wkt1 = "POINT(2.0 4.0)";
-                db.Insert(new TestGeometryEntity(1, null));
-                var geometry1 = db.TestGeometries.Select(g => GeometryInput.STGeomFromText(wkt1)).Single();
-                db.Update(new TestGeometryEntity(1, geometry1));
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
 
                 var geojson1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STAsGeoJSON()).Single();
 
                 Assert.AreEqual("{\"type\":\"Point\",\"coordinates\":[2,4]}", geojson1);
 
                 const string wkt2 = "LINESTRING(1 2 3, 4 5 6)";
-                db.Insert(new TestGeometryEntity(2, null));
-                var geometry2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => GeometryInput.STGeomFromText(wkt2)).Single();
-                db.Update(new TestGeometryEntity(2, geometry2));
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
 
                 var geojson2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STAsGeoJSON()).Single();