Update test data

juliohm · May 7, 2019 · 2e900b8 · 2e900b8 · juliohm · May 7, 2019
1 parent 041fb51
commit 2e900b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/test/data/CondSimSol.png b/test/data/CondSimSol.png
diff --git a/test/data/UncondSimSol.png b/test/data/UncondSimSol.png
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -2,19 +2,19 @@ using GeoStatsBase
 using GeoStatsDevTools
 using Variography
 using DirectGaussianSimulation
-using Plots; gr()
+using Plots; gr(size=(1000,400))
 using VisualRegressionTests
 using Test, Pkg, Random
 
-# list of maintainers
-maintainers = ["juliohm"]
+# workaround GR warnings
+ENV["GKSwstype"] = "100"
 
 # environment settings
+islinux = Sys.islinux()
 istravis = "TRAVIS" ∈ keys(ENV)
-ismaintainer = "USER" ∈ keys(ENV) && ENV["USER"] ∈ maintainers
 datadir = joinpath(@__DIR__,"data")
-
-if ismaintainer
+visualtests = !istravis || (istravis && islinux)
+if !istravis
   Pkg.add("Gtk")
   using Gtk
 end
@@ -25,39 +25,25 @@ end
 
   @testset "Conditional simulation" begin
     problem = SimulationProblem(geodata, domain, :z, 2)
-
-    Random.seed!(2018)
     solver = DirectGaussSim(:z => (variogram=SphericalVariogram(range=10.),))
 
+    Random.seed!(2018)
     solution = solve(problem, solver)
 
-    if ismaintainer || istravis
-      function plot_cond_solution(fname)
-        plot(solution, size=(1000,400))
-        png(fname)
-      end
-      refimg = joinpath(datadir,"CondSimSol.png")
-
-      @test test_images(VisualTest(plot_cond_solution, refimg), popup=!istravis, tol=0.1) |> success
+    if visualtests
+      @plottest plot(solution) joinpath(datadir,"CondSimSol.png") !istravis
     end
   end
 
   @testset "Unconditional simulation" begin
     problem = SimulationProblem(domain, :z => Float64, 2)
-
-    Random.seed!(2018)
     solver = DirectGaussSim(:z => (variogram=SphericalVariogram(range=10.),))
 
+    Random.seed!(2018)
     solution = solve(problem, solver)
 
-    if ismaintainer || istravis
-      function plot_uncond_solution(fname)
-        plot(solution, size=(1000,400))
-        png(fname)
-      end
-      refimg = joinpath(datadir,"UncondSimSol.png")
-
-      @test test_images(VisualTest(plot_uncond_solution, refimg), popup=!istravis, tol=0.1) |> success
+    if visualtests
+      @plottest plot(solution) joinpath(datadir,"UncondSimSol.png") !istravis
     end
   end
 end