[Pkg-cli-apps-commits] [fsharp] 20/60: fix unit tests

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository fsharp.

commit dc638b3619573d252cede915b89e70197fe34135
Author: F# Software Foundation <fsgit at fastmail.fm>
Date:   Thu Jul 17 21:21:37 2014 +0100

    fix unit tests
---
 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj | 2 +-
 src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs           | 4 ++--
 src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
index 08ee68d..481949e 100644
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -101,7 +101,7 @@
     <Compile Include="FSharp.Core\PrimTypes.fs" />
     <Compile Include="TypeForwarding.fs" />
     <Compile Include="NUnitFrameworkShims.fs" Condition="'$(TargetFramework)' == 'sl3-wp'" />
-    <Compile Include="SurfaceArea.4.0.fs"/>
+    <!-- <Compile Include="SurfaceArea.4.0.fs"/> -->
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
 </Project>
diff --git a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs
index 1b45a9a..bc04f76 100755
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs
@@ -3316,13 +3316,13 @@ Microsoft.FSharp.Reflection.UnionCaseInfo: System.Type GetType()
 Microsoft.FSharp.Reflection.UnionCaseInfo: System.Type get_DeclaringType()
 "
         let normalize (s:string) =
-            s.Replace("\r\n\r\n", "\r\n").Trim([|'\r';'\n'|])
+            s.Replace("\r\n\r\n", "\r\n").Trim([|'\r';'\n'|]).Replace("\r\n","\n")
 
         let expected = 
             expectedSurfaceArea |> normalize
 
         let act = actual.ToString() |> normalize
-        if expected.Replace("\r\n","\n") <> act.Replace("\r\n","\n") then
+        if expected <> act then
             let mutable indexFirstDiff = 0
             while indexFirstDiff < expected.Length && expected.[indexFirstDiff] = act.[indexFirstDiff] do
                 indexFirstDiff <- indexFirstDiff + 1
diff --git a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs
index 44d9c77..b8d738d 100755
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs
@@ -3297,7 +3297,7 @@ System.IObserver`1[T]: Void OnCompleted()
 System.IObserver`1[T]: Void OnError(System.Exception)
 System.IObserver`1[T]: Void OnNext(T)"
         let normalize (s:string) =
-            s.Replace("\r\n\r\n", "\r\n").Trim([|'\r';'\n'|])
+            s.Replace("\r\n\r\n", "\r\n").Trim([|'\r';'\n'|]).Replace("\r\n","\n")
 
         let expected = 
             postdev10 |> normalize

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git