try fixing tests

Author: hexaeder

NetworkDynamicsInspector/Project.toml

@@ -28,6 +28,7 @@ ElectronExt = ["Electron"]
 Bonito = "4.0.0"
 ColorSchemes = "3.29.0"
 Colors = "0.13.0"
+Electron = "6"
 GraphMakie = "0.5.14"
 Graphs = "1.12.0"
 NetworkDynamics = "0.9.13"

NetworkDynamicsInspector/src/NetworkDynamicsInspector.jl

@@ -9,7 +9,7 @@ using NetworkDynamics: NetworkDynamics, SII, EIndex, VIndex, Network,
 using Graphs: nv, ne
 using WGLMakie: WGLMakie
 using WGLMakie.Makie: Makie, @lift, MouseEvent, Point2f, with_theme,
-                      Cycle, lines!, vlines!, Theme, Figure, Colorbar, Axis,
+                      lines!, vlines!, Theme, Figure, Colorbar, Axis,
                       xlims!, ylims!, autolimits!, hidespines!, hidedecorations!,
                       register_interaction!, MouseEventTypes, Consume, events,
                       mouseposition

NetworkDynamicsInspector/src/serving.jl

@@ -44,7 +44,7 @@ function serve_app(s::ServerDisp, app)
     served_app = get(SERVER_STATE, :app, nothing)
 
     if served_app !== app
-        close_display(server)
+        close_display(s)
     end
 
     new_server = false

NetworkDynamicsInspector/test/Project.toml

@@ -21,7 +21,7 @@ NetworkDynamicsInspector = {path = ".."}
 [compat]
 Aqua = "0.8.9"
 Bonito = "≥0.0.1"
-Electron = "6"
+Electron = "≥0.0.1"
 ExplicitImports = "1.10.1"
 Graphs = "≥0.0.1"
 NetworkDynamics = "≥0.0.1"

NetworkDynamicsInspector/test/multiselect_test.jl

@@ -5,7 +5,10 @@ using NetworkDynamicsInspector: OptionGroup, TomSelect
 using NetworkDynamicsInspector: NetworkDynamicsInspector as NDI
 
 function electron(app)
-    close.(Electron.applications())
+    try
+        close.(Electron.applications())
+    catch
+    end
     disp = Bonito.use_electron_display(devtools = true)
     display(disp, app)
 end

NetworkDynamicsInspector/test/runtests.jl

@@ -75,7 +75,7 @@ end
 
     @testset "Test simple app creation and add + remove of timeseries" begin
         sol = get_sol()
-        inspect(sol; restart=true, reset=true, electron=true)
+        inspect(sol; restart=true, reset=true, display=ElectronDisp())
 
         delete!(NDI.APPSTATE[].tsplots[], "ts-1")
         notify(NDI.APPSTATE[].tsplots)
@@ -100,15 +100,15 @@ end
         notify(NDI.APPSTATE[].tsplots) # should update
     end
 
-    @testest "Test different display types" begin
+    @testset "Test different display types" begin
         sol1 = get_sol()
         sol2 = get_sol(; limit = 1.2)
 
         inspect(sol1; display=BrowserDisp(), restart=true, reset=true)
         # change observable
         empty!(NDI.APPSTATE[].tsplots[]); notify(NDI.APPSTATE[].tsplots)
         NDI.APPSTATE[].tsplots[]["ts-1"] = NDI.TimeseriesPlot(selcomp=[EIndex(i) for i in 1:7], states=[:P])
-        notify(NDI.APPSTATE[].tsplots)
+        # notify(NDI.APPSTATE[].tsplots) # does not work wihtout display
         inspect(sol2) # this should update the plot
         inspect(sol2, reset=true)
 
@@ -121,11 +121,11 @@ end
         inspect(sol2) # this should update the plot
 
         # switch to server
-        inspect(sol1; display=ServerDisp())
+        inspect(sol1; display=ServerDisp(), restart=true)
         @test NDI.BROWSER_STATE[:handler] == nothing
         empty!(NDI.APPSTATE[].tsplots[]); notify(NDI.APPSTATE[].tsplots)
         NDI.APPSTATE[].tsplots[]["ts-1"] = NDI.TimeseriesPlot(selcomp=[EIndex(i) for i in 1:7], states=[:P])
-        notify(NDI.APPSTATE[].tsplots)
+        # notify(NDI.APPSTATE[].tsplots) # does not work without session open
         inspect(sol2) # this should update the plot
     end
 
@@ -134,4 +134,3 @@ end
         @safetestset "Slider Tests" begin include("slider_test.jl") end
     end
 end
-

NetworkDynamicsInspector/test/slider_test.jl

@@ -4,7 +4,10 @@ using NetworkDynamicsInspector
 using NetworkDynamicsInspector: ContinuousSlider, RoundedLabel
 
 function electron(app)
-    close.(Electron.applications())
+    try
+        close.(Electron.applications())
+    catch
+    end
     disp = Bonito.use_electron_display(devtools = true)
     display(disp, app)
 end