From f150b7ea0951fc92c4f92b7ef890c7ee305cc82c Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Tue, 17 Feb 2015 20:50:38 +0000
Subject: Updated for new test-type API.

Now that the class-factory returns an Array, we've updated the
test-cases to continue to pass.
---
 t/test-http-vs-https.rb | 8 ++++++--
 t/test-ldap-probe.rb    | 9 +++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 't')

diff --git a/t/test-http-vs-https.rb b/t/test-http-vs-https.rb
index 8ad5aea..b320777 100755
--- a/t/test-http-vs-https.rb
+++ b/t/test-http-vs-https.rb
@@ -46,7 +46,9 @@ class TestTestName < Test::Unit::TestCase
     end
 
     assert( test )
-    assert_equal( test.get_type, "http" )
+    assert( test.kind_of? Array )
+    assert( ! test.empty? )
+    assert_equal( test[0].get_type, "http" )
   end
 
 
@@ -61,7 +63,9 @@ class TestTestName < Test::Unit::TestCase
     end
 
     assert( test )
-    assert_equal( test.get_type, "https" )
+    assert( test.kind_of? Array )
+    assert( ! test.empty? )
+    assert_equal( test[0].get_type, "https" )
   end
 
 
diff --git a/t/test-ldap-probe.rb b/t/test-ldap-probe.rb
index 4e552b4..9d6b6f0 100755
--- a/t/test-ldap-probe.rb
+++ b/t/test-ldap-probe.rb
@@ -32,8 +32,9 @@ class TestLDAPProbe < Test::Unit::TestCase
      test = Custodian::TestFactory.create( "auth.bytemark.co.uk must run ldap on 389 with username 'testing' with password 'bob' otherwise 'LDAP dead?'." )
     end
 
-    assert( test )
-    assert_equal( test.get_type, "ldap" )
+    assert( test.kind_of? Array )
+    assert( ! test.empty? )
+    assert_equal( test[0].get_type, "ldap" )
   end
 
 
@@ -57,6 +58,10 @@ class TestLDAPProbe < Test::Unit::TestCase
     data.each do |str|
       assert_raise ArgumentError do
         test = Custodian::TestFactory.create( str )
+
+        assert( test.kind_of? Array )
+        assert( ! test.empty? )
+
       end
     end
   end
-- 
cgit v1.2.1