Merge pull request #38 from SCIP-Interfaces/rs/rm_factcheck

Remove FactCheck dependency

Author: rschwarz

src/SCIP.jl

@@ -27,7 +27,7 @@ function __init__()
     csip_installed = CSIPversion()
     if csip_installed != csip_required
         depsdir = realpath(joinpath(dirname(@__FILE__),"..","deps"))
-        error("Current CSIP version installed is $(csip_installed), but we require $(csip_required). On Linux, delete the contents of the `$depsdir` directory except for `build.jl`, then rerun Pkg.build(\"SCIP\").")
+        error("Current CSIP version installed is $(csip_installed), but we require $(csip_required). On Linux, delete the contents of the `$depsdir` directory except for `build.jl` and `csip_version.jl`, then rerun Pkg.build(\"SCIP\").")
     end
 end
 

test/REQUIRE

@@ -1,3 +1,2 @@
 JuMP 0.16
 GLPKMathProgInterface
-FactCheck

test/mixintprog.jl

@@ -1,9 +1,9 @@
-facts("solving MIP with mixintprog") do
+@testset "solving MIP with mixintprog" begin
     solver = SCIPSolver("display/verblevel", 0)
 
     # integer knapsack problem
     sol = mixintprog(-[5,3,2,7,4],Float64[2 8 4 2 5],'<',10,:Int,0,1,solver)
-    @fact sol.status --> :Optimal
-    @fact sol.objval --> roughly(-16.0)
-    @fact sol.sol --> roughly([1.0, 0.0, 0.0, 1.0, 1.0])
+    @test sol.status == :Optimal
+    @test sol.objval ≈ -16.0
+    @test sol.sol ≈ [1.0, 0.0, 0.0, 1.0, 1.0]
 end

test/more_tests.jl

@@ -1,5 +1,5 @@
 # todo: find a meaningful name for this file
-facts("testing more mpb interface methods") do
+@testset "testing more mpb interface methods" begin
     m = MathProgBase.LinearQuadraticModel(SCIPSolver("display/verblevel", 0))
 
     # take a bit more time integer problem
@@ -10,12 +10,12 @@ facts("testing more mpb interface methods") do
     lb = [40600 -92375]
     ub = lb
     MathProgBase.loadproblem!(m, A, l, u, c, lb, ub, :Min)
-    @fact MathProgBase.numconstr(m) --> 2
-    @fact MathProgBase.numvar(m) --> 3
+    @test MathProgBase.numconstr(m) == 2
+    @test MathProgBase.numvar(m) == 3
 
     MathProgBase.setvartype!(m, [:Int, :Int, :Int])
     MathProgBase.optimize!(m)
-    @fact MathProgBase.status(m) --> :Optimal
-    @fact MathProgBase.getsolvetime(m) --> greater_than(0.001)
-    @fact MathProgBase.getsolution(m) --> roughly([750, -200, -25])
+    @test MathProgBase.status(m) == :Optimal
+    @test MathProgBase.getsolvetime(m) >= 0.001
+    @test MathProgBase.getsolution(m) ≈ [750, -200, -25]
 end

test/runtests.jl

@@ -1,6 +1,6 @@
+using Base.Test
 using SCIP
 using MathProgBase
-using FactCheck
 
 include("more_tests.jl")
 include("mixintprog.jl")
@@ -45,6 +45,3 @@ include(joinpath(Pkg.dir("JuMP"),"test","qcqpmodel.jl"))
 include(joinpath(Pkg.dir("JuMP"),"test","callback.jl"))
 include(joinpath(Pkg.dir("JuMP"),"test","nonlinear.jl"))
 #include(joinpath(Pkg.dir("JuMP"),"test","sdp.jl"))
-
-# return proper code (e.g. for TravisCI)
-FactCheck.exitstatus()