cisco_acl_intp 0.0.3 → 0.0.4

data/spec/cisco_acl_intp/ace_spec.rb

@@ -5,7 +5,7 @@ describe RemarkAce do
   describe '#to_s' do
     it 'should be remark string' do
       rmk = RemarkAce.new('  foo-bar _ baz @@ COMMENT')
-      rmk.to_s.should eq 'remark foo-bar _ baz @@ COMMENT'
+      expect(rmk.to_s).to eq 'remark foo-bar _ baz @@ COMMENT'
     end
   end
 
@@ -17,23 +17,24 @@ describe RemarkAce do
     end
 
     it 'should be true when same comment' do
-      (@rmk1 == @rmk2).should be_true
+      expect(@rmk1 == @rmk2).to be_truthy
     end
 
     it 'should be false when different comment' do
-      (@rmk1 == @rmk3).should be_false
+      expect(@rmk1 == @rmk3).to be_falsey
     end
   end
 
   describe '#contains?' do
     it 'should be always false' do
       rmk = RemarkAce.new('asdfjklj;')
-      rmk.contains?(
-        src_ip: '192.168.4.4',
-        dst_ip: '172.30.240.33'
-      ).should be_false
+      expect(
+        rmk.contains?(
+          src_ip: '192.168.4.4',
+          dst_ip: '172.30.240.33'
+        )).to be_falsey
       # with empty argments
-      rmk.contains?.should be_false
+      expect(rmk.contains?).to be_falsey
     end
   end
 end
@@ -44,15 +45,15 @@ describe EvaluateAce do
       evl = EvaluateAce.new(
         recursive_name: 'foobar_baz'
       )
-      evl.to_s.should be_aclstr('evaluate foobar_baz')
+      expect(evl.to_s).to be_aclstr('evaluate foobar_baz')
     end
 
     it 'raise error if not specified recursive name' do
-      lambda do
+      expect do
         EvaluateAce.new(
           number: 30
         )
-      end.should raise_error(AclArgumentError)
+      end.to raise_error(AclArgumentError)
     end
   end
 
@@ -64,27 +65,28 @@ describe EvaluateAce do
     end
 
     it 'should be true when same evaluate name' do
-      (@evl1 == @evl2).should be_true
+      expect(@evl1 == @evl2).to be_truthy
     end
 
     it 'should be false when different evaluate name' do
-      (@evl1 == @evl3).should be_false
+      expect(@evl1 == @evl3).to be_falsey
     end
   end
 
   describe '#contains?' do
     it 'should be false' do
-      pending('match by evaluate is not implemented yet')
+      skip('match by evaluate is not implemented yet')
 
       evl = EvaluateAce.new(
         recursive_name: 'asdf_0-98'
       )
-      evl.contains?(
-        src_ip: '192.168.4.4',
-        dst_ip: '172.30.240.33'
-      ).should be_false
+      expect(
+        evl.contains?(
+          src_ip: '192.168.4.4',
+          dst_ip: '172.30.240.33'
+        )).to be_falsey
       # with empty argments
-      evl.contains?.should be_false
+      expect(evl.contains?).to be_falsey
     end
   end
 end

data/spec/cisco_acl_intp/{standard_ace_spec.rb → ace_standard_spec.rb}

@@ -4,13 +4,12 @@ require 'spec_helper'
 describe StandardAce do
   describe '#to_s' do
     context 'Normal case' do
-
       it 'should be permit action and set ip/wildcard' do
         sa = StandardAce.new(
           action: 'permit',
           src: { ipaddr: '192.168.15.15', wildcard: '0.0.7.6' }
         )
-        sa.to_s.should be_aclstr('permit 192.168.8.9 0.0.7.6')
+        expect(sa.to_s).to be_aclstr('permit 192.168.8.9 0.0.7.6')
       end
 
       it 'should be deny action and set ip/wildcard' do
@@ -18,7 +17,7 @@ describe StandardAce do
           action: 'deny',
           src: { ipaddr: '192.168.15.15', wildcard: '0.0.0.127' }
         )
-        sa.to_s.should be_aclstr('deny 192.168.15.0 0.0.0.127')
+        expect(sa.to_s).to be_aclstr('deny 192.168.15.0 0.0.0.127')
       end
 
       it 'should be able set with AceSrcDstSpec object' do
@@ -26,21 +25,18 @@ describe StandardAce do
           ipaddr: '192.168.3.144', wildcard: '0.0.0.127'
         )
         sa = StandardAce.new(action: 'permit', src: asds)
-        sa.to_s.should be_aclstr('permit 192.168.3.128 0.0.0.127')
+        expect(sa.to_s).to be_aclstr('permit 192.168.3.128 0.0.0.127')
       end
-
     end
 
     context 'Argument error case' do
-
       it 'should be rased exception when :action not specified' do
-        lambda do
+        expect do
           StandardAce.new(
             src: { ipaddr: '192.168.3.3', wildcard: '0.0.0.127' }
           )
-        end.should raise_error(AclArgumentError)
+        end.to raise_error(AclArgumentError)
       end
-
     end
   end
 
@@ -61,11 +57,11 @@ describe StandardAce do
     end
 
     it 'shoud be true with match ip addr' do
-      @sa.contains?(@ip_match).should be_true
+      expect(@sa.contains?(@ip_match)).to be_truthy
     end
 
     it 'should be false with unmatch ip addr' do
-      @sa.contains?(@ip_unmatch).should be_false
+      expect(@sa.contains?(@ip_unmatch)).to be_falsey
     end
   end
 end

data/spec/cisco_acl_intp/{ace_ip_spec.rb → acespec_ip_spec.rb}

@@ -31,32 +31,32 @@ describe AceIpSpec do
     end
 
     it 'should be true same ip and same wildcard' do
-      (@ip == @ip1).should be_true
+      expect(@ip == @ip1).to be_truthy
     end
 
     it 'should be true same ip and same wildcard/netmask' do
-      (@ip1 == @ip2).should be_true
+      expect(@ip1 == @ip2).to be_truthy
     end
 
     it 'should be false different ip and same netmask' do
-      (@ip2 == @ip3).should be_false
+      expect(@ip2 == @ip3).to be_falsey
     end
 
     it 'should be false different ip and same wildcard' do
-      (@ip1 == @ip4).should be_false
+      expect(@ip1 == @ip4).to be_falsey
     end
 
     it 'should be false same ip and different wildcard' do
-      (@ip1 == @ip5).should be_false
+      expect(@ip1 == @ip5).to be_falsey
     end
 
     it 'should be true ANY object' do
       ip1 = AceIpSpec.new(ipaddr: 'any')
       ip2 = AceIpSpec.new(ipaddr: '0.0.0.0', wildcard: '255.255.255.255')
       ip3 = AceIpSpec.new(ipaddr: '0.0.0.0', netmask: 0)
-      (ip1 == ip2).should be_true
-      (ip2 == ip3).should be_true
-      (ip3 == ip1).should be_true
+      expect(ip1 == ip2).to be_truthy
+      expect(ip2 == ip3).to be_truthy
+      expect(ip3 == ip1).to be_truthy
     end
   end
 
@@ -66,8 +66,8 @@ describe AceIpSpec do
         ipaddr: '192.168.15.15',
         wildcard: '0.0.31.255'
       )
-      ip.netmask.should eq 19
-      ip.wildcard.should eq '0.0.31.255'
+      expect(ip.netmask).to eq 19
+      expect(ip.wildcard).to eq '0.0.31.255'
     end
 
     it 'should not be converted wildcard/netmask' do
@@ -75,8 +75,8 @@ describe AceIpSpec do
         ipaddr: '192.168.15.15',
         wildcard: '0.3.5.0'
       )
-      ip.netmask.should be_nil
-      ip.wildcard.should eq '0.3.5.0'
+      expect(ip.netmask).to be_nil
+      expect(ip.wildcard).to eq '0.3.5.0'
     end
   end
 
@@ -89,19 +89,19 @@ describe AceIpSpec do
     end
 
     it 'should be true when subnet is contained' do
-      @ip.contains?('192.168.15.3/25').should be_true
+      expect(@ip.contains?('192.168.15.3/25')).to be_truthy
     end
 
     it 'should be true when same subnet' do
-      @ip.contains?('192.168.15.3/24').should be_true
+      expect(@ip.contains?('192.168.15.3/24')).to be_truthy
     end
 
     it 'should be false when larger subnet' do
-      @ip.contains?('192.168.15.3/23').should be_false
+      expect(@ip.contains?('192.168.15.3/23')).to be_falsey
     end
 
     it 'should be false with not related block' do
-      @ip.contains?('192.168.16.3/24').should be_false
+      expect(@ip.contains?('192.168.16.3/24')).to be_falsey
     end
   end
 
@@ -111,12 +111,12 @@ describe AceIpSpec do
         ipaddr: '192.168.15.15',
         wildcard: '0.0.7.6'
       )
-      ip.to_s.should be_aclstr('192.168.8.9 0.0.7.6')
+      expect(ip.to_s).to be_aclstr('192.168.8.9 0.0.7.6')
     end
 
     it 'should be "any" with any alias' do
       ip = AceIpSpec.new(ipaddr: 'any')
-      ip.to_s.should be_aclstr('any')
+      expect(ip.to_s).to be_aclstr('any')
     end
 
     it 'should be "any"' do
@@ -124,7 +124,7 @@ describe AceIpSpec do
         ipaddr: '0.0.0.0',
         wildcard: '255.255.255.255'
       )
-      ip.to_s.should be_aclstr('any')
+      expect(ip.to_s).to be_aclstr('any')
     end
 
     it 'should be "any" with full-bit wildcard mask' do
@@ -132,7 +132,7 @@ describe AceIpSpec do
         ipaddr: '192.168.15.15',
         wildcard: '255.255.255.255'
       )
-      ip.to_s.should be_aclstr('any')
+      expect(ip.to_s).to be_aclstr('any')
     end
 
     it 'should be "any" with zero-ip' do
@@ -140,7 +140,7 @@ describe AceIpSpec do
         ipaddr: '0.0.0.0',
         wildcard: '0.0.7.6'
       )
-      ip.to_s.should be_aclstr('any')
+      expect(ip.to_s).to be_aclstr('any')
     end
 
     it 'should be "host 192.168.15.15"' do
@@ -148,7 +148,7 @@ describe AceIpSpec do
         ipaddr: '192.168.15.15',
         wildcard: '0.0.0.0'
       )
-      ip.to_s.should be_aclstr('host 192.168.15.15')
+      expect(ip.to_s).to be_aclstr('host 192.168.15.15')
     end
 
     it 'should be "192.168.14.0 0.0.1.255" with netmask /23' do
@@ -156,7 +156,7 @@ describe AceIpSpec do
         ipaddr: '192.168.15.15',
         netmask: 23
       )
-      ip.to_s.should be_aclstr('192.168.14.0 0.0.1.255')
+      expect(ip.to_s).to be_aclstr('192.168.14.0 0.0.1.255')
     end
 
     it 'should be "any" with netmask /0' do
@@ -164,7 +164,7 @@ describe AceIpSpec do
         ipaddr: '192.168.15.15',
         netmask: 0
       )
-      ip.to_s.should be_aclstr('any')
+      expect(ip.to_s).to be_aclstr('any')
     end
 
     it 'should be "host 192.168.15.15" with netmask /32' do
@@ -172,41 +172,41 @@ describe AceIpSpec do
         ipaddr: '192.168.15.15',
         netmask: 32
       )
-      ip.to_s.should be_aclstr('host 192.168.15.15')
+      expect(ip.to_s).to be_aclstr('host 192.168.15.15')
     end
 
     it 'should be "host 192.168.15.15" in default' do
       ip = AceIpSpec.new(
         ipaddr: '192.168.15.15'
       )
-      ip.to_s.should be_aclstr('host 192.168.15.15')
+      expect(ip.to_s).to be_aclstr('host 192.168.15.15')
     end
 
     context 'Argument Error Case' do
       it 'raise error without ipaddr' do
-        lambda do
+        expect do
           AceIpSpec.new(
             netmask: 32
           )
-        end.should raise_error(AclArgumentError)
+        end.to raise_error(AclArgumentError)
       end
 
       it 'raise error with invalid ipaddr' do
-        lambda do
+        expect do
           AceIpSpec.new(
             ipaddr: '192.168.15.256'
           )
-        end.should raise_error
-        lambda do
+        end.to raise_error
+        expect do
           AceIpSpec.new(
             ipaddr: '192.168.250.3.3'
           )
-        end.should raise_error
-        lambda do
+        end.to raise_error
+        expect do
           AceIpSpec.new(
             ipaddr: '192,168.250.3'
           )
-        end.should raise_error
+        end.to raise_error
       end
     end
   end

data/spec/cisco_acl_intp/{ace_other_qualifier_spec.rb → acespec_other_qualifier_spec.rb}

@@ -10,33 +10,33 @@ describe AceLogSpec do
     end
 
     it 'should be true when same cookie' do
-      (@log2 == @log3).should be_true
+      expect(@log2 == @log3).to be_truthy
     end
 
     it 'should be false when different cookie' do
-      (@log2 == @log1).should be_false
+      expect(@log2 == @log1).to be_falsey
     end
   end
 
   describe '#to_s' do
     it 'should be log without cookie' do
       log = AceLogSpec.new
-      log.to_s.should be_aclstr('log')
+      expect(log.to_s).to be_aclstr('log')
     end
 
     it 'should be log-input without cookie string' do
       log = AceLogSpec.new('', true)
-      log.to_s.should be_aclstr('log-input')
+      expect(log.to_s).to be_aclstr('log-input')
     end
 
     it 'should be log with cookie' do
       log = AceLogSpec.new('Cookie0123')
-      log.to_s.should be_aclstr('log Cookie0123')
+      expect(log.to_s).to be_aclstr('log Cookie0123')
     end
 
     it 'should be log-input with cookie string' do
       log = AceLogSpec.new('log', true)
-      log.to_s.should be_aclstr('log-input log')
+      expect(log.to_s).to be_aclstr('log-input log')
     end
   end
 end
@@ -50,24 +50,24 @@ describe AceRecursiveQualifier do
     end
 
     it 'should be true when same recursive-name' do
-      (@rcsv2 == @rcsv3).should be_true
+      expect(@rcsv2 == @rcsv3).to be_truthy
     end
 
     it 'should be false when different recursive-name' do
-      (@rcsv2 == @rcsv1).should be_false
+      expect(@rcsv2 == @rcsv1).to be_falsey
     end
   end
 
   describe '#to_s' do
     it 'should be reflect spec string' do
       rcsv = AceRecursiveQualifier.new('established')
-      rcsv.to_s.should be_aclstr('reflect established')
+      expect(rcsv.to_s).to be_aclstr('reflect established')
     end
 
     it 'should be raised error' do
-      lambda do
+      expect do
         AceRecursiveQualifier.new('')
-      end.should raise_error(AclArgumentError)
+      end.to raise_error(AclArgumentError)
     end
   end
 end
@@ -80,16 +80,16 @@ describe AceOtherQualifierList do
       @list = AceOtherQualifierList.new
     end
 
-    it 'should be size 0 when empty list'do
-      @list.size.should be_zero
+    it 'should be size 0 when empty list' do
+      expect(@list.size).to be_zero
     end
 
     it 'should count-up size when added AceTcpFlag objects' do
       @list.push @oq1
-      @list.size.should eq 1
+      expect(@list.size).to eq 1
       @list.push @oq2
-      @list.size.should eq 2
-      @list.to_s.should be_aclstr('log reflect iptraffic')
+      expect(@list.size).to eq 2
+      expect(@list.to_s).to be_aclstr('log reflect iptraffic')
     end
   end
 
@@ -104,11 +104,11 @@ describe AceOtherQualifierList do
     end
 
     it 'should be true when same other qualifier elements' do
-      (@list1 == @list2).should be_true
+      expect(@list1 == @list2).to be_truthy
     end
 
     it 'should be false when different other qualifier elements' do
-      (@list1 == @list3).should be_false
+      expect(@list1 == @list3).to be_falsey
     end
   end
 end