From f9f6e454deb73b3ad057db5927671cd70e9d9abe Mon Sep 17 00:00:00 2001 From: Steve Gilham Date: Wed, 30 May 2018 21:31:07 +0100 Subject: [PATCH] Make unit tests more robust about versions --- Build/targets.fsx | 4 ++-- Sample4/Tests.fs | 5 +++++ Tests/Tests.fs | 4 ++-- XTests/XTests.fs | 6 +++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Build/targets.fsx b/Build/targets.fsx index 9a476911c..64dc0988b 100644 --- a/Build/targets.fsx +++ b/Build/targets.fsx @@ -1703,7 +1703,7 @@ _Target "ReleaseXUnitFSharpTypesDotNetFullRunner" ( fun _ -> "System.Void Tests.DU::testMakeUnion()"; "System.Void Tests.M::testMakeThing()"; "Tests.DU/MyUnion Tests.DU/MyUnion::as_bar()"; - "Tests.DU/MyUnion Tests.DU/get_MyBar@31::Invoke(Microsoft.FSharp.Core.Unit)"; + "Tests.DU/MyUnion Tests.DU/get_MyBar@36::Invoke(Microsoft.FSharp.Core.Unit)"; "Tests.DU/MyUnion Tests.DU::returnBar(System.String)"; "Tests.DU/MyUnion Tests.DU::returnFoo(System.Int32)"; "Tests.M/Thing Tests.M::makeThing(System.String)"] @@ -1786,7 +1786,7 @@ _Target "MSBuildTest" ( fun _ -> "System.Void Tests.DU::testMakeUnion()"; "System.Void Tests.M::testMakeThing()"; "Tests.DU/MyUnion Tests.DU/MyUnion::as_bar()"; - "Tests.DU/MyUnion Tests.DU/get_MyBar@31::Invoke(Microsoft.FSharp.Core.Unit)"; + "Tests.DU/MyUnion Tests.DU/get_MyBar@36::Invoke(Microsoft.FSharp.Core.Unit)"; "Tests.DU/MyUnion Tests.DU::returnBar(System.String)"; "Tests.DU/MyUnion Tests.DU::returnFoo(System.Int32)"; "Tests.M/Thing Tests.M::makeThing(System.String)"] diff --git a/Sample4/Tests.fs b/Sample4/Tests.fs index 02869cab9..e8e81776f 100644 --- a/Sample4/Tests.fs +++ b/Sample4/Tests.fs @@ -1,8 +1,13 @@ namespace Tests open System +open System.Reflection open Xunit +[] +[] +do () + module M = type Thing = { Thing: string } with member this.bytes () = System.Text.Encoding.UTF8.GetBytes(this.Thing) diff --git a/Tests/Tests.fs b/Tests/Tests.fs index 81ab37f72..c0b4534ee 100644 --- a/Tests/Tests.fs +++ b/Tests/Tests.fs @@ -2925,7 +2925,7 @@ type AltCoverTests() = class use stream' = Assembly.GetExecutingAssembly().GetManifestResourceStream(resultName) use reader' = new StreamReader(stream') let expected = reader'.ReadToEnd() - let version = Assembly.GetExecutingAssembly().GetName().Version.ToString() + let version = System.AssemblyVersionInformation.AssemblyVersion let transform (s:string) = s.Replace("\r\n","\n" ).Replace("AltCover.Recorder.g/1.4.0.0", "AltCover.Recorder.g/" + version @@ -2948,7 +2948,7 @@ type AltCoverTests() = class use reader' = new StreamReader(stream') let expected = reader'.ReadToEnd() - let version = Assembly.GetExecutingAssembly().GetName().Version.ToString() + let version = System.AssemblyVersionInformation.AssemblyVersion let transform (s:string) = s.Replace("\r\n","\n" ).Replace("AltCover.Recorder.g/2.0.0.0", "AltCover.Recorder.g/" + version diff --git a/XTests/XTests.fs b/XTests/XTests.fs index dbd8f2cdb..05ae0220e 100644 --- a/XTests/XTests.fs +++ b/XTests/XTests.fs @@ -193,7 +193,7 @@ module XTests = "\n => " + Path.Combine(Path.GetFullPath input, "Sample4.dll") + "\n\nCoverage Report: " + report + "\n\n\n " + Path.Combine(Path.GetFullPath output, "Sample4.dll") + - "\n <= Sample4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\n" + "\n <= Sample4, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null\n" Assert.Equal (stdout.ToString().Replace("\r\n", "\n").Replace("\\", "/"), (expected.Replace("\\", "/"))) @@ -297,14 +297,14 @@ module XTests = |> Seq.map (fun p -> p.Name) |> Set.ofSeq Assert.True(aux |> Set.contains ("AltCover.Recorder.g/" + - Assembly.GetExecutingAssembly().GetName().Version.ToString())) + System.AssemblyVersionInformation.AssemblyVersion)) let libraries = (o.Properties() |> Seq.find (fun p -> p.Name = "libraries")).Value :?> JObject let lib = libraries.Properties() |> Seq.map (fun p -> p.Name) |> Set.ofSeq Assert.True(lib |> Set.contains ("AltCover.Recorder.g/" + - Assembly.GetExecutingAssembly().GetName().Version.ToString())) + System.AssemblyVersionInformation.AssemblyVersion)) [] let ADryRunLooksAsExpected() =