ipadmin 0.1.3.1 → 0.2.0

data/tests/tree_test.rb

@@ -90,16 +90,11 @@ class TestTree < Test::Unit::TestCase
     end
     
     def test_dump
-        ip4_1 = IPAdmin::IPAddr.new(:IPAddr => '192.168.1.1')
-        ip4_2 = IPAdmin::IPAddr.new(:IPAddr => '10.1.0.1')
-        ip4_3 = IPAdmin::IPAddr.new(:IPAddr => '10.2.0.1')
         cidr4_1 = IPAdmin::CIDR.new(:CIDR => '192.168.1.0/24')
         cidr4_2 = IPAdmin::CIDR.new(:CIDR => '10.1.0.0/24')
         cidr4_3 = IPAdmin::CIDR.new(:CIDR => '192.168.1.0/26')
         cidr4_4 =IPAdmin::CIDR.new(:CIDR => '192.168.1.0/30')
         
-        ip6_1 = IPAdmin::IPAddr.new(:IPAddr => 'fec0::1')
-        ip6_2 = IPAdmin::IPAddr.new(:IPAddr => 'fe80::1')
         cidr6_1 = IPAdmin::CIDR.new(:CIDR => 'fec0::/10')
         cidr6_2 = IPAdmin::CIDR.new(:CIDR => 'fe80::/10')
         cidr6_3 = IPAdmin::CIDR.new(:CIDR => 'fec0::/64')
@@ -137,16 +132,13 @@ class TestTree < Test::Unit::TestCase
     end
     
     def test_find
-        ip4_1 = IPAdmin::IPAddr.new(:IPAddr => '192.168.1.1')
-        ip4_2 = IPAdmin::IPAddr.new(:IPAddr => '10.1.0.1')
-        ip4_3 = IPAdmin::IPAddr.new(:IPAddr => '10.2.0.1')
+
         cidr4_1 = IPAdmin::CIDR.new(:CIDR => '192.168.1.0/24')
         cidr4_2 = IPAdmin::CIDR.new(:CIDR => '10.1.0.0/24')
         cidr4_3 = IPAdmin::CIDR.new(:CIDR => '192.168.1.0/26')
         cidr4_4 =IPAdmin::CIDR.new(:CIDR => '192.168.1.0/30')
-        
-        ip6_1 = IPAdmin::IPAddr.new(:IPAddr => 'fec0::1')
-        ip6_2 = IPAdmin::IPAddr.new(:IPAddr => 'fe80::1')
+        cidr4_5 =IPAdmin::CIDR.new(:CIDR => '192.168.2.0/30')
+
         cidr6_1 = IPAdmin::CIDR.new(:CIDR => 'fec0::/10')
         cidr6_2 = IPAdmin::CIDR.new(:CIDR => 'fe80::/10')
         cidr6_3 = IPAdmin::CIDR.new(:CIDR => 'fec0::/64')
@@ -164,11 +156,35 @@ class TestTree < Test::Unit::TestCase
         tree6.add(cidr6_3)
         tree6.add(cidr6_4)
         
-        assert_equal('192.168.1.0/30', tree4.find(ip4_1).desc)
-        assert_equal('10.1.0.0/24', tree4.find(ip4_2).desc)
-        assert_equal(nil, tree4.find(ip4_3) )
-        assert_equal('fec0:0000:0000:0000:0000:0000:0000:0000/126', tree6.find(ip6_1).desc)
-        assert_equal('fe80:0000:0000:0000:0000:0000:0000:0000/10', tree6.find(ip6_2).desc)      
+        assert_equal('192.168.1.0/30', tree4.find(cidr4_4).desc)
+        assert_equal('10.1.0.0/24', tree4.find(cidr4_2).desc)
+        assert_equal(nil, tree4.find(cidr4_5) )
+        assert_equal('fec0:0000:0000:0000:0000:0000:0000:0000/126', tree6.find(cidr6_4).desc)
+        assert_equal('fe80:0000:0000:0000:0000:0000:0000:0000/10', tree6.find(cidr6_2).desc)      
+        
+    end
+    
+    def test_exists
+
+        cidr4_1 = IPAdmin::CIDR.new(:CIDR => '192.168.1.0/24')
+        cidr4_2 =IPAdmin::CIDR.new(:CIDR => '192.168.2.0/24')
+        cidr4_3 =IPAdmin::CIDR.new(:CIDR => '192.168.3.0/30')
+
+        cidr6_1 = IPAdmin::CIDR.new(:CIDR => 'fec0::/10')
+        cidr6_2 = IPAdmin::CIDR.new(:CIDR => 'fe80::/10')
+        
+        tree4 = IPAdmin::Tree.new(:Version => 4)
+        tree6 = IPAdmin::Tree.new(:Version => 6)
+        
+        tree4.add(cidr4_1)
+        tree4.add(cidr4_2)
+
+        tree6.add(cidr6_1)
+        tree6.add(cidr6_2)
+        
+        assert_equal(1, tree4.exists?(cidr4_1))
+        assert_equal(1, tree6.exists?(cidr6_2))
+        assert_nil(tree4.exists?(cidr4_3))      
         
     end    
     
@@ -214,12 +230,15 @@ class TestTree < Test::Unit::TestCase
         tree6.add(cidr6_7)
 
        
-        list4 = tree4.find_space(:Size => 27, :Limit => 2)
+        list4 = tree4.find_space(:Subnet => 27, :Limit => 2)        
+        assert_equal('10.1.0.0/25', list4[0].desc)
+        assert_equal('192.168.1.64/26', list4[1].desc)
         
+        list4 = tree4.find_space(:IPCount => 29, :Limit => 2)        
         assert_equal('10.1.0.0/25', list4[0].desc)
         assert_equal('192.168.1.64/26', list4[1].desc)
 
-        list6 = tree6.find_space(:Size => 98)
+        list6 = tree6.find_space(:Subnet => 98)
         assert_equal('fe80:0000:0000:0000:0000:0000:0000:0000/10', list6[0].desc)
         assert_equal('fec0:2000:0000:0000:0000:0000:0000:0000/64', list6[1].desc)
         assert_equal('fec0:3000:0000:0000:0000:0000:0000:0000/96', list6[2].desc)
@@ -230,7 +249,7 @@ class TestTree < Test::Unit::TestCase
         cidr4_1 = IPAdmin::CIDR.new(:CIDR => '192.168.1.0/24')
         cidr4_2 = IPAdmin::CIDR.new(:CIDR => '10.1.0.0/24')
         cidr4_3 = IPAdmin::CIDR.new(:CIDR => '192.168.1.0/26')
-        cidr4_4 =IPAdmin::CIDR.new(:CIDR => '192.168.1.0/30')
+        cidr4_4 = IPAdmin::CIDR.new(:CIDR => '192.168.1.0/30')
         cidr4_5 = IPAdmin::CIDR.new(:CIDR => '192.168.1.64/26')
         cidr4_6 = IPAdmin::CIDR.new(:CIDR => '192.168.1.128/26')
         cidr4_7 = IPAdmin::CIDR.new(:CIDR => '192.168.1.192/26')
@@ -303,11 +322,7 @@ class TestTree < Test::Unit::TestCase
         
         assert_not_nil(tree4.show())
     end
-    
-    
-    
-
-    
+ 
 end
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ipadmin
 version: !ruby/object:Gem::Version 
-  version: 0.1.3.1
-date: 2006-02-15 00:00:00 -06:00
+  version: 0.2.0
+date: 2006-02-21 00:00:00 -06:00
 summary: A package for manipulating IPv4/IPv6 address space.
 require_paths: 
   - lib
@@ -32,7 +32,6 @@ files:
   - lib/ip_admin.rb
   - README
 test_files: 
-  - tests/ipaddr_test.rb
   - tests/functions_test.rb
   - tests/cidr_test.rb
   - tests/tree_test.rb

data/tests/ipaddr_test.rb

@@ -1,56 +0,0 @@
-#!/usr/bin/ruby
-
-require '../lib/ip_admin.rb'
-require 'test/unit'
-
-
-
-class TestIPAddr < Test::Unit::TestCase
-
-    def test_new
-        assert_not_nil(IPAdmin::IPAddr.new(:IPAddr => '192.168.1.0/24') )
-        assert_not_nil(IPAdmin::IPAddr.new(:IPAddr => '192.168.1.0', :Netmask => '255.255.255.0') )
-        assert_not_nil(IPAdmin::IPAddr.new(:IPAddr => 'fec0::/64') )
-        assert_raise(RuntimeError){ IPAdmin::IPAddr.new(:IPAddr => '192.168.1.256/24') }
-        assert_raise(RuntimeError){ IPAdmin::IPAddr.new(:IPAddr => '192.168.1.1/33') }
-        assert_raise(RuntimeError){ IPAdmin::IPAddr.new(:IPAddr => 'fec0::1/129') }
-    end
-    
-    def test_methods
-        ip4 = IPAdmin::IPAddr.new(:IPAddr => '192.168.1.1/24')
-        ip6 = IPAdmin::IPAddr.new(:IPAddr => 'fec0::1/64')
-        
-        assert_equal('192.168.1.0',ip4.base() )
-        assert_equal('fec0:0000:0000:0000:0000:0000:0000:0000',ip6.base() )
-        
-        assert_equal('192.168.1.255',ip4.broadcast() )
-        assert_raise(RuntimeError){ip6.broadcast()}
-        
-        assert_equal('192.168.1.1/24',ip4.desc() )
-        assert_equal('fec0:0000:0000:0000:0000:0000:0000:0001/64',ip6.desc() )
-        
-        assert_equal('0.0.0.255',ip4.hostmask_ext() )
-        assert_raise(RuntimeError){ip6.hostmask_ext()}
-        
-        assert_equal('192.168.1.1',ip4.ip() )
-        assert_equal('fec0:0000:0000:0000:0000:0000:0000:0001',ip6.ip() )        
-        
-        assert_equal('/24',ip4.netmask() )
-        assert_equal('/64',ip6.netmask() )
-        
-        assert_equal(24,ip4.bits() )
-        assert_equal(64,ip6.bits() )
-        
-        assert_equal('255.255.255.0',ip4.netmask_ext() )        
-          
-    end
-    
-
-    
-
-    
-end
-
-
-
-