diff --git a/.github/workflows/Example.yml b/.github/workflows/Example.yml index a8ae5b6..fc19e79 100644 --- a/.github/workflows/Example.yml +++ b/.github/workflows/Example.yml @@ -6,8 +6,6 @@ on: push: branches: - main - #TODO - - tests-on-fmPy-0.4.1-unformatted paths: - 'src/**' - 'examples/**' @@ -142,8 +140,7 @@ jobs: call-docu: needs: [jupyter, pluto] - #TODO - if: (github.event_name != 'pull_request' && github.ref_name == 'main') || github.ref_name == 'tests-on-fmPy-0.4.1-unformatted' + if: github.event_name != 'pull_request' && github.ref_name == 'main' runs-on: ubuntu-latest env: HAS_TRIGGER_TOKEN: ${{ secrets.FMI_DOC_TRIGGER_PAT != '' }} diff --git a/.github/workflows/TestLatest.yml b/.github/workflows/TestLatest.yml index 95f77d9..595086b 100644 --- a/.github/workflows/TestLatest.yml +++ b/.github/workflows/TestLatest.yml @@ -6,8 +6,6 @@ on: push: branches: - main - #TODO - - tests-on-fmPy-0.4.1-unformatted paths: - 'src/**' - 'test/**' diff --git a/examples/FMI2/BouncingBall/src/BouncingBall.jl b/examples/FMI2/BouncingBall/src/BouncingBall.jl index dfe9b42..1ff08e2 100644 --- a/examples/FMI2/BouncingBall/src/BouncingBall.jl +++ b/examples/FMI2/BouncingBall/src/BouncingBall.jl @@ -152,7 +152,7 @@ fmu_save_path = joinpath(tmpDir, "BouncingBall.fmu") fmu = FMIBUILD_CONSTRUCTOR() using FMIBuild: saveFMU # <= this must be excluded during export, because FMIBuild cannot execute itself (but it is able to build) -#TODO saveFMU(fmu, fmu_save_path; debug=true, compress=false) # <= this must be excluded during export, because saveFMU would start an infinite build loop with itself (debug=true allows debug messages, but is slow during execution!) +saveFMU(fmu, fmu_save_path; debug=true, compress=false) # <= this must be excluded during export, because saveFMU would start an infinite build loop with itself (debug=true allows debug messages, but is slow during execution!) ### some tests ### using FMI, DifferentialEquations diff --git a/examples/FMI2/Manipulation/src/Manipulation.jl b/examples/FMI2/Manipulation/src/Manipulation.jl index ac30f6d..82fff05 100644 --- a/examples/FMI2/Manipulation/src/Manipulation.jl +++ b/examples/FMI2/Manipulation/src/Manipulation.jl @@ -79,7 +79,7 @@ fmu_save_path = joinpath(tmpDir, "Manipulation.fmu") sourceFMU = FMIZoo.get_model_filename("SpringDamperPendulum1D", "Dymola", "2022x") fmu = FMIBUILD_CONSTRUCTOR(dirname(sourceFMU)) import FMIBuild:saveFMU # <= this must be excluded during export, because FMIBuild cannot execute itself (but it is able to build) -#TODO saveFMU(fmu, fmu_save_path; resources=Dict(sourceFMU=>"SpringDamperPendulum1D.fmu")) # <= this must be excluded during export, because fmi2Save would start an infinte build loop with itself +saveFMU(fmu, fmu_save_path; resources=Dict(sourceFMU=>"SpringDamperPendulum1D.fmu")) # <= this must be excluded during export, because fmi2Save would start an infinte build loop with itself # some tests # using FMI diff --git a/examples/FMI2/NeuralFMU/src/NeuralFMU.jl b/examples/FMI2/NeuralFMU/src/NeuralFMU.jl index 9472bfa..68e5ebc 100644 --- a/examples/FMI2/NeuralFMU/src/NeuralFMU.jl +++ b/examples/FMI2/NeuralFMU/src/NeuralFMU.jl @@ -367,7 +367,7 @@ fmu_save_path = joinpath(tmpDir, "NeuralFMU.fmu") sourceFMU = FMIZoo.get_model_filename("SpringDamperPendulum1D", "Dymola", "2022x") fmu = FMIBUILD_CONSTRUCTOR(dirname(sourceFMU)) import FMIBuild:saveFMU # <= this must be excluded during export, because FMIBuild cannot execute itself (but it is able to build) -#TODO saveFMU(fmu, fmu_save_path; compress=false, debug=true, resources=Dict(sourceFMU=>"SpringDamperPendulum1D.fmu")) # <= this must be excluded during export, because fmi2Save would start an infinte build loop with itself +saveFMU(fmu, fmu_save_path; compress=false, debug=true, resources=Dict(sourceFMU=>"SpringDamperPendulum1D.fmu")) # <= this must be excluded during export, because fmi2Save would start an infinte build loop with itself ### some tests ### # using FMI diff --git a/examples/jupyter-src/Export.ipynb b/examples/jupyter-src/Export.ipynb index 015bd39..caac743 100644 --- a/examples/jupyter-src/Export.ipynb +++ b/examples/jupyter-src/Export.ipynb @@ -291,7 +291,7 @@ "metadata": {}, "outputs": [], "source": [ - "#TODO saveFMU(fmu, fmu_save_path, fmu_source_path; debug=false, compress=false) # feel free to set debug true, disabled for documentation building\n", + "saveFMU(fmu, fmu_save_path, fmu_source_path; debug=false, compress=false) # feel free to set debug true, disabled for documentation building\n", "#saveFMU(fmu_save_path, fmu_source_path; debug=false, compress=false) this meight be the format after the next release" ] }, @@ -311,7 +311,7 @@ "outputs": [], "source": [ "mkpath(\"Export_files\")\n", - "#TODO cp(fmu_save_path, joinpath(\"Export_files\", \"BouncingBall.fmu\"))" + "cp(fmu_save_path, joinpath(\"Export_files\", \"BouncingBall.fmu\"))" ] }, { diff --git a/test/bouncing_ball/bouncing_ball.jl b/test/bouncing_ball/bouncing_ball.jl index 872d746..8fa6467 100644 --- a/test/bouncing_ball/bouncing_ball.jl +++ b/test/bouncing_ball/bouncing_ball.jl @@ -18,9 +18,9 @@ if Sys.iswindows() ), ) # check if FMU exists now - #TODO @test isfile(fmu_save_path) - #TODO fsize = filesize(fmu_save_path) / 1024 / 1024 - #TODO @test fsize > 300 + @test isfile(fmu_save_path) + fsize = filesize(fmu_save_path) / 1024 / 1024 + @test fsize > 300 # TODO: as Exported FMUs are currently not able to be simulated with FMPy, use BouncingBall from FMIZoo instead to test Pipeline println( diff --git a/test/runtests.jl b/test/runtests.jl index 9097e8c..965c151 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -20,7 +20,7 @@ using Test @testset "FMU Manipulation" begin if Sys.iswindows() - #TODO include("manipulation.jl") + include("manipulation.jl") else @warn "The test `FMU Manipulation` is currently only availale for Windows" end @@ -28,7 +28,7 @@ using Test @testset "NeuralFMU" begin if Sys.iswindows() - #TODO include("neuralFMU.jl") + include("neuralFMU.jl") else @warn "The test `NeuralFMU` is currently only availale for Windows" end