Localization, the easy bits, and the Gendarme suggestions

SteveGilham · Jan 30, 2018 · 8866896 · 8866896
1 parent 2b90aad
commit 8866896
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 19 deletions.
diff --git a/AltCover.Recorder/Base.fs b/AltCover.Recorder/Base.fs
@@ -117,8 +117,7 @@ module Counter =
   let DoFlush own counts report =
     use coverageFile = new FileStream(report, FileMode.Open, FileAccess.ReadWrite, FileShare.None, 4096, FileOptions.SequentialScan)
     let flushStart = UpdateReport own counts coverageFile
-    let delta = TimeSpan(DateTime.UtcNow.Ticks - flushStart.Ticks)
-    Console.Out.WriteLine("Coverage statistics flushing took {0:N} seconds", delta.TotalSeconds)
+    TimeSpan(DateTime.UtcNow.Ticks - flushStart.Ticks)
 
   let AddVisit (counts:Dictionary<string, Dictionary<int, int>>) moduleId hitPointId =
     if not (counts.ContainsKey moduleId) then counts.[moduleId] <- Dictionary<int, int>()

diff --git a/AltCover.Recorder/Recorder.fs b/AltCover.Recorder/Recorder.fs
@@ -75,7 +75,8 @@ module Instance =
       | _ -> let counts = Dictionary<string, Dictionary<int, int>> Visits
              Visits.Clear()
              WithMutex (fun own ->
-                Counter.DoFlush own counts ReportFile
+                let delta = Counter.DoFlush own counts ReportFile
+                Console.Out.WriteLine("Coverage statistics flushing took {0:N} seconds", delta.TotalSeconds)
              ))
 
   let internal TraceVisit moduleId hitPointId =

diff --git a/AltCover/Runner.fs b/AltCover/Runner.fs
@@ -102,15 +102,21 @@ module Runner =
     CommandLine.doPathOperation (fun () ->
         CommandLine.ProcessTrailingArguments rest (DirectoryInfo(Option.get workingDirectory)))
 
+  let WriteResource =
+    CommandLine.resources.GetString >> Console.WriteLine
+
+  let WriteResourceWithFormatItems s x =
+    Console.WriteLine (s |> CommandLine.resources.GetString, x)
+
   let MonitorBase (hits:ICollection<(string*int)>) report (payload: string list -> unit) (args : string list) =
       let binpath = report + ".bin"
       do
         use stream = File.Create(binpath)
         ()
 
-      printfn "Beginning run..."
+      "Beginning run..." |> WriteResource
       payload args
-      printfn "Getting results..."
+      "Getting results..."  |> WriteResource
 
       use results = File.OpenRead(binpath)
       let formatter = System.Runtime.Serialization.Formatters.Binary.BinaryFormatter()
@@ -125,7 +131,7 @@ module Runner =
                        | :? System.Runtime.Serialization.SerializationException as x ->
                            ()
       sink()
-      printfn "%d visits recorded" hits.Count
+      WriteResourceWithFormatItems "%d visits recorded" [|hits.Count|]
 
   let WriteReportBase (hits:ICollection<(string*int)>) report =
     let counts = Dictionary<string, Dictionary<int, int>>()
@@ -154,4 +160,5 @@ module Runner =
 
           let payload = GetPayload
           GetMonitor hits report payload rest
-          DoReport hits report
+          let delta = DoReport hits report
+          WriteResourceWithFormatItems "Coverage statistics flushing took {0:N} seconds" [|delta.TotalSeconds|]
diff --git a/AltCover/Strings.eo.resx b/AltCover/Strings.eo.resx
@@ -188,4 +188,16 @@ AltCover Runner [/r[ecordingDirectory]=VALO] [/w[orkingDirectory]=VALO] [/x||exe
   <data name="w|workingDirectory=" xml:space="preserve">
     <value>Laŭvola: La laboranta dosierujo por la lanĉo de aplikaĵoj</value>
   </data>
+  <data name="%d visits recorded" xml:space="preserve">
+    <value>{0} vizitoj registritaj</value>
+  </data>
+  <data name="Beginning run..." xml:space="preserve">
+    <value>Komencanta kuri ...</value>
+  </data>
+  <data name="Coverage statistics flushing took {0:N} seconds" xml:space="preserve">
+    <value>Kovraj statistika skribado prenis {0:N} sekundojn</value>
+  </data>
+  <data name="Getting results..." xml:space="preserve">
+    <value>Akiri rezultojn ...</value>
+  </data>
 </root>
diff --git a/AltCover/Strings.resx b/AltCover/Strings.resx
@@ -188,4 +188,16 @@ AltCover Runner [/r[ecordingDirectory]=VALUE] [/w[orkingDirectory]=VALUE] [/x||e
   <data name="w|workingDirectory=" xml:space="preserve">
     <value>Optional: The working directory for the application launch</value>
   </data>
+  <data name="%d visits recorded" xml:space="preserve">
+    <value>{0} visits recorded</value>
+  </data>
+  <data name="Beginning run..." xml:space="preserve">
+    <value>Beginning run...</value>
+  </data>
+  <data name="Coverage statistics flushing took {0:N} seconds" xml:space="preserve">
+    <value>Coverage statistics flushing took {0:N} seconds</value>
+  </data>
+  <data name="Getting results..." xml:space="preserve">
+    <value>Getting results...</value>
+  </data>
 </root>
diff --git a/Tests/Runner.Tests.fs b/Tests/Runner.Tests.fs
@@ -90,13 +90,8 @@ type AltCoverTests() = class
       |> Seq.iter(fun i -> payload.[i] <- (i+1))
       visits.["f6e3edb3-fb20-44b3-817d-f69d1a22fc2f"] <- payload
 
-      Counter.DoFlush true visits reportFile
+      Counter.DoFlush true visits reportFile |> ignore
 
-      let head = "Coverage statistics flushing took "
-      let tail = " seconds\n"
-      let recorded = stdout.ToString().Replace("\r\n","\n")
-      Assert.That (recorded.StartsWith(head, StringComparison.Ordinal))
-      Assert.That (recorded.EndsWith(tail, StringComparison.Ordinal))
       use worker' = new FileStream(reportFile, FileMode.Open)
       let after = XmlDocument()
       after.Load worker'
@@ -715,6 +710,7 @@ type AltCoverTests() = class
       let write (hits:ICollection<(string*int)>) (report:string) =
         Assert.That(report, Is.EqualTo "Coverage.Default.xml", "should be default coverage file")
         Assert.That(hits, Is.Empty)
+        TimeSpan.Zero
 
       Runner.GetPayload <- payload
       Runner.GetMonitor <- monitor
@@ -765,13 +761,8 @@ type AltCoverTests() = class
       |> Seq.iter(fun i -> payload.[i] <- (i+1))
       visits.["f6e3edb3-fb20-44b3-817d-f69d1a22fc2f"] <- payload
 
-      Runner.DoReport hits reportFile
+      Runner.DoReport hits reportFile |> ignore
 
-      let head = "Coverage statistics flushing took "
-      let tail = " seconds\n"
-      let recorded = stdout.ToString().Replace("\r\n","\n")
-      Assert.That (recorded.StartsWith(head, StringComparison.Ordinal))
-      Assert.That (recorded.EndsWith(tail, StringComparison.Ordinal))
       use worker' = new FileStream(reportFile, FileMode.Open)
       let after = XmlDocument()
       after.Load worker'