Misc work

.editorconfig

@@ -0,0 +1,2 @@
+[*.{fs,fsx}]
+max_line_length = 80

Demeton.Tests/Demeton.Tests.fsproj

@@ -19,6 +19,7 @@
 
     <ItemGroup>
         <RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true"/>
+        <Compile Include="Should.fs" />
         <Compile Include="TestLog.fs"/>
         <Compile Include="TestHelp.fs"/>
         <Compile Include="BetterFsCheckRunner.fs"/>

Demeton.Tests/Should.fs

@@ -0,0 +1,14 @@
+[<RequireQualifiedAccess>]
+module Should
+
+open System
+
+let notBeCalled _ = invalidOp "bug: should not be called"
+let notBeCalled2 _ _ = invalidOp "bug: should not be called"
+let notBeCalled3 _ _ _ = invalidOp "bug: should not be called"
+let notBeCalled4 _ _ _ _ = invalidOp "bug: should not be called"
+
+let fail message = invalidOp message
+
+let reportNotImplemented message =
+    NotImplementedException message |> raise

Demeton.Tests/Srtm/Fetching SRTM tiles/Processing the fetching stack.fs

@@ -37,11 +37,11 @@ let ``Calling processNextCommand on an empty command stack returns the same stat
         |> processNextCommand
             localCacheDir
             srtmDir
-            _noCall
-            _noCall
-            _noCall2
-            _noCall2
-            _noCall2
+            Should.notBeCalled
+            Should.notBeCalled
+            Should.notBeCalled2
+            Should.notBeCalled2
+            Should.notBeCalled2
 
     test <@ resultingState = initialState @>
 
@@ -56,10 +56,10 @@ let ``When a tile does not exist, puts None in the tiles stack`` () =
             localCacheDir
             srtmDir
             (fun _ -> NotExists)
-            _noCall
-            _noCall2
-            _noCall2
-            _noCall2
+            Should.notBeCalled
+            Should.notBeCalled2
+            Should.notBeCalled2
+            Should.notBeCalled2
 
     test <@ resultingState = (initialCommands, None :: initialStackedTiles) @>
 
@@ -81,9 +81,9 @@ let ``When a tile is cached, reads it and puts it into the tiles stack`` () =
             srtmDir
             (fun _ -> Cached)
             (expectReadingOfTile tile)
-            _noCall
-            _noCall2
-            _noCall2
+            Should.notBeCalled
+            Should.notBeCalled2
+            Should.notBeCalled2
 
     test
         <@
@@ -107,9 +107,9 @@ let ``If reading of a cache tile fails, put error indicator into the stack``
             srtmDir
             (fun _ -> Cached)
             readingOfTileFails
-            _noCall
-            _noCall2
-            _noCall2
+            Should.notBeCalled
+            Should.notBeCalled2
+            Should.notBeCalled2
 
     test
         <@
@@ -128,10 +128,10 @@ let ``When a level 0 tile is not cached, puts ConvertTileFromHgt command`` () =
             localCacheDir
             srtmDir
             (fun _ -> NotCached)
-            _noCall
-            _noCall2
-            _noCall2
-            _noCall2
+            Should.notBeCalled
+            Should.notBeCalled2
+            Should.notBeCalled2
+            Should.notBeCalled2
 
     test
         <@
@@ -152,10 +152,10 @@ let ``When a level > 0 tile is not cached, fills the command stack with children
             localCacheDir
             srtmDir
             (fun _ -> NotCached)
-            _noCall
-            _noCall2
-            _noCall2
-            _noCall2
+            Should.notBeCalled
+            Should.notBeCalled2
+            Should.notBeCalled2
+            Should.notBeCalled2
 
     let childTiles =
         [| (8, 16); (9, 16); (8, 17); (9, 17) |]
@@ -192,11 +192,11 @@ let ``When convert from HGT command is received`` () =
         |> processNextCommand
             localCacheDir
             srtmDir
-            _noCall
-            _noCall2
+            Should.notBeCalled
+            Should.notBeCalled2
             convertProducesSomeTile
-            _noCall2
-            _noCall2
+            Should.notBeCalled2
+            Should.notBeCalled2
 
     test
         <@
@@ -221,11 +221,11 @@ let ``Convert to PNG can fail`` () =
         |> processNextCommand
             localCacheDir
             srtmDir
-            _noCall
-            _noCall2
+            Should.notBeCalled
+            Should.notBeCalled2
             convertThatFails
-            _noCall2
-            _noCall2
+            Should.notBeCalled2
+            Should.notBeCalled2
 
     let expectedResultingState =
         (Failure errorMessage :: initialCommands, initialStackedTiles)
@@ -264,9 +264,9 @@ let ``When create from lower tiles command is received and create returns tile``
         |> processNextCommand
             localCacheDir
             srtmDir
-            _noCall
-            _noCall2
-            _noCall
+            Should.notBeCalled
+            Should.notBeCalled2
+            Should.notBeCalled
             constructParentTileReturnsSomeTile
             writeTileToCache
 
@@ -311,9 +311,9 @@ let ``When create from lower tiles command is received and create returns None``
         |> processNextCommand
             localCacheDir
             srtmDir
-            _noCall
-            _noCall2
-            _noCall
+            Should.notBeCalled
+            Should.notBeCalled2
+            Should.notBeCalled
             constructParentTileReturnsNone
             writeTileToCache
 
@@ -345,8 +345,8 @@ let ``Testing the tail recursion`` () =
             (fun _ -> Cached)
             (fun _ _ -> Ok someTileHeights)
             (fun _ _ _ -> Ok someTileHeights)
-            _noCall2
-            _noCall2
+            Should.notBeCalled2
+            Should.notBeCalled2
             initialState
 
     // there should be no more commands in the stack
@@ -390,10 +390,10 @@ let ``Command stack processor should stop on failure and return the error`` () =
             localCacheDir
             srtmDir
             (fun _ -> NotCached)
-            _noCall2
+            Should.notBeCalled2
             (convertFailsOnSomeCall 4)
-            _noCall2
-            _noCall2
+            Should.notBeCalled2
+            Should.notBeCalled2
             initialState
 
     // there should be an error indicator next in the command stack

Demeton.Tests/Srtm/Saving SRTM tiles to cache.fs

@@ -51,7 +51,7 @@ let ``Saves the tile into the cache directory`` () =
             cacheDir
             ensureCacheDirectoryExists
             writeAsPngFile
-            _noCall
+            Should.notBeCalled
             tile
             (Some heights)
 

Demeton.Tests/TestHelp.fs

@@ -4,16 +4,12 @@ open System
 open System.Reflection
 open System.Runtime.InteropServices
 
-let isLinux() = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) 
+let isLinux () =
+    RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
 
 let fail errorMessage =
     raise (Xunit.Sdk.XunitException errorMessage)
 
-let _noCall _ = invalidOp "bug: should not be called"
-let _noCall2 _ _ = invalidOp "bug: should not be called"
-let _noCall3 _ _ _ = invalidOp "bug: should not be called"
-let _noCall4 _ _ _ _ = invalidOp "bug: should not be called"
-
 let isOk result =
     match result with
     | Ok _ -> true
@@ -31,7 +27,7 @@ let isOkValue expectedOkValue result =
 let resultValue result =
     match result with
     | Ok x -> x
-    | Error msg -> 
+    | Error msg ->
         invalidOp (sprintf "The result indicates an error: '%s'." msg)
 
 let isError (result: Result<'T, 'TError>) =
@@ -44,26 +40,30 @@ let isErrorData (errorData: 'TError) (result: Result<'T, 'TError>) =
     | Ok _ -> false
     | Error actualErrorData -> actualErrorData = errorData
 
-let inline (=~=) (x: float) (y: float) = abs (x-y) <  1.E-10
-    
+let inline (=~=) (x: float) (y: float) = abs (x - y) < 1.E-10
+
 type ApproxMeasure =
-    Decimals of int
+    | Decimals of int
     | Percentage of float
 
-let isApproxEqualTo 
-    (controlValue: float) (measure: ApproxMeasure) (actualValue: float) =
+let isApproxEqualTo
+    (controlValue: float)
+    (measure: ApproxMeasure)
+    (actualValue: float)
+    =
     match measure with
-    | Decimals decimals -> 
-        Math.Round(controlValue, decimals) 
-            = Math.Round(actualValue, decimals)
+    | Decimals decimals ->
+        Math.Round(controlValue, decimals) = Math.Round(actualValue, decimals)
     | Percentage percentage ->
         let percentageValue = controlValue * percentage / 100.
         Math.Abs(actualValue - controlValue) < percentageValue
 
 /// <summary>
-/// Opens a stream for a specified sample resource file. 
+/// Opens a stream for a specified sample resource file.
 /// </summary>
 let sampleFileStream sampleFileName =
     let assembly = Assembly.GetExecutingAssembly()
-    assembly.GetManifestResourceStream
-        ("Demeton.Tests.samples." + sampleFileName)
+
+    assembly.GetManifestResourceStream(
+        "Demeton.Tests.samples." + sampleFileName
+    )