From f15db67993d9ea3f85fbabb60c8746d4d4b5f434 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Thu, 22 Nov 2012 00:00:36 +0000
Subject:   Renamed

---
 lib/custodian/protocoltest.rb | 87 -------------------------------------------
 lib/custodian/testfactory.rb  | 87 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 87 deletions(-)
 delete mode 100644 lib/custodian/protocoltest.rb
 create mode 100644 lib/custodian/testfactory.rb

(limited to 'lib/custodian')

diff --git a/lib/custodian/protocoltest.rb b/lib/custodian/protocoltest.rb
deleted file mode 100644
index 7c631c8..0000000
--- a/lib/custodian/protocoltest.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'json'
-
-
-#
-#
-# Base class for custodian protocol-tests
-#
-# Each subclass will register themselves, via the call
-# to 'register_test_type'.
-#
-# This class is a factory that will return the correct
-# derived class for a given line from our configuration
-# file - or that line encoded as a JSON string.
-#
-#
-class ProtocolTest
-
-
-  #
-  # The subclasses we have.
-  #
-  @@subclasses = { }
-
-
-  #
-  # Create a test-type object given a line of text from our parser.
-  #
-  # The line will be like "target must run tcp|ssh|ftp|smtp .."
-  #
-  #
-  def self.create( line )
-
-    #
-    # JSON ?
-    #
-    if ( line =~ /^\{(.*)\}$/ )
-      begin
-        obj = JSON.parse( line );
-        raise ArgumentError, "JSON object was not a hash" unless obj.kind_of?(Hash)
-        line = obj["line"]
-        raise ArgumentError, "obj[:line] was nil" unless (!line.nil?)
-      rescue =>ex
-        raise ArgumentError, "Line did not deserialize from JSON: #{line} - #{ex}"
-      end
-    end
-
-
-    #
-    # If this is an obvious protocol test.
-    #
-    if ( line =~ /must\s+run\s+(\S+)(\s+|\.|$)/ )
-      test_type = $1.dup
-      test_type.chomp!( "." )
-
-      c = @@subclasses[test_type]
-      if c
-        c.new( line )
-      else
-        raise ArgumentError, "Bad test type: #{test_type}"
-      end
-    else
-      raise "Unknown line given - Failed to instantiate a suitable protocol-test."
-    end
-  end
-
-
-  #
-  # Register a new test type - this must be called by our derived classes
-  #
-  def self.register_test_type name
-    @@subclasses[name] = self
-  end
-
-
-  #
-  # Return an array of test-types we know about
-  #
-  # i.e. Derived classes that have registered themselves.
-  #
-  #
-  def types
-    @@subclasses
-  end
-
-
-end
-
diff --git a/lib/custodian/testfactory.rb b/lib/custodian/testfactory.rb
new file mode 100644
index 0000000..c736ac1
--- /dev/null
+++ b/lib/custodian/testfactory.rb
@@ -0,0 +1,87 @@
+require 'json'
+
+
+#
+#
+# Base class for custodian protocol-tests
+#
+# Each subclass will register themselves, via the call
+# to 'register_test_type'.
+#
+# This class is a factory that will return the correct
+# derived class for a given line from our configuration
+# file - or that line encoded as a JSON string.
+#
+#
+class TestFactory
+
+
+  #
+  # The subclasses we have.
+  #
+  @@subclasses = { }
+
+
+  #
+  # Create a test-type object given a line of text from our parser.
+  #
+  # The line will be like "target must run tcp|ssh|ftp|smtp .."
+  #
+  #
+  def self.create( line )
+
+    #
+    # JSON ?
+    #
+    if ( line =~ /^\{(.*)\}$/ )
+      begin
+        obj = JSON.parse( line );
+        raise ArgumentError, "JSON object was not a hash" unless obj.kind_of?(Hash)
+        line = obj["line"]
+        raise ArgumentError, "obj[:line] was nil" unless (!line.nil?)
+      rescue =>ex
+        raise ArgumentError, "Line did not deserialize from JSON: #{line} - #{ex}"
+      end
+    end
+
+
+    #
+    # If this is an obvious protocol test.
+    #
+    if ( line =~ /must\s+run\s+(\S+)(\s+|\.|$)/ )
+      test_type = $1.dup
+      test_type.chomp!( "." )
+
+      c = @@subclasses[test_type]
+      if c
+        c.new( line )
+      else
+        raise ArgumentError, "Bad test type: #{test_type}"
+      end
+    else
+      raise "Unknown line given - Failed to instantiate a suitable protocol-test."
+    end
+  end
+
+
+  #
+  # Register a new test type - this must be called by our derived classes
+  #
+  def self.register_test_type name
+    @@subclasses[name] = self
+  end
+
+
+  #
+  # Return an array of test-types we know about
+  #
+  # i.e. Derived classes that have registered themselves.
+  #
+  #
+  def types
+    @@subclasses
+  end
+
+
+end
+
-- 
cgit v1.2.1