Fixed tests so that they work on Mac/Linux

rjhernandez · rjhernandez · commit 6d9443b08570 · 2017-05-31T19:39:35.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 #NuGet
 packages/
 *.nupkg
-lib/*
+lib/*
+
+#OSX
+.DS_Store
diff --git a/src/GeoJSON.Net.Tests/CoordinateReferenceSystem/LinkedCRSTests.cs b/src/GeoJSON.Net.Tests/CoordinateReferenceSystem/LinkedCRSTests.cs
@@ -63,7 +63,7 @@ public void Ctor_Throws_ArgumentExpection_When_Href_Is_Not_Dereferencable_Uri()
         {
             System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en-US");
             var argumentExpection = Assert.Throws<ArgumentException>(() => { var crs = new LinkedCRS("http://not-a-valid-<>-url"); });
-            Assert.AreEqual("must be a dereferenceable URI\r\nParameter name: href", argumentExpection.Message);
+            Assert.AreEqual($"must be a dereferenceable URI{Environment.NewLine}Parameter name: href", argumentExpection.Message);
         }
 
         [Test]
diff --git a/src/GeoJSON.Net.Tests/Geometry/GeometryTests.cs b/src/GeoJSON.Net.Tests/Geometry/GeometryTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using GeoJSON.Net.Converters;
 using GeoJSON.Net.Geometry;
@@ -127,15 +128,15 @@ public void Can_Serialize_And_Deserialize_Geometry(IGeometryObject geometry)
         public void Serialization_Observes_Indenting_Setting_Of_Serializer(IGeometryObject geometry)
         {
             var json = JsonConvert.SerializeObject(geometry, Formatting.Indented);
-            Assert.IsTrue(json.Contains("\r\n"));
+            Assert.IsTrue(json.Contains(Environment.NewLine));
         }
 
         [Test]
         [TestCaseSource(typeof(GeometryTests), nameof(Geometries))]
         public void Serialization_Observes_No_Indenting_Setting_Of_Serializer(IGeometryObject geometry)
         {
             var json = JsonConvert.SerializeObject(geometry, Formatting.None);
-            Assert.IsFalse(json.Contains("\r\n"));
+            Assert.IsFalse(json.Contains(Environment.NewLine));
             Assert.IsFalse(json.Contains(" "));
         }
 
diff --git a/src/GeoJSON.Net.Tests/TestBase.cs b/src/GeoJSON.Net.Tests/TestBase.cs
@@ -24,7 +24,7 @@ protected string GetExpectedJson([CallerMemberName] string name = null)
         {
             var type = GetType().Name;
             var projectFolder = GetType().Namespace.Substring(AssemblyName.Length + 1);
-            var path = Path.Combine(AssemblyDirectory, @".\", projectFolder, type + "_" + name + ".json");
+            var path = Path.Combine(AssemblyDirectory, @"./", projectFolder, type + "_" + name + ".json");
 
             if (!File.Exists(path))
             {

-Original file line number
+Diff line change
@@ @@ -1,4 +1,7 @@ @@
 #NuGet
 packages/
 *.nupkg
 -lib/*
 +lib/*
++
 +#OSX
 +.DS_Store
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void Ctor_Throws_ArgumentExpection_When_Href_Is_Not_Dereferencable_Uri()`
`63`	`63`	`{`
`64`	`64`	`System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en-US");`
`65`	`65`	`var argumentExpection = Assert.Throws<ArgumentException>(() => { var crs = new LinkedCRS("http://not-a-valid-<>-url"); });`
`66`		`- Assert.AreEqual("must be a dereferenceable URI\r\nParameter name: href", argumentExpection.Message);`
	`66`	`+ Assert.AreEqual($"must be a dereferenceable URI{Environment.NewLine}Parameter name: href", argumentExpection.Message);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Collections.Generic;`
`2`	`3`	`using GeoJSON.Net.Converters;`
`3`	`4`	`using GeoJSON.Net.Geometry;`
`@@ -127,15 +128,15 @@ public void Can_Serialize_And_Deserialize_Geometry(IGeometryObject geometry)`
`127`	`128`	`public void Serialization_Observes_Indenting_Setting_Of_Serializer(IGeometryObject geometry)`
`128`	`129`	`{`
`129`	`130`	`var json = JsonConvert.SerializeObject(geometry, Formatting.Indented);`
`130`		`- Assert.IsTrue(json.Contains("\r\n"));`
	`131`	`+ Assert.IsTrue(json.Contains(Environment.NewLine));`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`[Test]`
`134`	`135`	`[TestCaseSource(typeof(GeometryTests), nameof(Geometries))]`
`135`	`136`	`public void Serialization_Observes_No_Indenting_Setting_Of_Serializer(IGeometryObject geometry)`
`136`	`137`	`{`
`137`	`138`	`var json = JsonConvert.SerializeObject(geometry, Formatting.None);`
`138`		`- Assert.IsFalse(json.Contains("\r\n"));`
	`139`	`+ Assert.IsFalse(json.Contains(Environment.NewLine));`
`139`	`140`	`Assert.IsFalse(json.Contains(" "));`
`140`	`141`	`}`
`141`	`142`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected string GetExpectedJson([CallerMemberName] string name = null)`
`24`	`24`	`{`
`25`	`25`	`var type = GetType().Name;`
`26`	`26`	`var projectFolder = GetType().Namespace.Substring(AssemblyName.Length + 1);`
`27`		`- var path = Path.Combine(AssemblyDirectory, @".\", projectFolder, type + "_" + name + ".json");`
	`27`	`+ var path = Path.Combine(AssemblyDirectory, @"./", projectFolder, type + "_" + name + ".json");`
`28`	`28`
`29`	`29`	`if (!File.Exists(path))`
`30`	`30`	`{`