From 01d6543209edb17eb3c1045dcb3ef39d39231da5 Mon Sep 17 00:00:00 2001 From: Tero Frondelius Date: Mon, 22 Jun 2015 22:57:22 +0300 Subject: [PATCH] Small fix to runtests.jl --- test/runtests.jl | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 9d42e85..69ab876 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -18,39 +18,6 @@ facts("Testing if somebody used print, println(), @sprint in src directory") do end close(fil) end - @fact lines_with_print => isempty + @fact lines_with_print => isempty "Instead of println() use Logging.jl package" end -<<<<<<< HEAD -======= -test_add_element() - - -function test_get_element() - m = new_model() - nodes = Dict(1 => [0.0, 0.0, 0.0], - 2 => [1.0, 0.0, 0.0], - 3 => [0.0, 1.0, 0.0], - 4 => [0.0, 0.0, 1.0]) - add_nodes(m, nodes) - el1 = Dict("element_type" => 0x6, "node_ids" => [1, 2, 3, 4]) - el2 = Dict("element_type" => 0x6, "node_ids" => [4, 3, 2, 1]) - elements = Dict(1 => el1, 2 => el2) - #println(elements) - add_elements(m, elements) - #println(m) - # get elements by element id - els = get_elements(m, [1]) - #println(els) - @test length(els) == 1 - @test 1 in keys(els) - @test els[1]["element_type"] == 0x6 - @test els[1]["node_ids"] == [1, 2, 3, 4] -end -test_get_element() - - - -include("test_xdmf.jl") -include("solver_tests/test_elasticity_solver.jl") ->>>>>>> 5aa575c722abcc33326d38fbadc860fc75448a87