From 84d92bba1a58f0bb65cfe073f0e12537c02601ad Mon Sep 17 00:00:00 2001 From: Wade Alcorn Date: Thu, 12 Jan 2012 14:24:38 +1000 Subject: [PATCH] Added teardown clean up code --- .../handlers/dynamicreconstruction.rb | 35 ++++++++++--------- test/unit/core/tc_api.rb | 6 +++- test/unit/core/tc_core.rb | 7 +++- test/unit/core/tc_loader.rb | 6 +++- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/test/unit/core/main/network_stack/handlers/dynamicreconstruction.rb b/test/unit/core/main/network_stack/handlers/dynamicreconstruction.rb index 280554cf9..7c42b1e29 100644 --- a/test/unit/core/main/network_stack/handlers/dynamicreconstruction.rb +++ b/test/unit/core/main/network_stack/handlers/dynamicreconstruction.rb @@ -18,15 +18,15 @@ require 'rubygems' require 'curb' class TC_DynamicReconstruction < Test::Unit::TestCase - + @@port = 20000 + rand(10000) - + def setup $root_dir="../../" $:.unshift File.join( %w{ ../../ } ) require 'core/loader' require 'core/main/network_stack/handlers/dynamicreconstruction.rb' - + @@port += 1 # cycle through ports because the tcp teardown process is too slow @port = @@port @@ -45,9 +45,10 @@ class TC_DynamicReconstruction < Test::Unit::TestCase @server.start! end end - + def teardown Process.kill("INT",@pid) + $root_dir = nil end # the server doesn't offer a mutex or callback @@ -66,46 +67,46 @@ class TC_DynamicReconstruction < Test::Unit::TestCase def test_delete wait_for_server response = Curl::Easy.http_delete("http://127.0.0.1:" + @port.to_s + "/test") - assert_equal 404, response.response_code + assert_equal 404, response.response_code end - + def test_put wait_for_server response = Curl::Easy.http_put("http://127.0.0.1:" + @port.to_s + "/test", nil) - assert_equal 404, response.response_code + assert_equal 404, response.response_code end - + def test_head wait_for_server response = Curl::Easy.http_head("http://127.0.0.1:" + @port.to_s + "/test") - assert_equal 404, response.response_code + assert_equal 404, response.response_code end - + def test_no_params wait_for_server response = Curl::Easy.http_get("http://127.0.0.1:" + @port.to_s + "/test") assert_equal 404, response.response_code end - + def test_zero_values wait_for_server response = Curl::Easy.http_get("http://127.0.0.1:" + @port.to_s + "/test?bh=0&sid=0&pid=0&pc=0&d=0") assert_equal 200, response.response_code assert_equal "", response.body_str - end - + end + def test_one_values wait_for_server response = Curl::Easy.http_get("http://127.0.0.1:" + @port.to_s + "/test?bh=1&sid=1&pid=1&pc=1&d=1") assert_equal 200, response.response_code assert_equal "", response.body_str - end - + end + def test_neg_one_values wait_for_server response = Curl::Easy.http_get("http://127.0.0.1:" + @port.to_s + "/test?bh=-1&sid=-1&pid=-1&pc=-1&d=-1") assert_equal 200, response.response_code assert_equal "", response.body_str - end - + end + end diff --git a/test/unit/core/tc_api.rb b/test/unit/core/tc_api.rb index 325f63a2b..e77d40e9a 100644 --- a/test/unit/core/tc_api.rb +++ b/test/unit/core/tc_api.rb @@ -18,10 +18,14 @@ require 'test/unit' class TC_Api < Test::Unit::TestCase def setup - $root_dir="../../" + $root_dir = "../../" $:.unshift File.join( %w{ ../../ } ) end + def teardown + $root_dir = nil + end + # # Test the api is functional # diff --git a/test/unit/core/tc_core.rb b/test/unit/core/tc_core.rb index dd5b9e6ba..a41910286 100644 --- a/test/unit/core/tc_core.rb +++ b/test/unit/core/tc_core.rb @@ -18,10 +18,14 @@ require 'test/unit' class TC_Core < Test::Unit::TestCase def setup - $root_dir="../../" + $root_dir = "../../" $:.unshift File.join( %w{ ../../ } ) end + def teardown + $root_dir = nil + end + # # Test the core is functional # @@ -32,3 +36,4 @@ class TC_Core < Test::Unit::TestCase end end + diff --git a/test/unit/core/tc_loader.rb b/test/unit/core/tc_loader.rb index 6aef5ad3f..7d19f40d0 100644 --- a/test/unit/core/tc_loader.rb +++ b/test/unit/core/tc_loader.rb @@ -18,10 +18,14 @@ require 'test/unit' class TC_Loader < Test::Unit::TestCase def setup - $root_dir="../../" + $root_dir = "../../" $:.unshift File.join( %w{ ../../ } ) end + def teardown + $root_dir = nil + end + # # Test the loader is functional #