Merge pull request #43 from ModiaSim/gh_improveTesting

Enable short and complete testing

Author: AndreaNeumayr

src/AnimationExport/exportAnimation.jl

@@ -286,7 +286,7 @@ function printVisuMaterialToJSON(obj, visuMaterial::Modia3D.Shapes.VisualMateria
 
     transparent = visuMaterial.transparency > 0
 
-    material = (; name=name, uuid=name2uuid(name), type="MeshPhongMaterial", color=((visuMaterial.color[1]*256 + visuMaterial.color[2])*256 + visuMaterial.color[3]), opacity=1-visuMaterial.transparency, transparent=transparent,
+    material = (; name=name, uuid=name2uuid(name), type="MeshPhongMaterial", color=colorNum(visuMaterial.color[1], visuMaterial.color[2], visuMaterial.color[3]), opacity=1-visuMaterial.transparency, transparent=transparent,
     shininess=visuMaterial.shininess*100, side="DoubleSide")
 
     return material

test/Basic/ShaftFreeMotionAdaptiveRotSequence.jl

@@ -33,8 +33,6 @@ requiredFinalStates = [0.0, 0.7, -7.350074420637136, 0.0, 0.1, -2.1, 0.698131700
 simulate!(shaft, stopTime=stopTime, dtmax=dtmax, log=true, logEvents=true, logStates=true, requiredFinalStates=requiredFinalStates)
 
 @usingModiaPlot
-plot(shaft, "free.rot", figure=1)
-plot(shaft, ["free.r", "free.v", "free.w"], figure=2)
-plot(shaft, "free.isrot123", figure=3)
+plot(shaft, ["free.rot", "free.isrot123", "free.w", "free.r", "free.v"], figure=1)
 
 end

test/includeTests.jl

@@ -9,39 +9,49 @@ Test.@testset "Basic" begin
     include(joinpath("Basic", "PendulumWithParameterizedDamper.jl"))
     include(joinpath("Basic", "PendulumWithSpring.jl"))
     include(joinpath("Basic", "DoublePendulumWithDampers.jl"))
-    include(joinpath("Basic", "Mobile.jl"))
     include(joinpath("Basic", "BoxPlanarMotion.jl"))
     include(joinpath("Basic", "ShaftFreeMotion.jl"))
     include(joinpath("Basic", "ShaftFreeMotionAdaptiveRotSequence.jl"))
     Test.@test_throws LoadError include(joinpath("Basic", "Object3DWithoutParentError.jl"))
+    if testsExtend >= normalTests
+        include(joinpath("Basic", "Mobile.jl"))
+    end
 end
 
 Test.@testset "Robot" begin
     include(joinpath("Robot", "ServoWithRamp.jl"))
     include(joinpath("Robot", "ServoWithRampAndPrismatic.jl"))
     include(joinpath("Robot", "ServoWithRampAndRevolute.jl"))
     include(joinpath("Robot", "ServoWithPathAndRevolute.jl"))
-    include(joinpath("Robot", "YouBotWithSphere.jl"))
-    Test.@test_skip include(joinpath("Robot", "YouBotPingPong.jl")) # too long computation time
-    include(joinpath("Robot", "YouBotGripping.jl"))
-    Test.@test_skip include(joinpath("Robot", "YouBotsGripping.jl")) # too long computation time
+    if testsExtend >= normalTests
+        include(joinpath("Robot", "YouBotWithSphere.jl"))
+        include(joinpath("Robot", "YouBotGripping.jl"))
+    end
+    if testsExtend == completeTests
+        include(joinpath("Robot", "YouBotPingPong.jl"))  # long computation time
+        include(joinpath("Robot", "YouBotsGripping.jl"))  # long computation time
+    end
 end
 
 Test.@testset "Collision" begin
     include(joinpath("Collision", "BouncingSphere.jl"))
     include(joinpath("Collision", "BouncingSphereFreeMotion.jl"))
     include(joinpath("Collision", "BouncingEllipsoid.jl"))
-    include(joinpath("Collision", "BouncingCones.jl"))
-    include(joinpath("Collision", "BouncingCapsules.jl"))
-    include(joinpath("Collision", "BouncingBeams.jl"))
     include(joinpath("Collision", "TwoCollidingBalls.jl"))
     include(joinpath("Collision", "TwoCollidingBoxes.jl"))
     include(joinpath("Collision", "CollidingCylinders.jl"))
-    include(joinpath("Collision", "CollidingSphereWithBunnies.jl"))
     include(joinpath("Collision", "NewtonsCradle.jl"))
-    include(joinpath("Collision", "Billard4Balls.jl"))
-    Test.@test_skip include(joinpath("Collision", "Billard16Balls.jl"))  # too long computation time
-    Test.@test_throws LoadError include(joinpath("Collision", "InValidCollisionPairingError.jl")) # not defined collision pair material
+    Test.@test_throws LoadError include(joinpath("Collision", "InValidCollisionPairingError.jl"))  # not defined collision pair material
+    if testsExtend >= normalTests
+        include(joinpath("Collision", "BouncingCones.jl"))
+        include(joinpath("Collision", "BouncingCapsules.jl"))
+        include(joinpath("Collision", "BouncingBeams.jl"))
+        include(joinpath("Collision", "CollidingSphereWithBunnies.jl"))
+        include(joinpath("Collision", "Billard4Balls.jl"))
+    end
+    if testsExtend == completeTests
+        include(joinpath("Collision", "Billard16Balls.jl"))  # long computation time
+    end
 end
 
 Test.@testset "Tutorial" begin
@@ -53,8 +63,10 @@ end
 
 Test.@testset "old" begin
     include(joinpath("old", "Move_Pendulum.jl"))
-    Test.@test_skip include(joinpath("old", "Plot_cor.jl"))  # direct PyPlot calls
-    Test.@test_skip include(joinpath("old", "Plot_SlidingFriction.jl"))  # direct PyPlot calls
+    if currentPlotPackage() == "PyPlot"
+        include(joinpath("old", "Plot_cor.jl"))  # direct PyPlot calls
+        include(joinpath("old", "Plot_SlidingFriction.jl"))  # direct PyPlot calls
+    end
     include(joinpath("old", "test_Shapes.jl"))
     include(joinpath("old", "Test_PathPlanning.jl"))
     include(joinpath("old", "test_Solids.jl"))

test/runtests.jl

@@ -4,7 +4,11 @@ using  ModiaLang
 import Modia3D
 import Test
 
-@time Test.@testset verbose=true "Modia3D (with SilentNoPlot)" begin
+@enum TestsExtend  shortTests normalTests completeTests
+const testsExtend = normalTests
+const title = "Modia3D (with SilentNoPlot)"
+
+@time Test.@testset verbose=true "$title" begin
     usePlotPackage("SilentNoPlot")
     Modia3D.disableRenderer()
     include("includeTests.jl")

test/runtestsComplete.jl

@@ -0,0 +1,19 @@
+module RuntestsComplete
+
+using  ModiaLang
+import Modia3D
+import Test
+
+@enum TestsExtend  shortTests normalTests completeTests
+const testsExtend = completeTests
+const title = "Complete Modia3D (with SilentNoPlot)"
+
+@time Test.@testset verbose=true "$title" begin
+    usePlotPackage("SilentNoPlot")
+    Modia3D.disableRenderer()
+    include("includeTests.jl")
+    Modia3D.reenableRenderer()
+    usePreviousPlotPackage()
+end
+
+end

test/runtestsCompleteWithGraphics.jl

@@ -0,0 +1,14 @@
+module RuntestsCompleteWithGraphics
+
+using  ModiaLang
+import Test
+
+@enum TestsExtend  shortTests normalTests completeTests
+const testsExtend = completeTests
+const title = "Complete Modia3D (with " * currentPlotPackage() * ")"
+
+@time Test.@testset verbose=true "$title" begin
+    include("includeTests.jl")
+end
+
+end

test/runtestsShort.jl

@@ -0,0 +1,19 @@
+module RuntestsShort
+
+using  ModiaLang
+import Modia3D
+import Test
+
+@enum TestsExtend  shortTests normalTests completeTests
+const testsExtend = shortTests
+const title = "Short Modia3D (with SilentNoPlot)"
+
+@time Test.@testset verbose=true "$title" begin
+    usePlotPackage("SilentNoPlot")
+    Modia3D.disableRenderer()
+    include("includeTests.jl")
+    Modia3D.reenableRenderer()
+    usePreviousPlotPackage()
+end
+
+end

test/runtestsWithGraphics.jl

@@ -3,6 +3,8 @@ module RuntestsWithGraphics
 using  ModiaLang
 import Test
 
+@enum TestsExtend  shortTests normalTests completeTests
+const testsExtend = normalTests
 const title = "Modia3D (with " * currentPlotPackage() * ")"
 
 @time Test.@testset verbose=true "$title" begin