Restructure testing environment

tests/ARCtrl/ARCtrl.Contracts.Tests.fs

@@ -1,10 +1,6 @@
 module ARCtrl.Contracts.Tests
 
-#if FABLE_COMPILER
-open Fable.Mocha
-#else
-open Expecto
-#endif
+open TestingUtils
 
 open ARCtrl
 open ARCtrl.Contract

tests/ARCtrl/ARCtrl.Tests.fs

@@ -1,10 +1,5 @@
 module ARCtrl.Tests
 
-#if FABLE_COMPILER
-open Fable.Mocha
-#else
-open Expecto
-#endif
 
 open ARCtrl
 open ARCtrl.ISA
@@ -96,11 +91,11 @@ let private test_isaFromContracts = testList "read_contracts" [
         Expect.equal study.TableCount 1 "study should have read one table"
         let studyTable = study.Tables.[0]
         Expect.equal studyTable.ColumnCount 2 "study column number should be unchanged"
-        Expect.mySequenceEqual
+        Expect.sequenceEqual
             (studyTable.GetProtocolDescriptionColumn()).Cells
             [CompositeCell.createFreeText UpdateAssayWithStudyProtocol.description]
             "Description value was not kept correctly"
-        Expect.mySequenceEqual
+        Expect.sequenceEqual
             (studyTable.GetProtocolNameColumn()).Cells
             [CompositeCell.createFreeText UpdateAssayWithStudyProtocol.protocolName]
             "Protocol ref value was not kept correctly"
@@ -110,15 +105,15 @@ let private test_isaFromContracts = testList "read_contracts" [
         Expect.equal assay.TableCount 1 "assay should have read one table"
         let assayTable = assay.Tables.[0]
         Expect.equal assayTable.ColumnCount 3 "assay column number should be updated"
-        Expect.mySequenceEqual
+        Expect.sequenceEqual
             (assayTable.GetProtocolNameColumn()).Cells
             (Array.create 2 (CompositeCell.createFreeText UpdateAssayWithStudyProtocol.protocolName))
             "Protocol ref value was not kept correctly"
-        Expect.mySequenceEqual
+        Expect.sequenceEqual
             (assayTable.GetColumnByHeader(UpdateAssayWithStudyProtocol.inputHeader)).Cells
             (Array.create 2 UpdateAssayWithStudyProtocol.inputCell)
             "Protocol ref value was not kept correctly"
-        Expect.mySequenceEqual
+        Expect.sequenceEqual
             (assayTable.GetProtocolDescriptionColumn()).Cells
             (Array.create 2 (CompositeCell.createFreeText UpdateAssayWithStudyProtocol.description))
             "Description value was not taken correctly"

tests/ARCtrl/ARCtrl.Tests.fsproj

@@ -6,9 +6,9 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Templates.Tests.fs" />
     <Compile Include="SemVer.Tests.fs" />
-    <None Include="paket.references" />
     <Compile Include="ARCtrl.Contracts.Tests.fs" />
     <Compile Include="ARCtrl.Tests.fs" />
     <Compile Include="Main.fs" />

tests/ARCtrl/SemVer.Tests.fs

@@ -1,10 +1,6 @@
 module ARCtrl.SemVer.Tests
 
-#if FABLE_COMPILER
-open Fable.Mocha
-#else
-open Expecto
-#endif
+open TestingUtils
 
 open ARCtrl
 

tests/ARCtrl/Templates.Tests.fs

@@ -1,18 +1,14 @@
 module ARCtrl.Templates.Tests
 
 #if FABLE_COMPILER
-open Fable.Mocha
 open Thoth.Json
 #else
-open Expecto
 open Thoth.Json.Net
 #endif
 
 open ARCtrl.Templates.Json
 open ARCtrl.ISA
 
-open System
-open System.Text
 open TestingUtils
 
 let private fableReplaceLineEndings(str: string) =
@@ -144,8 +140,8 @@ let tests_Template = testList "Template" [
                 //printfn "EXPECTED: %A" expected.Table
 
                 Expect.equal actualValue.Table.Name expected.Table.Name "Name should be equal"
-                Expect.mySequenceEqual actualValue.Table.Headers expected.Table.Headers "Headers should be equal"
-                Expect.mySequenceEqual actualValue.Table.Values expected.Table.Values "Headers should be equal"
+                Expect.sequenceEqual actualValue.Table.Headers expected.Table.Headers "Headers should be equal"
+                Expect.sequenceEqual actualValue.Table.Values expected.Table.Values "Headers should be equal"
 
                 Expect.equal actualValue.Table.RowCount expected.Table.RowCount "RowCount should be equal"
                 Expect.equal actualValue.Table.ColumnCount expected.Table.ColumnCount "ColumnCount should be equal"

tests/ARCtrl/paket.references

@@ -1,6 +1,3 @@
 FSharp.Core
-Fable.Core
-Expecto
-Fable.Mocha
 Microsoft.NET.Test.Sdk
 YoloDev.Expecto.TestSdk

tests/FileSystem/FileSystemTree.Tests.fs

@@ -1,10 +1,6 @@
 module ARCtrl.FileSystemTree.Tests
 
-#if FABLE_COMPILER
-open Fable.Mocha
-#else
-open Expecto
-#endif
+open TestingUtils
 
 open ARCtrl.FileSystem
 open TestingUtils

tests/FileSystem/paket.references

@@ -1,6 +1,3 @@
 FSharp.Core
-Fable.Core
-Expecto
-Fable.Mocha
 Microsoft.NET.Test.Sdk
 YoloDev.Expecto.TestSdk

tests/ISA/ISA.Json.Tests/Json.Tests.fs

@@ -8,10 +8,8 @@ open ARCtrl.ISA
 open Fable.Core
 open Fable.Core.JsInterop
 open Thoth.Json
-open Fable.Mocha
 #else
 open Thoth.Json.Net
-open Expecto
 #endif
 
 open TestingUtils
@@ -103,7 +101,7 @@ let testEncode =
 
             let expected = comments
 
-            Expect.mySequenceEqual result' expected "Retrieved value did not match"
+            Expect.sequenceEqual result' expected "Retrieved value did not match"
         )
 
     ]
@@ -131,7 +129,7 @@ let testDecode =
 
             let expected = ["@id";"characteristics";"name";"type"]
 
-            Expect.mySequenceEqual result expected "Field names did not match"
+            Expect.sequenceEqual result expected "Field names did not match"
         )
     ]
 
@@ -162,7 +160,7 @@ let testOntoloyAnnotation =
                     o_out
                     |> Utils.wordFrequency
 
-                Expect.mySequenceEqual actual expected "Written processInput does not match read process input"
+                Expect.sequenceEqual actual expected "Written processInput does not match read process input"
             )
     ]
 
@@ -193,7 +191,7 @@ let testOntoloyAnnotationLD =
                     o_out
                     |> Utils.wordFrequency
 
-                Expect.mySequenceEqual actual expected "Written processInput does not match read process input"
+                Expect.sequenceEqual actual expected "Written processInput does not match read process input"
             )
             testCase "WriterOutputMatchesInputDefaultIDs" (fun () -> 
 
@@ -208,7 +206,7 @@ let testOntoloyAnnotationLD =
                     o_out
                     |> Utils.wordFrequency
 
-                Expect.mySequenceEqual actual expected "Written processInput does not match read process input"
+                Expect.sequenceEqual actual expected "Written processInput does not match read process input"
             )
     ]
 
@@ -241,7 +239,7 @@ let testProcessInput =
                     o_out
                     |> Utils.wordFrequency
 
-                Expect.mySequenceEqual actual expected "Written processInput does not match read process input"
+                Expect.sequenceEqual actual expected "Written processInput does not match read process input"
             )
         ]
         testList "Material" [
@@ -735,7 +733,7 @@ let testProcessFile =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written process file does not match read process file"
+            Expect.sequenceEqual actual expected "Written process file does not match read process file"
         )
     ]
 
@@ -798,7 +796,7 @@ let testProcessFileLD =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written process file does not match read process file"
+            Expect.sequenceEqual actual expected "Written process file does not match read process file"
         )
 
         testCase "OutputMatchesInputDefaultLD" (fun () ->
@@ -818,7 +816,7 @@ let testProcessFileLD =
                 |> Utils.extractWords
                 |> Array.countBy id
                 |> Array.sortBy fst
-            Expect.mySequenceEqual actual expected "Written process file does not match read process file"
+            Expect.sequenceEqual actual expected "Written process file does not match read process file"
         )
     ]
 
@@ -881,7 +879,7 @@ let testPersonFile =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written person file does not match read person file"
+            Expect.sequenceEqual actual expected "Written person file does not match read person file"
         )
 
 
@@ -923,7 +921,7 @@ let testPersonFile =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written person file does not match read person file"
+            Expect.sequenceEqual actual expected "Written person file does not match read person file"
         )
     ]
 
@@ -986,7 +984,7 @@ let testPersonFileLD =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written person file does not match read person file"
+            Expect.sequenceEqual actual expected "Written person file does not match read person file"
         )
 
         testCase "OutputMatchesInputDefaultLD" (fun () ->
@@ -1007,7 +1005,7 @@ let testPersonFileLD =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written person file does not match read person file"
+            Expect.sequenceEqual actual expected "Written person file does not match read person file"
         )
     ]
 
@@ -1070,7 +1068,7 @@ let testPublicationFile =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written Publication file does not match read publication file"
+            Expect.sequenceEqual actual expected "Written Publication file does not match read publication file"
         )
     ]
 
@@ -1133,7 +1131,7 @@ let testPublicationFileLD =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written Publication file does not match read publication file"
+            Expect.sequenceEqual actual expected "Written Publication file does not match read publication file"
         )
     ]
 
@@ -1196,7 +1194,7 @@ let testAssayFile =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written assay file does not match read assay file"
+            Expect.sequenceEqual actual expected "Written assay file does not match read assay file"
         )
     ]
 
@@ -1258,7 +1256,7 @@ let testInvestigationFile =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual actual expected "Written investigation file does not match read investigation file"
+            Expect.sequenceEqual actual expected "Written investigation file does not match read investigation file"
         )
         testCase "HandleEmptyRemarks" (fun () ->
 
@@ -1617,7 +1615,7 @@ let testInvestigationFile =
                 |> Array.countBy id
                 |> Array.sortBy fst
 
-            Expect.mySequenceEqual o i "Written investigation file does not match read investigation file"
+            Expect.sequenceEqual o i "Written investigation file does not match read investigation file"
 
         )
     ]
@@ -1680,7 +1678,7 @@ let testInvestigationFileLD =
         //         |> Array.countBy id
         //         |> Array.sortBy fst
 
-        //     Expect.mySequenceEqual actual expected "Written investigation file does not match read investigation file"
+        //     Expect.sequenceEqual actual expected "Written investigation file does not match read investigation file"
         // )
         // testCase "HandleEmptyRemarks" (fun () ->
 
@@ -2035,8 +2033,8 @@ let testInvestigationFileLD =
             //     |> Array.countBy id
             //     |> Array.sortBy fst
 
-            // Expect.mySequenceEqual actual expected "Written investigation file does not match read investigation file"
-            Expect.mySequenceEqual [1;2] [1;2] "bla"
+            // Expect.sequenceEqual actual expected "Written investigation file does not match read investigation file"
+            Expect.sequenceEqual [1;2] [1;2] "bla"
 
         )
     ]

tests/ISA/ISA.Json.Tests/JsonSchema.Tests.fs

@@ -1,10 +1,6 @@
 module JsonSchema.Tests
 
-#if FABLE_COMPILER
-open Fable.Mocha
-#else
-open Expecto
-#endif
+open TestingUtils
 
 open ARCtrl.ISA.Json
 

tests/ISA/ISA.Json.Tests/paket.references

@@ -1,6 +1,3 @@
 FSharp.Core
-Fable.Core
-Expecto
-Fable.Mocha
 Microsoft.NET.Test.Sdk
 YoloDev.Expecto.TestSdk