add json io tests

tests/FsSpreadsheet.Js.Tests/DefaultIO.Tests.fs

@@ -41,7 +41,7 @@ let private tests_Write = testList "Write" [
     testCaseAsync "default" (Async.AwaitPromise <|  promise {
         let wb = DefaultTestObject.defaultTestObject()
         let p = DefaultTestObject.WriteTestFiles.FsSpreadsheetJS.asRelativePathNode
-        do! FsWorkbook.toFile p wb
+        do! FsWorkbook.toXlsxFile p wb
         let! wb_read = FsWorkbook.fromXlsxFile p
         Expect.isDefaultTestObject wb_read
     })

tests/FsSpreadsheet.Js.Tests/FsSpreadsheet.Js.Tests.fsproj

@@ -9,6 +9,7 @@
   <ItemGroup>
     <Compile Include="DefaultIO.Tests.fs" />
     <Compile Include="Workbook.Tests.fs" />
+    <Compile Include="Json.Tests.fs" />
     <Compile Include="Main.fs" />
   </ItemGroup>
 	<ItemGroup>

tests/FsSpreadsheet.Js.Tests/Json.Tests.fs

@@ -0,0 +1,22 @@
+module Json.Tests
+
+open FsSpreadsheet
+open FsSpreadsheet.Js
+open Fable.Pyxpecto
+
+let defaultTestObject =
+    testList "defaultTestObject" [
+
+        testCase "Read-Write DefaultTestObject" <| fun _ ->
+            let dto = DefaultTestObject.defaultTestObject()
+            let s = dto.ToJsonString()
+            let dto2 = FsWorkbook.fromJsonString(s)
+            TestingUtils.Expect.isDefaultTestObject dto2
+
+        testCase "Should Fail" <| fun _ ->
+            Expect.isTrue false "is not the expected DataType.Boolean"
+    ]
+
+let main = testList "Json" [
+    defaultTestObject
+]

tests/FsSpreadsheet.Js.Tests/Main.fs

@@ -9,6 +9,7 @@ let all =
         [
             Workbook.Tests.main
             DefaultIO.Tests.main
+            Json.Tests.main
         ]
 
 // This is possibly the most magic used to make this work. 

tests/FsSpreadsheet.Net.Tests/FsSpreadsheet.Net.Tests.fsproj

@@ -18,6 +18,7 @@
     <Compile Include="OpenXml\Spreadsheet.fs" />
     <Compile Include="Table.fs" />
     <Compile Include="FsWorkbook.fs" />
+    <Compile Include="Json.Tests.fs" />
     <Compile Include="Main.fs" />
   </ItemGroup>
 

tests/FsSpreadsheet.Net.Tests/FsWorkbook.fs

@@ -1,4 +1,4 @@
-module FsWorkbook
+module FsWorkbookTests
 
 open Expecto
 open FsSpreadsheet
@@ -10,7 +10,7 @@ let writeAndReadBytes =
     testList "WriteAndReadBytes" [
         testCase "Empty" (fun () -> 
             let wb = new FsWorkbook()
-            let f() = wb.ToBytes()
+            let f() = wb.ToXlsxBytes()
             try 
                 f() |> ignore
                 failwith "Should throw an exception"
@@ -35,8 +35,8 @@ let writeAndReadBytes =
             let expected = new FsWorkbook()
             let ws = TestObjects.sheet1()
             expected.AddWorksheet(ws)
-            let bytes = expected.ToBytes()
-            let actual = FsWorkbook.fromBytes(bytes)
+            let bytes = expected.ToXlsxBytes()
+            let actual = FsWorkbook.fromXlsxBytes(bytes)
             Expect.equal (expected.GetWorksheets().Count) (actual.GetWorksheets().Count) "Worksheet count should be equal"
             Expect.equal (expected.GetWorksheetByName(TestObjects.sheet1Name).Name) TestObjects.sheet1Name "excpected sheetname"
             Expect.equal (actual.GetWorksheetByName(TestObjects.sheet1Name).Name) TestObjects.sheet1Name "actual sheetname"
@@ -46,8 +46,8 @@ let writeAndReadBytes =
             let wb = new FsWorkbook()
             wb.AddWorksheet(TestObjects.sheet1())
             wb.AddWorksheet(TestObjects.sheet2())
-            let bytes = wb.ToBytes()
-            let wb2 = FsWorkbook.fromBytes(bytes)
+            let bytes = wb.ToXlsxBytes()
+            let wb2 = FsWorkbook.fromXlsxBytes(bytes)
             Expect.equal (wb.GetWorksheets().Count) (wb2.GetWorksheets().Count) "Worksheet count should be equal"
             Expect.workSheetEqual (wb.GetWorksheetByName(TestObjects.sheet1Name)) (wb2.GetWorksheetByName(TestObjects.sheet1Name)) "First Worksheet did not match"
             Expect.workSheetEqual (wb.GetWorksheetByName(TestObjects.sheet2Name)) (wb2.GetWorksheetByName(TestObjects.sheet2Name)) "Second Worksheet did not match"

tests/FsSpreadsheet.Net.Tests/Json.Tests.fs

@@ -0,0 +1,22 @@
+module Json.Tests
+
+open FsSpreadsheet
+open FsSpreadsheet.Net
+open Fable.Pyxpecto
+
+let defaultTestObject =
+    testList "defaultTestObject" [
+
+        testCase "Read-Write DefaultTestObject" <| fun _ ->
+            let dto = DefaultTestObject.defaultTestObject()
+            let s = dto.ToJsonString()
+            let dto2 = FsWorkbook.fromJsonString(s)
+            TestingUtils.Expect.isDefaultTestObject dto2
+
+        testCase "Should Fail" <| fun _ ->
+            Expect.isTrue false "is not the expected DataType.Boolean"
+    ]
+
+let main = testList "Json" [
+    defaultTestObject
+]

tests/FsSpreadsheet.Net.Tests/Table.fs

@@ -1,4 +1,4 @@
-module FsTable
+module FsTableTests
 
 open Expecto
 open FsSpreadsheet
@@ -31,7 +31,7 @@ let transformTable =
 
             // --- Function of interest ---
 
-            let bytes = wb.ToBytes()
+            let bytes = wb.ToXlsxBytes()
 
             // --- Get Tables ---
 

tests/FsSpreadsheet.Py.Tests/DefaultIO.Tests.fs

@@ -41,7 +41,7 @@ let private tests_Write = testList "Write" [
     testCase "default" <|  fun _ ->
         let wb = DefaultTestObject.defaultTestObject()
         let p = DefaultTestObject.WriteTestFiles.FsSpreadsheetPY.asRelativePathNode
-        do FsWorkbook.toFile p wb
+        do FsWorkbook.toXlsxFile p wb
         let wb_read = FsWorkbook.fromXlsxFile p
         Expect.isDefaultTestObject wb_read
 

tests/FsSpreadsheet.Py.Tests/FsSpreadsheet.Py.Tests.fsproj

@@ -12,6 +12,7 @@
     <Compile Include="Worksheet.Tests.fs" />
     <Compile Include="Workbook.Tests.fs" />
     <Compile Include="DefaultIO.Tests.fs" />
+    <Compile Include="Json.Tests.fs" />
     <Compile Include="Main.fs" />
   </ItemGroup>
 	<ItemGroup>

tests/FsSpreadsheet.Py.Tests/Json.Tests.fs

@@ -0,0 +1,22 @@
+module Json.Tests
+
+open FsSpreadsheet
+open FsSpreadsheet.Py
+open Fable.Pyxpecto
+
+let defaultTestObject =
+    testList "defaultTestObject" [
+
+        testCase "Read-Write DefaultTestObject" <| fun _ ->
+            let dto = DefaultTestObject.defaultTestObject()
+            let s = dto.ToJsonString()
+            let dto2 = FsWorkbook.fromJsonString(s)
+            TestingUtils.Expect.isDefaultTestObject dto2
+
+        //testCase "Should Fail" <| fun _ ->
+        //    Expect.isTrue false "is not the expected DataType.Boolean"
+    ]
+
+let main = testList "Json" [
+    defaultTestObject
+]

tests/FsSpreadsheet.Py.Tests/Main.fs

@@ -11,6 +11,7 @@ let all =
             Worksheet.Tests.main
             Workbook.Tests.main
             DefaultIO.Tests.main
+            Json.Tests.main
         ]
 
 //// This is possibly the most magic used to make this work.