snmp 1.1.1 → 1.2.0

data/lib/snmp/varbind.rb

@@ -1,10 +1,23 @@
 #
-# Copyright (c) 2004 David R. Halliday
-# All rights reserved.
+# Copyright (c) 2004-2014 David R. Halliday
 #
-# This SNMP library is free software.  Redistribution is permitted under the
-# same terms and conditions as the standard Ruby distribution.  See the
-# COPYING file in the Ruby distribution for details.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
 
 require 'snmp/ber'
@@ -109,8 +122,8 @@ module SNMP
   class Integer32 < Integer
     def initialize(value)
       super(value)
-      raise ArgumentError, "Out of range: #{value}" if value < -2147483648
-      raise ArgumentError, "Out of range: #{value}" if value > 2147483647
+      raise ArgumentError, "Out of range: #{@value}" if @value < -2147483648
+      raise ArgumentError, "Out of range: #{@value}" if @value > 2147483647
     end
   end
 
@@ -336,8 +349,8 @@ module SNMP
   class UnsignedInteger < Integer
     def initialize(value)
       super(value)
-      raise ArgumentError, "Negative integer invalid: #{value}" if value < 0
-      raise ArgumentError, "Out of range: #{value}" if value > 4294967295
+      raise ArgumentError, "Negative integer invalid: #{@value}" if @value < 0
+      raise ArgumentError, "Out of range: #{@value}" if @value > 4294967295
     end
 
     def self.decode(value_data)
@@ -428,8 +441,8 @@ module SNMP
 
     def initialize(value)
       super(value)
-      raise ArgumentError, "Negative integer invalid: #{value}" if value < 0
-      raise ArgumentError, "Out of range: #{value}" if value > 18446744073709551615
+      raise ArgumentError, "Negative integer invalid: #{@value}" if @value < 0
+      raise ArgumentError, "Out of range: #{@value}" if @value > 18446744073709551615
     end
 
     def encode

data/lib/snmp/version.rb

@@ -1,3 +1,3 @@
 module SNMP
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/test/test_ber.rb

@@ -1,10 +1,10 @@
 # encoding: ascii-8bit
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'snmp/varbind'
 require 'snmp/ber'
 
-class ASN1_Test < Test::Unit::TestCase
+class ASN1_Test < MiniTest::Unit::TestCase
 
   include SNMP::BER
 
@@ -56,20 +56,20 @@ class ASN1_Test < Test::Unit::TestCase
 
   # Check invalid length - ASN.1 says that first length octet can't be 255.
   def test_bad_length
-    assert_raise(InvalidLength) {
+    assert_raises(InvalidLength) {
       decode_tlv("\001\377\001")
     }
   end
 
   # Check if input data is too short
   def test_out_of_data
-    assert_raise(OutOfData) {
+    assert_raises(OutOfData) {
       decode_tlv("\001\001")
     }
-    assert_raise(OutOfData) {
+    assert_raises(OutOfData) {
       decode_tlv("\001")
     }
-    assert_raise(OutOfData) {
+    assert_raises(OutOfData) {
       decode_tlv("")
     }
   end
@@ -103,7 +103,7 @@ class ASN1_Test < Test::Unit::TestCase
     assert_equal(255, i)
     assert_equal("", data)
 
-    assert_raise(InvalidTag) {
+    assert_raises(InvalidTag) {
       decode_integer("\001\004\001\002\003\004")
     }
   end
@@ -113,7 +113,7 @@ class ASN1_Test < Test::Unit::TestCase
     assert_equal(16909060, i)
     assert_equal("", data)
 
-    assert_raise(InvalidTag) {
+    assert_raises(InvalidTag) {
       decode_timeticks("\002\004\001\002\003\004")
     }
   end
@@ -122,7 +122,7 @@ class ASN1_Test < Test::Unit::TestCase
   def test_decode_octet_string
     s, _ = decode_octet_string("\004\202\000\005hello")
     assert_equal("hello",s)
-    assert_raise(InvalidTag) {
+    assert_raises(InvalidTag) {
       decode_octet_string("\005\202\000\005hello")
     }
   end
@@ -130,10 +130,10 @@ class ASN1_Test < Test::Unit::TestCase
   def test_decode_ip_address
     ip, _ = decode_ip_address("@\004\001\002\003\004")
     assert_equal(ip, "\001\002\003\004")
-    assert_raise(InvalidTag) {
+    assert_raises(InvalidTag) {
       decode_ip_address("\004\004\001\002\003\004")
     }
-    assert_raise(InvalidLength) {
+    assert_raises(InvalidLength) {
       decode_ip_address("@\005\001\002\003\004\005")
     }
   end
@@ -148,7 +148,7 @@ class ASN1_Test < Test::Unit::TestCase
     assert_equal("\002\001\077", seq)
     assert_equal("\002\001\001", data)
 
-    assert_raise(InvalidTag) {
+    assert_raises(InvalidTag) {
       decode_sequence("\061\003\002\001\077")
     }
   end
@@ -180,7 +180,7 @@ class ASN1_Test < Test::Unit::TestCase
     assert_equal([0,0], object_id);
     assert_equal("", remainder)
 
-    assert_raise(InvalidTag) do
+    assert_raises(InvalidTag) do
       decode_object_id("\007\001+")
     end
   end
@@ -191,7 +191,7 @@ class ASN1_Test < Test::Unit::TestCase
     assert_equal("\177", encode_length(127))
     assert_equal("\201\200", encode_length(128))
     assert_equal("\202\002\001", encode_length(513))
-    assert_raise(InvalidLength) { encode_length(-1) }
+    assert_raises(InvalidLength) { encode_length(-1) }
   end
 
   def test_encode_integer
@@ -232,8 +232,8 @@ class ASN1_Test < Test::Unit::TestCase
     assert_equal("\006\002+\006", encode_object_id([1,3,6]))
     assert_equal("\006\003+\202\001", encode_object_id([1,3,257]))
     assert_equal("\006\003" << 82.chr << "\202\001", encode_object_id([2,2,257]))
-    assert_raise(InvalidObjectId) { encode_object_id([3,2,257]) }
-    assert_raise(InvalidObjectId) { encode_object_id([]) }
+    assert_raises(InvalidObjectId) { encode_object_id([3,2,257]) }
+    assert_raises(InvalidObjectId) { encode_object_id([]) }
 
     assert_equal("\006\a+\203\377\177\203\377\177",
                  encode_object_id(SNMP::ObjectId.new("1.3.65535.65535")))

data/test/test_manager.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'snmp/manager'
 
 class EchoTransport
@@ -17,7 +17,7 @@ class EchoTransport
   end
 end
 
-class TestConfig < Test::Unit::TestCase
+class TestConfig < MiniTest::Unit::TestCase
 
   include SNMP
 
@@ -37,7 +37,7 @@ class TestConfig < Test::Unit::TestCase
   end
 
   def test_invalid_option
-    assert_raise(RuntimeError) { Manager::Config.new(:fly_to_the_moon => true) }
+    assert_raises(RuntimeError) { Manager::Config.new(:fly_to_the_moon => true) }
   end
 
   def test_ipv6_address_guessing
@@ -56,7 +56,7 @@ class TestConfig < Test::Unit::TestCase
   end
 end
 
-class TestManager < Test::Unit::TestCase
+class TestManager < MiniTest::Unit::TestCase
 
   include SNMP
 
@@ -103,6 +103,10 @@ class TestManager < Test::Unit::TestCase
     assert_equal(ObjectId.new("1.2.3.4.5"), response.varbind_list[1].name)
   end
 
+  def test_get_with_nil
+    assert_raises(ArgumentError) { @manager.get(nil) }
+  end
+
   def test_get_value
     value = @manager.get_value("1.2.3.4")
     assert_equal(Null, value)
@@ -124,6 +128,10 @@ class TestManager < Test::Unit::TestCase
     assert_equal(ObjectId.new("1.2.3.4.5"), response.varbind_list[1].name)
   end
 
+  def test_get_next_with_nil
+    assert_raises(ArgumentError) { @manager.get_next(nil) }
+  end
+
   def test_set
     v0 = VarBind.new("1.3.6.1.3.1.1.1.0", OctetString.new("Hello1"))
     v1 = VarBind.new("1.3.6.1.3.1.1.1.0", OctetString.new("Hello2"))
@@ -131,6 +139,10 @@ class TestManager < Test::Unit::TestCase
     assert_equal("Hello1", response.varbind_list[0].value.to_s)
     assert_equal("Hello2", response.varbind_list[1].value.to_s)
   end
+ 
+  def test_set_with_nil
+    assert_raises(ArgumentError) { @manager.set(nil) }
+  end
 
   def test_single_set
     varbind = VarBind.new("1.3.6.1.3.1.1.1.0", OctetString.new("Hello"))
@@ -147,6 +159,10 @@ class TestManager < Test::Unit::TestCase
     assert_equal("SNMPv2-SMI::experimental.1.1.2.0", response.varbind_list[1].name.to_s)
   end
 
+  def test_get_bulk_with_nil
+    assert_raises(ArgumentError) { @manager.get_bulk(nil, nil, nil) }
+  end
+
   def test_walk
     old_verbose = $VERBOSE
     $VERBOSE = nil
@@ -155,6 +171,10 @@ class TestManager < Test::Unit::TestCase
     $VERBOSE = old_verbose
   end
 
+  def test_walk_with_nil
+    assert_raises(ArgumentError) { @manager.walk(nil) {} }
+  end
+
   def test_request_id
     id = RequestId.new
     fail if id.next < 0 or id.next >= 2**31
@@ -165,8 +185,8 @@ class TestManager < Test::Unit::TestCase
     id.force_next(RequestId::MAX_REQUEST_ID-1)
     assert_equal(RequestId::MAX_REQUEST_ID-1, id.next)
 
-    assert_raise(RuntimeError) { id.force_next(RequestId::MAX_REQUEST_ID) }
-    assert_raise(RuntimeError) { id.force_next(0) }
+    assert_raises(RuntimeError) { id.force_next(RequestId::MAX_REQUEST_ID) }
+    assert_raises(RuntimeError) { id.force_next(0) }
   end
 
   def test_trap_v1
@@ -177,7 +197,7 @@ class TestManager < Test::Unit::TestCase
       :enterpriseSpecific,
       42,
       12345,
-      [VarBind.new("1.3.6.1.2.3.4", Integer.new(1))]
+      [VarBind.new("1.3.6.1.2.3.4", SNMP::Integer.new(1))]
     )
     pdu = Message.decode(sent_data).pdu
     assert_equal(ObjectId.new("1.3.6.1.4.1.9"), pdu.enterprise)
@@ -188,6 +208,10 @@ class TestManager < Test::Unit::TestCase
     assert_equal(1, pdu.vb_list.length)
   end
 
+  def test_trap_v1_with_nil
+    assert_raises(ArgumentError) { @manager.trap_v1(nil) }
+  end
+
   def test_trap_v2
     sent_data = @manager.trap_v2(1234, "1.3.6.1.2.3.4")
     pdu = Message.decode(sent_data).pdu
@@ -203,6 +227,10 @@ class TestManager < Test::Unit::TestCase
     assert_equal("1.4.5.6", pdu.vb_list.last.name.to_s)
   end
 
+  def test_trap_v2_with_nil
+    assert_raises(ArgumentError) { @manager.trap_v2(nil, nil, nil) }
+  end
+
   def test_inform
     response = @manager.inform(1234, "1.3.6.1.2.3.4")
     assert_equal(1234, response.vb_list[0].value)
@@ -246,7 +274,7 @@ class TrapTestTransport
 end
 
 
-class TestTrapListener < Test::Unit::TestCase
+class TestTrapListener < MiniTest::Unit::TestCase
   include SNMP
 
   def test_init_no_handlers

data/test/test_mib.rb

@@ -1,9 +1,9 @@
+require 'minitest/autorun'
 require 'snmp/mib'
-require 'test/unit'
 
 module SNMP
 
-  class TestMib < Test::Unit::TestCase
+  class TestMib < MiniTest::Unit::TestCase
 
     def setup
       @mib = MIB.new
@@ -28,15 +28,15 @@ module SNMP
       oid = @mib.oid("IF-MIB::ifTable.1.23")
       assert_equal("1.3.6.1.2.1.2.2.1.23", oid.to_s)
 
-      assert_raise(MIB::ModuleNotLoadedError) {
+      assert_raises(MIB::ModuleNotLoadedError) {
         @mib.oid("IFMIB::ifTable.1.23")
       }
 
-      assert_raise(ArgumentError) {
+      assert_raises(ArgumentError) {
         @mib.oid("IF-MIB::")
       }
 
-      assert_raise(ArgumentError) {
+      assert_raises(ArgumentError) {
         MIB.new.oid("sysDescr.0")
       }
 
@@ -57,6 +57,10 @@ module SNMP
       assert_equal("1.3.6.1.2.1.2.2.1.23", vb_list.first.name.to_s)
     end
 
+    def test_varbind_list_with_nil
+      assert_raises(ArgumentError) { @mib.varbind_list(nil) }
+    end
+
     def test_varbind
       vb = @mib.varbind("1.2.3.4", Null)
       assert_equal("1.2.3.4", vb.name.to_s)

data/test/test_pdu.rb

@@ -1,7 +1,9 @@
+# encoding: ascii-8bit
+
 require 'snmp/pdu'
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestProtocol < Test::Unit::TestCase
+class TestProtocol < MiniTest::Unit::TestCase
 
   include SNMP
 
@@ -27,7 +29,7 @@ class TestProtocol < Test::Unit::TestCase
   end
 
   def test_message_decoder_v3
-    assert_raise(SNMP::UnsupportedVersion) do
+    assert_raises(SNMP::UnsupportedVersion) do
       SNMP::Message.decode("0>\002\001\0030\021\002\004&\266\342\314\002\003\000\377\343\004\001\004\002\001\003\004\0200\016\004\000\002\001\000\002\001\000\004\000\004\000\004\0000\024\004\000\004\000\240\016\002\004\v\3623\233\002\001\000\002\001\0000\000")
     end
   end
@@ -115,7 +117,7 @@ class TestProtocol < Test::Unit::TestCase
     request.error_status = 2
     assert_equal(:noSuchName, request.error_status)
 
-    assert_raise(InvalidErrorStatus) {request.error_status = 42}
+    assert_raises(InvalidErrorStatus) {request.error_status = 42}
   end
 
   def test_snmpv2_trap
@@ -131,8 +133,8 @@ class TestProtocol < Test::Unit::TestCase
 
   def test_snmpv2_invalid_trap
     trap = SNMPv2_Trap.new(42, VarBindList.new([]))
-    assert_raise(InvalidTrapVarbind) { trap.sys_up_time }
-    assert_raise(InvalidTrapVarbind) { trap.trap_oid }
+    assert_raises(InvalidTrapVarbind) { trap.sys_up_time }
+    assert_raises(InvalidTrapVarbind) { trap.trap_oid }
   end
 
   def test_snmpv1_generic_trap
@@ -145,8 +147,8 @@ class TestProtocol < Test::Unit::TestCase
     trap.generic_trap = 6
     assert_equal(:enterpriseSpecific, trap.generic_trap)
 
-    assert_raise(InvalidGenericTrap) { trap.generic_trap = -1 }
-    assert_raise(InvalidGenericTrap) { trap.generic_trap = 7 }
+    assert_raises(InvalidGenericTrap) { trap.generic_trap = -1 }
+    assert_raises(InvalidGenericTrap) { trap.generic_trap = 7 }
   end
 
   def test_snmpv1_trap_encode
@@ -155,7 +157,7 @@ class TestProtocol < Test::Unit::TestCase
     generic_trap = :linkDown
     specific_trap = 0
     timestamp = TimeTicks.new(2176117721)
-    varbinds = VarBindList.new([VarBind.new("1.3.6.2", Integer.new(1))])
+    varbinds = VarBindList.new([VarBind.new("1.3.6.2", SNMP::Integer.new(1))])
     trap = SNMPv1_Trap.new(enterprise, agent_addr, generic_trap, specific_trap, timestamp, varbinds)
     assert_equal("\244%\006\004+\006\001{@\004\001\002\003\004\002\001\002\002\001\000C\005\000\201\264\353\3310\n0\010\006\003+\006\002\002\001\001", trap.encode)
 

data/test/test_retry.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'snmp'
 
 class TimeoutManager  < SNMP::Manager
@@ -53,7 +53,7 @@ class MismatchIdTransport
 end
 
 
-class TestRetry < Test::Unit::TestCase
+class TestRetry < MiniTest::Unit::TestCase
   def test_retry_count
     assert_response_count(0, 1, SNMP::RequestTimeout)
     assert_response_count(1, 2, SNMP::RequestTimeout)
@@ -71,7 +71,7 @@ class TestRetry < Test::Unit::TestCase
   def assert_response_count(retry_count, response_count, exception)
     m = TimeoutManager.new( :Retries => retry_count )
     yield m if block_given?
-    assert_raise(exception) { m.get("1.2.3.4") }
+    assert_raises(exception) { m.get("1.2.3.4") }
     assert_equal(response_count, m.response_count)
   end
 

data/test/test_smi.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'minitest/autorun'
 
 begin
   require 'smi'
 
-  class TestSmi < Test::Unit::TestCase
+  class TestSmi < MiniTest::Unit::TestCase
 
     include SNMP::SMI
 

data/test/test_varbind.rb

@@ -1,14 +1,16 @@
+# encoding: ascii-8bit
+
 require 'snmp/varbind'
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestVarBind < Test::Unit::TestCase
+class TestVarBind < MiniTest::Unit::TestCase
 
   include SNMP
 
   def test_varbind_encode
     v = VarBind.new([1,3,6,1], OctetString.new("test"))
     assert_equal("0\v\006\003+\006\001\004\004test", v.encode)
-    assert_not_nil(v.asn1_type)
+    refute_nil(v.asn1_type)
     assert_equal("[name=1.3.6.1, value=test (OCTET STRING)]", v.to_s)
   end
 
@@ -57,11 +59,11 @@ class TestVarBind < Test::Unit::TestCase
 
     check_varbind_list_create(VarBindList.new(
                                 [VarBind.new("1.2.3.4.5", Null),
-                                 VarBind.new("1.2.3.4.6", Integer.new(123)),
+                                 VarBind.new("1.2.3.4.6", SNMP::Integer.new(123)),
                                  ObjectId.new("1.2.3.4.7")]
     ), 3)
 
-    list = VarBindList.new([VarBind.new("1.3.6.2", Integer.new(1))])
+    list = VarBindList.new([VarBind.new("1.3.6.2", SNMP::Integer.new(1))])
     assert_equal(1, list.length)
     assert_equal("1.3.6.2", list.first.name.to_s)
     assert_equal(1, list.first.value.to_i)
@@ -76,7 +78,7 @@ class TestVarBind < Test::Unit::TestCase
   def test_varbind_list_encode
     list = VarBindList.new
     assert_equal("0\000", list.encode)
-    assert_not_nil(list.asn1_type)
+    refute_nil(list.asn1_type)
 
     list << VarBind.new([1,3,6,1], OctetString.new("test"))
     assert_equal("0\r0\v\006\003+\006\001\004\004test", list.encode)
@@ -103,7 +105,7 @@ class TestVarBind < Test::Unit::TestCase
     string = OctetString.new("test")
     assert_equal("test", string.to_s)
     assert_equal("\004\004test", string.encode)
-    assert_not_nil(string.asn1_type)
+    refute_nil(string.asn1_type)
   end
 
   def test_octet_string_equals
@@ -112,7 +114,7 @@ class TestVarBind < Test::Unit::TestCase
     s3 = OctetString.new("test")
     assert_equal(s1, s2)
     assert(s1 == s2)
-    assert_not_same(s1, s3)
+    refute_same(s1, s3)
     assert_equal(s1, s3)
   end
 
@@ -125,10 +127,10 @@ class TestVarBind < Test::Unit::TestCase
     id = ObjectId.new([1,3,6,1])
     assert_equal("1.3.6.1", id.to_s)
     assert_equal("\006\003+\006\001", id.encode)
-    assert_not_nil(id.asn1_type)
+    refute_nil(id.asn1_type)
     assert_equal("1.3.6.1", id.to_varbind.name.to_s)
 
-    assert_raise(ArgumentError) {
+    assert_raises(ArgumentError) {
       ObjectId.new("xyzzy")
     }
 
@@ -153,7 +155,7 @@ class TestVarBind < Test::Unit::TestCase
   def test_object_id_equals
     id1 = ObjectId.new("1.3.3.4")
     id2 = ObjectId.new([1,3,3,4])
-    assert_not_same(id1, id2)
+    refute_same(id1, id2)
     assert(id1 == id2)
     assert_equal(id1, id2)
   end
@@ -193,8 +195,8 @@ class TestVarBind < Test::Unit::TestCase
     assert_equal(ObjectId.new("1"), id2.index(id1))
     assert_equal(ObjectId.new("1.2"), id3.index(id1))
     assert_equal(ObjectId.new("1.2"), id3.index("1.3.3.4"))
-    assert_raise(ArgumentError) { id1.index(id3) }
-    assert_raise(ArgumentError) { id1.index(id1) }
+    assert_raises(ArgumentError) { id1.index(id3) }
+    assert_raises(ArgumentError) { id1.index(id1) }
   end
 
   def test_object_name_from_string
@@ -204,24 +206,29 @@ class TestVarBind < Test::Unit::TestCase
   end
 
   def test_integer_create
-    i = Integer.new(12345)
+    i = SNMP::Integer.new(12345)
     assert_equal("12345", i.to_s)
     assert_equal(12345, i.to_i)
     assert_equal("\002\00209", i.encode)
-    assert_not_nil(i.asn1_type)
+    refute_nil(i.asn1_type)
+  end
+
+  def test_integer_create_from_string
+    i = Integer.new("12345")
+    assert_equal(12345, i.to_i)
   end
 
   def test_integer_decode
-    i = Integer.decode("09")
+    i = SNMP::Integer.decode("09")
     assert_equal(12345, i.to_i)
   end
 
   def test_integer_equal
-    i1 = Integer.new(12345)
-    i2 = Integer.new(12345)
+    i1 = SNMP::Integer.new(12345)
+    i2 = SNMP::Integer.new(12345)
     i3 = 12345.2
     i4 = 12345
-    assert_not_same(i1, i2)
+    refute_same(i1, i2)
     assert_equal(i1, i2)
     assert_equal(i4, i1)
     assert_equal(i1, i4)
@@ -229,8 +236,8 @@ class TestVarBind < Test::Unit::TestCase
   end
 
   def test_integer_comparable
-    i1 = Integer.new(12345)
-    i2 = Integer.new(54321.0)
+    i1 = SNMP::Integer.new(12345)
+    i2 = SNMP::Integer.new(54321.0)
     assert(i1 < i2)
     assert(i2 > i1)
     assert(123 < i1)
@@ -239,19 +246,19 @@ class TestVarBind < Test::Unit::TestCase
   end
 
   def test_integer_to_oid
-    assert_equal(ObjectId.new("123"), Integer.new(123).to_oid)
-    assert_equal(ObjectId.new("0"), Integer.new(0).to_oid)
+    assert_equal(ObjectId.new("123"), SNMP::Integer.new(123).to_oid)
+    assert_equal(ObjectId.new("0"), SNMP::Integer.new(0).to_oid)
 
-    i = Integer.new(-1)
-    assert_raise(RangeError) { i.to_oid }
+    i = SNMP::Integer.new(-1)
+    assert_raises(RangeError) { i.to_oid }
   end
 
   def test_ip_address_from_string
     ip = IpAddress.new("10.0.255.1")
     assert_equal("10.0.255.1", ip.to_s)
-    assert_raise(InvalidIpAddress) { IpAddress.new("1233.2.3.4") }
-    assert_raise(InvalidIpAddress) { IpAddress.new("1.2.3.-1") }
-    assert_raise(InvalidIpAddress) { IpAddress.new("1.2.3") }
+    assert_raises(InvalidIpAddress) { IpAddress.new("1233.2.3.4") }
+    assert_raises(InvalidIpAddress) { IpAddress.new("1.2.3.-1") }
+    assert_raises(InvalidIpAddress) { IpAddress.new("1.2.3") }
   end
 
   def test_ip_address_from_self
@@ -265,7 +272,7 @@ class TestVarBind < Test::Unit::TestCase
     assert_equal("1.2.3.4", ip.to_s)
     assert_equal("\001\002\003\004", ip.to_str)
     assert_equal("@\004\001\002\003\004", ip.encode)
-    assert_not_nil(ip.asn1_type)
+    refute_nil(ip.asn1_type)
   end
 
   def test_ip_address_decode
@@ -307,7 +314,7 @@ class TestVarBind < Test::Unit::TestCase
     assert_equal("12345", i.to_s)
     assert_equal(12345, i.to_i)
     assert_equal("\x41\00209", i.encode)
-    assert_not_nil(i.asn1_type)
+    refute_nil(i.asn1_type)
   end
 
   def test_counter32_decode
@@ -331,7 +338,7 @@ class TestVarBind < Test::Unit::TestCase
     assert_equal("18446744073709551615", i.to_s)
     assert_equal("F\t\000\377\377\377\377\377\377\377\377", i.encode)
     assert_equal(i, Counter64.decode("\000\377\377\377\377\377\377\377\377"))
-    assert_not_nil(i.asn1_type)
+    refute_nil(i.asn1_type)
   end
 
   def test_opaque
@@ -339,7 +346,7 @@ class TestVarBind < Test::Unit::TestCase
     assert_equal("D\004test", q.encode)
     assert_equal("test", Opaque.decode("test"))
     assert_equal("test", q.to_s)
-    assert_not_nil(q.asn1_type)
+    refute_nil(q.asn1_type)
   end
 
   def test_exception_methods
@@ -363,10 +370,10 @@ class TestVarBind < Test::Unit::TestCase
     assert_equal("2 days, 00:00:00.00", TimeTicks.new(48 * 60 * 60 * 100).to_s)
     assert_equal("497 days, 02:27:52.95", TimeTicks.new(4294967295).to_s)
     assert_equal(4294967295, TimeTicks.new(4294967295).to_i)
-    assert_raise(ArgumentError) {
+    assert_raises(ArgumentError) {
       TimeTicks.new(4294967296)
     }
-    assert_raise(ArgumentError) {
+    assert_raises(ArgumentError) {
       TimeTicks.new(-1)
     }
   end