Import fixes from kschiess

test/test_ldif.rb

@@ -11,7 +11,7 @@ class TestLdif < Test::Unit::TestCase
   TestLdifFilename = "#{File.dirname(__FILE__)}/testdata.ldif"
 
   def test_empty_ldif
-    ds = Net::LDAP::Dataset::read_ldif( StringIO.new )
+    ds = Net::LDAP::Dataset.read_ldif( StringIO.new )
     assert_equal( true, ds.empty? )
   end
 

test/test_snmp.rb

@@ -32,7 +32,7 @@ class TestSnmp < Test::Unit::TestCase
   # partially-received data streams, such as from network connections.
   def test_consume_string
       data = "xxx"
-      assert_equal( nil, data.read_ber! )
+      assert_equal( data.read_ber!, nil )
       assert_equal( "xxx", data )
 
       data = SnmpGetRequest + "!!!"