Unify the recorder side of the process

  -- make the IPC mechanism available for all instrumented code

AltCover.Recorder/AltCover.Recorder.fsproj

@@ -75,7 +75,7 @@
       <Link>VisibleToTest.fs</Link>
     </Compile>
     <Compile Include="Base.fs" />
-    <Compile Include="Framework.fs" />
+    <Compile Include="Tracer.fs" />
     <Compile Include="Recorder.fs" />
   </ItemGroup>
   <ItemGroup>

AltCover.Recorder/AltCover.Shadow.fsproj

@@ -66,7 +66,7 @@
       <Link>AssemblyVersion.fs</Link>
     </Compile>
     <Compile Include="Base.fs" />
-    <Compile Include="Framework.fs" />
+    <Compile Include="Tracer.fs" />
     <Compile Include="Recorder.fs" />
   </ItemGroup>
   <ItemGroup>

AltCover.Recorder/Recorder.fs

@@ -95,4 +95,4 @@ module Instance =
   do
     AppDomain.CurrentDomain.DomainUnload.Add(FlushCounter false)
     AppDomain.CurrentDomain.ProcessExit.Add(FlushCounter true)
-    trace.OnStart ()
+    trace <- trace.OnStart ()

AltCover.Recorder/netcore.fs → AltCover.Recorder/Tracer.fs

@@ -6,36 +6,40 @@ open System.IO
 
 type Tracer = {
                 Tracer : string
-                Stream : System.IO.FileStream ref
+                Stream : System.IO.FileStream
                 Formatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
               }
   with
+#if NETSTANDARD2_0
     static member Core () =
              typeof<Microsoft.FSharp.Core.CompilationMappingAttribute>.Assembly.Location
+#endif 
 
     static member Create (name:string) =
       {
        Tracer = name
-       Stream = ref null
+       Stream = null
        Formatter = System.Runtime.Serialization.Formatters.Binary.BinaryFormatter()
       }
 
     member this.IsConnected () =
-      match !this.Stream with
+      match this.Stream with
       | null -> false
       | _ -> File.Exists this.Tracer
 
     member this.Connect () =
       if File.Exists this.Tracer then
-        this.Stream := File.OpenWrite(this.Tracer)
+        { this with Stream = File.OpenWrite(this.Tracer) }
+      else
+        this
 
     member this.Close() =
-      match !this.Stream with
+      match this.Stream with
       | null -> ()
-      | _ -> (!this.Stream).Dispose()
+      | _ -> this.Stream.Dispose()
 
     member this.Push (moduleId:string) hitPointId =
-      let stream = !this.Stream
+      let stream = this.Stream
       this.Formatter.Serialize(stream, (moduleId, hitPointId))
       stream.Flush()
 
@@ -50,6 +54,7 @@ type Tracer = {
     member this.OnStart () =
       if this.Tracer <> "Coverage.Default.xml.bin" then
         this.Connect ()
+      else this
 
     member this.OnConnected f l g =
       if this.IsConnected() then f()

AltCover.Recorder/altcover.recorder.core.fsproj

@@ -20,8 +20,7 @@
     <Compile Include="..\_Generated\VisibleToTest.fs" Link="VisibleToTest.fs" />
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Base.fs" />
-    <None Include="Framework.fs" />
-    <Compile Include="netcore.fs" />
+    <Compile Include="Tracer.fs" />
     <Compile Include="Recorder.fs" />
   </ItemGroup>
 

Shadow.Tests/Shadow.Tests.fs

@@ -30,13 +30,12 @@ type AltCoverTests() = class
 
   [<Test>]
   member self.ShouldBeLinkingTheCorrectCopyOfThisCode() =
-    let locker = { Tracer = String.Empty
-#if NETCOREAPP2_0
-                   Stream = ref null
-                   Formatter = null
-#endif
+    let tracer = { 
+        Tracer = String.Empty
+        Stream = null
+        Formatter = null
     }
-    Assert.That(locker.GetType().Assembly.GetName().Name, Is.EqualTo
+    Assert.That(tracer.GetType().Assembly.GetName().Name, Is.EqualTo
 #if NETCOREAPP2_0
     "AltCover.Recorder")
 #else

Shadow.Tests/Shadow.Tests.fsproj

@@ -66,7 +66,7 @@
     <Compile Include="..\_Generated\AssemblyVersion.fs">
       <Link>AssemblyVersion.fs</Link>
     </Compile>
-    <Compile Include="Framework.fs" />
+    <Compile Include="Tracer.fs" />
     <Compile Include="Shadow.Tests.fs" />
     <Content Include="packages.config" />
     <EmbeddedResource Include="SimpleCoverage.xml" />

Shadow.Tests/netcore.fs → Shadow.Tests/Tracer.fs

@@ -1,18 +1,43 @@
-namespace Tests.Shadow.Core
+#if NETCOREAPP2_0
+namespace Tests.Shadow.Core
+#else
+#if NET4
+namespace Tests.Shadow.Clr4
+#else
+#if NET2
+namespace Tests.Shadow.Clr2
+#else
+#if MONO
+namespace Tests.Shadow.Mono
+#else
+namespace Tests.Shadow.Unknown
+#endif
+#endif
+#endif
+#endif
 
 open System
 open System.Collections.Generic
 open System.IO
 open System.Reflection
-open System.Threading
-open System.Threading.Tasks
 
 open AltCover.Recorder
 open NUnit.Framework
 
 [<TestFixture>]
 type AltCoverCoreTests() = class
 
+  [<Test>]
+  member self.WillNotConnectSpontaneously () =
+    let where = Assembly.GetExecutingAssembly().Location |> Path.GetDirectoryName
+    let unique = Path.Combine(where, Guid.NewGuid().ToString())
+    let mutable client = Tracer.Create unique
+    try
+        client <- client.OnStart()
+        Assert.That (client.IsConnected(), Is.False)
+    finally
+      client.Close()
+
   [<Test>]
   member self.ValidTokenWillConnect () =
     let where = Assembly.GetExecutingAssembly().Location |> Path.GetDirectoryName
@@ -21,9 +46,9 @@ type AltCoverCoreTests() = class
         use stream = File.Create(unique)
         ()
 
-    let client = Tracer.Create unique
+    let mutable client = Tracer.Create unique
     try
-        client.OnStart()
+        client <- client.OnStart()
         Assert.That (client.IsConnected(), Is.True)
     finally
       client.Close()
@@ -46,21 +71,24 @@ type AltCoverCoreTests() = class
     let save = Instance.trace
     let where = Assembly.GetExecutingAssembly().Location |> Path.GetDirectoryName
     let unique = Path.Combine(where, Guid.NewGuid().ToString())
-    let expected = [("name", 23)]
+    let expected = [("name", 23); ("name", 23)]
 
     do
         use stream = File.Create unique
         ()
     try
-      let client = Tracer.Create unique
+      let mutable client = Tracer.Create unique
       try
         Instance.Visits.Clear()
-        client.OnStart()
-        Instance.trace <- client
+        let entry = Dictionary<int, int>()
+        entry.Add(23, 1)
+        Instance.Visits.Add("name", entry)
+
+        Instance.trace <- client.OnStart()
         Assert.That (Instance.trace.IsConnected(), "connection failed")
         Instance.Visit "name" 23
       finally
-        client.Close()
+        Instance.trace.Close()
         Instance.trace <- save
 
       use stream = File.OpenRead unique
@@ -73,25 +101,28 @@ type AltCoverCoreTests() = class
 
 
   [<Test>]
-  member self.FlushShouldTidyUp() =
+  member self.FlushShouldTidyUp() = // also throw a bone to OpenCover 615
     let save = Instance.trace
     let where = Assembly.GetExecutingAssembly().Location |> Path.GetDirectoryName
     let unique = Path.Combine(where, Guid.NewGuid().ToString())
-    let expected = [("name", 23); (null, -1)]
 
     do
         use stream = File.Create unique
         ()
 
     try
       let client = Tracer.Create unique
+      let expected = [("name", client.GetHashCode()); (null, -1)]
+
       try
         Instance.Visits.Clear()
-        client.OnStart()
-        Instance.trace <- client
+        Instance.trace <- client.OnStart()
+        Assert.That(Instance.trace.Equals client, Is.False)
+        Assert.That(Instance.trace.Equals expected, Is.False)
+
         Assert.That (Instance.trace.IsConnected(), "connection failed")
         let formatter = System.Runtime.Serialization.Formatters.Binary.BinaryFormatter()
-        formatter.Serialize(!Instance.trace.Stream, expected |> Seq.head)
+        formatter.Serialize(Instance.trace.Stream, expected |> Seq.head)
         Instance.FlushCounter true ()
       finally
         client.Close()
@@ -105,9 +136,11 @@ type AltCoverCoreTests() = class
     finally
       Instance.Visits.Clear()
 
+#if NETCOREAPP2_0
   [<Test>]
   member self.CoreFindsThePlace() =
     Assert.That (AltCover.Recorder.Tracer.Core(),
                  Does.EndWith("FSharp.Core.dll"))
+#endif
 
 end

Shadow.Tests/altcover.recorder.tests.core.fsproj

@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="netcore.fs" />
+    <Compile Include="Tracer.fs" />
     <Compile Include="Shadow.Tests.fs" />
     <Compile Include="Program.fs" />    
   </ItemGroup>

Shadow.Tests2/Shadow.Tests2.fsproj

@@ -67,8 +67,8 @@
     <Compile Include="..\_Generated\VisibleToTest.fs">
       <Link>VisibleToTest.fs</Link>
     </Compile>
-    <Compile Include="..\Shadow.Tests\Framework.fs">
-      <Link>Framework.fs</Link>
+    <Compile Include="..\Shadow.Tests\Tracer.fs">
+      <Link>Tracer.fs</Link>
     </Compile>
     <Compile Include="..\Shadow.Tests\Shadow.Tests.fs">
       <Link>Shadow.Tests.fs</Link>