fix problematic unit test on windows due to line ending conversion

irmen · Apr 18, 2019 · 1fb9ac4 · 1fb9ac4
1 parent 2a9d1a7
commit 1fb9ac4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/dotnet/Razorvine.Pyrolite/Pyrolite/Pyrolite.csproj b/dotnet/Razorvine.Pyrolite/Pyrolite/Pyrolite.csproj
@@ -16,6 +16,10 @@
 Also includes Pickle/Unpickle.
 More info about Pyro: https://pyro4.readthedocs.io/</Description>
     <Copyright>Copyright Irmen de Jong</Copyright>
+      <!--
+    <PackageLicenseExpression>MIT</PackageLicenseExpression> 
+    <PackageLicenseFile>../LICENSE</PackageLicenseFile>
+    --> 
     <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/irmen/Pyrolite</PackageProjectUrl>
     <RepositoryUrl>https://github.com/irmen/Pyrolite.git</RepositoryUrl>

diff --git a/dotnet/Razorvine.Pyrolite/Tests/Pickle/UnpickleComplexTests.cs b/dotnet/Razorvine.Pyrolite/Tests/Pickle/UnpickleComplexTests.cs
@@ -89,12 +89,13 @@ public void TestUnpickleRealProxy4() {
 		UnpickleRealProxy(pickledProxy);
 	}
 
-	[Fact] // fails on Windows due to "\r\n" line ending
+	[Fact]
 	public void TestUnpickleProto0Bytes() {
-		var pickle = File.ReadAllBytes("pickled_bytes_level0.dat");
+		// note: convert \r\n that may be inserted in the data file on windows, back to \n that pickle expects
+		var pickle = File.ReadAllText("pickled_bytes_level0.dat").Replace("\r\n", "\n");
 
 		PickleSerializer ser = new PickleSerializer();
-		string x = (string)ser.deserializeData(pickle);
+		string x = (string)ser.deserializeData(Encoding.UTF8.GetBytes(pickle));
 		Assert.Equal(2496, x.Length);
 
 		// validate that the bytes in the string are what we expect (based on md5 hash)