From 88369e0204feda720b24af76d3b58955ca7b92cb Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Tue, 13 Nov 2012 14:56:52 +0000
Subject:   Ensure we have a port + URL in the construcotr.

---
 worker/tests/http.rb  | 31 +++++++++++++++++++------------
 worker/tests/https.rb | 31 +++++++++++++++++++------------
 2 files changed, 38 insertions(+), 24 deletions(-)

(limited to 'worker/tests')

diff --git a/worker/tests/http.rb b/worker/tests/http.rb
index 5ad69cd..3796412 100755
--- a/worker/tests/http.rb
+++ b/worker/tests/http.rb
@@ -26,6 +26,25 @@ class HTTPTest
   #
   def initialize( data )
     @test_data = data
+    @error = nil
+
+    #
+    # Ensure we have an URL
+    #
+    if ( @test_data["target_host"].nil? )
+      @error = "Missing URL for the test."
+      raise ArgumentError, @error
+    end
+
+    #
+    # Ensure we have a port
+    #
+    if ( @test_data["test_port"].nil? )
+      @error = "Missing port for the test."
+      raise ArgumentError, @error
+
+    end
+
   end
 
 
@@ -40,18 +59,6 @@ class HTTPTest
   #
   def run_test
 
-    @error = ""
-
-
-    #
-    # Ensure we had a URL
-    #
-    if ( @test_data["target_host"].nil? )
-      @error = "Missing URL for the test"
-      return false
-    end
-
-
     #
     #  Do the fetch, if this success then we'll have the
     # @status + @text setup
diff --git a/worker/tests/https.rb b/worker/tests/https.rb
index fcc716b..55a423b 100755
--- a/worker/tests/https.rb
+++ b/worker/tests/https.rb
@@ -26,6 +26,25 @@ class HTTPSTest
   #
   def initialize( data )
     @test_data = data
+    @error = nil
+
+    #
+    # Ensure we have an URL
+    #
+    if ( @test_data["target_host"].nil? )
+      @error = "Missing URL for the test."
+      raise ArgumentError, @error
+    end
+
+    #
+    # Ensure we have a port
+    #
+    if ( @test_data["test_port"].nil? )
+      @error = "Missing port for the test."
+      raise ArgumentError, @error
+
+    end
+
   end
 
 
@@ -40,18 +59,6 @@ class HTTPSTest
   #
   def run_test
 
-    @error = ""
-
-
-    #
-    # Ensure we had a URL
-    #
-    if ( @test_data["target_host"].nil? )
-      @error = "Missing URL for the test"
-      return false
-    end
-
-
     #
     #  Do the fetch, if this success then we'll have the
     # @status + @text setup
-- 
cgit v1.2.1