diff --git a/ARCtrl.sln b/ARCtrl.sln index 7eabfae5..45406e5e 100644 --- a/ARCtrl.sln +++ b/ARCtrl.sln @@ -29,11 +29,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{64B34A6E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JavaScript", "JavaScript", "{913222CA-261F-49CB-A823-CC7C335F964A}" ProjectSection(SolutionItems) = preProject - tests\JavaScript\ARCtrl.Index.js = tests\JavaScript\ARCtrl.Index.js - tests\JavaScript\ISA.CompositeCell.js = tests\JavaScript\ISA.CompositeCell.js - tests\JavaScript\ISA.CompositeHeader.js = tests\JavaScript\ISA.CompositeHeader.js - tests\JavaScript\ISA.Person.js = tests\JavaScript\ISA.Person.js + tests\JavaScript\CompositeCell.js = tests\JavaScript\CompositeCell.js + tests\JavaScript\CompositeHeader.js = tests\JavaScript\CompositeHeader.js tests\JavaScript\Main.js = tests\JavaScript\Main.js + tests\JavaScript\Person.js = tests\JavaScript\Person.js tests\JavaScript\Template.Web.js = tests\JavaScript\Template.Web.js EndProjectSection EndProject diff --git a/build/TestTasks.fs b/build/TestTasks.fs index 8ebc7921..a6e1a99c 100644 --- a/build/TestTasks.fs +++ b/build/TestTasks.fs @@ -33,20 +33,9 @@ module RunTests = run dotnet $"fable {path} -o {path}/js" "" // run mocha in target path to execute tests // "--timeout 20000" is used, because json schema validation takes a bit of time. - run npx $"mocha {path}/js --timeout 20000" "" + run node $"{path}/js/Main.js" "" } - /// - /// Until we reach full Py compatibility we use these paths to check only compatible projects - /// - let testProjectsPy = - [ - //"tests/ISA/ISA.Tests" - //"tests/ISA/ISA.Json.Tests" - //"tests/ISA/ISA.Spreadsheet.Tests" - "tests/ARCtrl" - ] - let runTestsPy = BuildTask.create "runTestsPy" [clean; build] { for path in ProjectInfo.testProjects do //transpile py files from fsharp code diff --git a/tests/JavaScript/ARCtrl.Index.js b/tests/JavaScript/ARCtrl.Index.js deleted file mode 100644 index 3024aa8f..00000000 --- a/tests/JavaScript/ARCtrl.Index.js +++ /dev/null @@ -1,26 +0,0 @@ -import { equal, deepEqual } from 'assert'; -import { OntologyAnnotation, ArcAssay, ArcInvestigation, ArcTable, JsonController } from './ARCtrl/index.js' - -//import file './ARCtrl/index.js' is generated by FAKE never by NPM. -describe('Auto Generated Index', function () { - it('OntologyAnnotation', function () { - let actual = OntologyAnnotation.create("My OA") - equal(actual.NameText, "My OA") - }); - it('ArcAssay', function () { - let actual = new ArcAssay("My Assay", null, null, null, [ArcTable.init("MyTable")]) - equal(actual.Identifier, "My Assay", "Id") - equal(actual.TableCount, 1, "TableCount") - }); - it('ArcInvestigation', function () { - let actual = new ArcInvestigation("My Investigation", "Super Awesome Experiment") - equal(actual.Identifier, "My Investigation", "Id") - equal(actual.Title, "Super Awesome Experiment", "Title") - }); - it('JsonController', function () { - let actual = new ArcInvestigation("My Investigation", "Super Awesome Experiment") - let json = JsonController.Investigation.toJsonString(0)(actual) - const expected = '{"Identifier":"My Investigation","Title":"Super Awesome Experiment"}' - equal(json, expected, "json conversion") - }); -}); \ No newline at end of file