Merge pull request #8 from nfdi4plants/setupTests

Setup tests
nfdi4plants · Apr 3, 2023 · 9625b91 · 9625b91
2 parents e84dd8f + 4145f8d
commit 9625b91
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 7 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -16,6 +16,6 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.x.x
+        dotnet-version: 6.x.x
     - name: Build and test
-      run: dotnet run --project ./build/Build.fsproj
+      run: dotnet run --project ./build/Build.fsproj runtests
diff --git a/arcIO.NET.sln b/arcIO.NET.sln
@@ -7,6 +7,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "arcIO.NET", "src\arcIO.NET\
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Build", "build\Build.fsproj", "{E7F453CD-BCCA-42EF-96A2-C74B9A09A593}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "arcIO.NET.Tests", "tests\arcIO.NET.Tests\arcIO.NET.Tests.fsproj", "{71F0320C-879D-47FA-B665-B5BD1F467F76}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,6 +43,18 @@ Global
 		{E7F453CD-BCCA-42EF-96A2-C74B9A09A593}.Release|x64.Build.0 = Release|Any CPU
 		{E7F453CD-BCCA-42EF-96A2-C74B9A09A593}.Release|x86.ActiveCfg = Release|Any CPU
 		{E7F453CD-BCCA-42EF-96A2-C74B9A09A593}.Release|x86.Build.0 = Release|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Debug|x64.Build.0 = Debug|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Debug|x86.Build.0 = Debug|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Release|x64.ActiveCfg = Release|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Release|x64.Build.0 = Release|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Release|x86.ActiveCfg = Release|Any CPU
+		{71F0320C-879D-47FA-B665-B5BD1F467F76}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/build/ProjectInfo.fs b/build/ProjectInfo.fs
@@ -6,7 +6,7 @@ let project = "arcIO.NET"
 
 let testProjects = 
     [
-        // add relative paths (from project root) to your testprojects here
+        "tests/arcIO.NET.Tests/arcIO.NET.Tests.fsproj"
     ]
 
 let solutionFile  = $"{project}.sln"

diff --git a/build/TestTasks.fs b/build/TestTasks.fs
@@ -7,6 +7,7 @@ open ProjectInfo
 open BasicTasks
 
 let runTests = BuildTask.create "RunTests" [clean; build] {
+    printfn $"Testprojectcount: {Seq.length testProjects}"
     testProjects
     |> Seq.iter (fun testProject ->
         Fake.DotNet.DotNet.test(fun testParams ->

diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "6.0.100",
+    "rollForward": "latestMinor"
+  }
+}
diff --git a/src/arcIO.NET/Converter.fs b/src/arcIO.NET/Converter.fs
@@ -4,14 +4,15 @@ open ISADotNet
 open ISADotNet.QueryModel
 open FsSpreadsheet.DSL
 open LitXml
-
+open JsonDSL
+open System.Text.Json
 
 type ARCconverter =
 | ARCtoCSV      of (QInvestigation -> QStudy -> QAssay -> SheetEntity<Workbook>)
 | ARCtoTSV      of (QInvestigation -> QStudy -> QAssay -> SheetEntity<Workbook>)
 | ARCtoXLSX     of (QInvestigation -> QStudy -> QAssay -> SheetEntity<Workbook>)
 | ARCtoXML      of (QInvestigation -> QStudy -> QAssay -> LitXml.XmlPart)
-//| ARCtoJSON     of QInvestigation -> QStudy -> QAssay -> 
+| ARCtoJSON     of (QInvestigation -> QStudy -> QAssay -> JEntity<Nodes.JsonNode>)
 
     member this.ConvertCSV(i,s,a) = 
         match this with
@@ -33,4 +34,7 @@ type ARCconverter =
         | ARCtoXML f -> f i s a
         | _ -> failwith "could not convert to xml"
 
-
+    member this.ConvertJsn(i,s,a) = 
+        match this with
+        | ARCtoJSON f -> f i s a
+        | _ -> failwith "could not convert to xml"
diff --git a/src/arcIO.NET/arcIO.NET.fsproj b/src/arcIO.NET/arcIO.NET.fsproj
@@ -24,7 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ISADotNet.XLSX" Version="0.7.0-preview.8" />
+    <PackageReference Include="ISADotNet.XLSX" Version="0.7.0-preview.10" />
+    <PackageReference Include="JsonDSL" Version="0.0.5" />
     <PackageReference Include="LitXml" Version="0.1.0" />
     <PackageReference Include="NLog" Version="5.1.2" />
   </ItemGroup>

diff --git a/tests/arcIO.NET.Tests/AssayTests.fs b/tests/arcIO.NET.Tests/AssayTests.fs
@@ -0,0 +1,16 @@
+module AssayTests
+
+open Expecto
+open TestingUtils
+open arcIO.NET
+open System.Text.Json
+
+[<Tests>]
+let testComponentCasting =
+
+    testList "Test" [
+        testCase "WillFail" (fun () -> 
+            Expect.isTrue true "Test if the test will test."
+
+        )
+    ]
diff --git a/tests/arcIO.NET.Tests/Main.fs b/tests/arcIO.NET.Tests/Main.fs
@@ -0,0 +1,11 @@
+module arcIO.NET.Tests
+
+open Expecto
+
+[<EntryPoint>]
+let main argv =
+
+    //Regex Test
+    Tests.runTestsWithCLIArgs [Tests.CLIArguments.Sequenced] argv AssayTests.testComponentCasting |> ignore
+
+    0
diff --git a/tests/arcIO.NET.Tests/Utils.fs b/tests/arcIO.NET.Tests/Utils.fs
@@ -0,0 +1,16 @@
+module TestingUtils
+
+open Expecto
+
+    ///
+let floatsClose accuracy (seq1:seq<float>) (seq2:seq<float>) = 
+    Seq.map2 (fun x1 x2 -> Accuracy.areClose accuracy x1 x2) seq1 seq2
+    |> Seq.contains false
+    |> not
+
+module Result =
+
+    let getMessage res =
+        match res with
+        | Ok m -> m
+        | Error m -> m
diff --git a/tests/arcIO.NET.Tests/arcIO.NET.Tests.fsproj b/tests/arcIO.NET.Tests/arcIO.NET.Tests.fsproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <GenerateProgramFile>false</GenerateProgramFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Remove="ISADotNet.Validation\**" />
+    <EmbeddedResource Remove="ISADotNet.XLSX\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="Utils.fs" />
+    <Compile Include="AssayTests.fs" />
+    <Compile Include="Main.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Expecto" Version="9.*" />
+    <PackageReference Include="FSharp.Data" Version="5.0.2" />
+    <PackageReference Include="NJsonSchema" Version="10.8.0" />
+    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <ProjectReference Include="..\..\src\arcIO.NET\arcIO.NET.fsproj" />
+    <PackageReference Update="FSharp.Core" Version="7.0.300-beta.23127.2" />
+  </ItemGroup>
+</Project>