Switch to assert from assert_predicate

Author: mtodd

test/ber/test_ber.rb

@@ -103,23 +103,23 @@ def test_binary_data
     data = ["6a31b4a12aa27a41aca9603f27dd5116"].pack("H*").force_encoding("ASCII-8BIT")
     bis = Net::BER::BerIdentifiedString.new(data)
 
-    assert_predicate bis, :valid_encoding?
+    assert bis.valid_encoding?, "should be a valid encoding"
     assert_equal "ASCII-8BIT", bis.encoding.name
   end
 
   def test_ascii_data_in_utf8
     data = "some text".force_encoding("UTF-8")
     bis = Net::BER::BerIdentifiedString.new(data)
 
-    assert_predicate bis, :valid_encoding?
+    assert bis.valid_encoding?, "should be a valid encoding"
     assert_equal "UTF-8", bis.encoding.name
   end
 
   def test_ut8_data_in_utf8
     data = ["e4b8ad"].pack("H*").force_encoding("UTF-8")
     bis = Net::BER::BerIdentifiedString.new(data)
 
-    assert_predicate bis, :valid_encoding?
+    assert bis.valid_encoding?, "should be a valid encoding"
     assert_equal "UTF-8", bis.encoding.name
   end
 end

test/test_ldap_connection.rb

@@ -59,7 +59,7 @@ def test_error_failed_operation
     @tcp_socket.should_receive(:read_ber).and_return([2, ber])
 
     result = @connection.modify(:dn => "1", :operations => [[:replace, "mail", "something@sothsdkf.com"]])
-    assert_predicate result, :failure?
+    assert result.failure?, "should be failure"
     assert_equal "The provided password value was rejected by a password validator:  The provided password did not contain enough characters from the character set 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.  The minimum number of characters from that set that must be present in user passwords is 1", result.error_message
   end
 
@@ -69,7 +69,7 @@ def test_no_error_on_success
     @tcp_socket.should_receive(:read_ber).and_return([2, ber])
 
     result = @connection.modify(:dn => "1", :operations => [[:replace, "mail", "something@sothsdkf.com"]])
-    assert_predicate result, :success?
+    assert result.success?, "should be success"
     assert_equal "", result.error_message
   end
 end
@@ -96,7 +96,7 @@ def test_write_net_ldap_connection_event
     events = @service.subscribe "write.net_ldap_connection"
 
     result = @connection.bind(method: :anon)
-    assert_predicate result, :success?
+    assert result.success?, "should be success"
 
     # a write event
     payload, result = events.pop
@@ -113,7 +113,7 @@ def test_read_net_ldap_connection_event
     events = @service.subscribe "read.net_ldap_connection"
 
     result = @connection.bind(method: :anon)
-    assert_predicate result, :success?
+    assert result.success?, "should be success"
 
     # a read event
     payload, result = events.pop
@@ -130,12 +130,12 @@ def test_bind_net_ldap_connection_event
     events = @service.subscribe "bind.net_ldap_connection"
 
     result = @connection.bind(method: :anon)
-    assert_predicate result, :success?
+    assert result.success?, "should be success"
 
     # a read event
     payload, result = events.pop
     assert payload.has_key?(:result)
-    assert_predicate result, :success?
+    assert result.success?, "should be success"
   end
 
   def test_search_net_ldap_connection_event
@@ -156,7 +156,7 @@ def test_search_net_ldap_connection_event
     events = @service.subscribe "search.net_ldap_connection"
 
     result = @connection.search(filter: "(uid=user1)")
-    assert_predicate result, :success?
+    assert result.success?, "should be success"
 
     # a search event
     payload, result = events.pop