trema 0.3.3 → 0.3.4

data/spec/trema/switch-daemon_spec.rb

@@ -31,10 +31,10 @@ module Trema
       }
       switch_daemon = SwitchDaemon.new( rule )
 
-      switch_daemon.options.should include( "port_status::topology" )
-      switch_daemon.options.should include( "packet_in::controller" )
-      switch_daemon.options.should include( "state_notify::topology" )
-      switch_daemon.options.should include( "vendor::controller" )
+      expect( switch_daemon.options ).to include( "port_status::topology" )
+      expect( switch_daemon.options ).to include( "packet_in::controller" )
+      expect( switch_daemon.options ).to include( "state_notify::topology" )
+      expect( switch_daemon.options ).to include( "vendor::controller" )
     end
 
 
@@ -47,14 +47,14 @@ module Trema
       }
       switch_daemon = SwitchDaemon.new( rule )
 
-      switch_daemon.options.should include( "port_status::topology0" )
-      switch_daemon.options.should include( "port_status::topology1" )
-      switch_daemon.options.should include( "packet_in::controller0" )
-      switch_daemon.options.should include( "packet_in::controller1" )
-      switch_daemon.options.should include( "state_notify::topology0" )
-      switch_daemon.options.should include( "state_notify::topology1" )
-      switch_daemon.options.should include( "vendor::controller0" )
-      switch_daemon.options.should include( "vendor::controller1" )
+      expect( switch_daemon.options ).to include( "port_status::topology0" )
+      expect( switch_daemon.options ).to include( "port_status::topology1" )
+      expect( switch_daemon.options ).to include( "packet_in::controller0" )
+      expect( switch_daemon.options ).to include( "packet_in::controller1" )
+      expect( switch_daemon.options ).to include( "state_notify::topology0" )
+      expect( switch_daemon.options ).to include( "state_notify::topology1" )
+      expect( switch_daemon.options ).to include( "vendor::controller0" )
+      expect( switch_daemon.options ).to include( "vendor::controller1" )
     end
 
 
@@ -66,9 +66,9 @@ module Trema
       }
       switch_daemon = SwitchDaemon.new( rule )
 
-      switch_daemon.options.should include( "port_status::topology" )
-      switch_daemon.options.should include( "packet_in::controller" )
-      switch_daemon.options.should include( "state_notify::topology" )
+      expect( switch_daemon.options ).to include( "port_status::topology" )
+      expect( switch_daemon.options ).to include( "packet_in::controller" )
+      expect( switch_daemon.options ).to include( "state_notify::topology" )
     end
   end
 end

data/spec/trema/util_spec.rb

@@ -31,16 +31,12 @@ describe Trema::Util do
   it "should assert that trema is built" do
     Trema::Executables.stub!( :compiled? ).and_return( false )
     $stderr.should_receive( :puts ).with( /^ERROR/ )
-    lambda do
-      assert_trema_is_built
-    end.should raise_error( SystemExit )
+    expect { assert_trema_is_built }.to raise_error( SystemExit )
   end
 
 
   it "should execute and check the results of a command" do
-    lambda do
-      sh "NO SUCH COMMAND"
-    end.should raise_error( "Command 'NO SUCH COMMAND' failed!" )
+    expect { sh "NO SUCH COMMAND" }.to raise_error( "Command 'NO SUCH COMMAND' failed!" )
   end
 
 

data/spec/trema/vendor-action_spec.rb

@@ -20,61 +20,49 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe VendorAction, "new( vendor_id )" do
+describe VendorAction, "new(vendor_id)", :type => "actions" do
   subject { VendorAction.new vendor_id }
 
-  it_validates "option range", :vendor_id, 0..( 2 ** 32 - 1 )
-
-  context "when vendor_id == 0x00004cff" do
+  context "with vendor_id (0x00004cff)" do
     let( :vendor_id ) { 0x00004cff }
     its( :vendor_id ) { should == 0x00004cff }
   end
-end
 
+  it_validates "option is within range", :vendor_id, 0..( 2 ** 32 - 1 )
 
-describe VendorAction, ".new( string )" do
-  it { expect { VendorAction.new "0x00004cff" }.to raise_error( TypeError ) }
+  context %{with vendor_id ("0x00004cff")} do
+    let( :vendor_id ) { "0x00004cff" }
+    it { expect { subject }.to raise_error( TypeError ) }
+  end
 end
 
 
-describe VendorAction, ".new( array )" do
-  it { expect { VendorAction.new [ 1, 2, 3 ] }.to raise_error( TypeError ) }
-end
-
+describe VendorAction, ".new(0x00002320, body)", :type => "actions" do
+  subject { VendorAction.new 0x00002320, body }
 
-describe VendorAction, ".new( vendor_id, body )" do
-  subject { VendorAction.new vendor_id, body }
-  let( :vendor_id ) { 0x00002320 }
+  context %{with body ("deadbeef")} do
+    let( :body ) { "deadbeef" }
+    it { expect { subject }.to raise_error( TypeError ) }
+  end
 
-  context %{when body == [ 0x00, 0x08, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ]} do
+  context "when sending a Flow Mod with VendorAction" do
     let( :body ) { [ 0x00, 0x08, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ] }
 
-    its( :vendor_id ) { should == 0x00002320 }
-    its( :body ) { should == [ 0, 8, 84, 114, 101, 109, 97, 0 ] }
-
-    context "when sending Flow Mod Add with action set to VendorAction" do
-      it "should have a flow with action set to VendorAction" do
-        class FlowModAddController < Controller; end
-        network {
-          vswitch { datapath_id 0xabc }
-        }.run( FlowModAddController ) {
-	  body = [ 0x00, 0x08, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ]
-          controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => VendorAction.new( 0x00002320, body ) )
-	  sleep 2 # FIXME: wait to send_flow_mod_add
-          vswitch( "0xabc" ).should have( 1 ).flows
-          vswitch( "0xabc" ).flows[ 0 ].actions.should match( /note:54.72.65.6d.61.00/ )
-        }
-      end
+    it "should insert a new flow entry with action (note:54.72.65.6d.61.00)" do
+      class TestController < Controller; end
+      network {
+        vswitch { datapath_id 0xabc }
+      }.run( TestController ) {
+        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
+        sleep 2
+        expect( vswitch( "0xabc" ) ).to have( 1 ).flows
+        expect( vswitch( "0xabc" ).flows[ 0 ].actions ).to eq( "note:54.72.65.6d.61.00" )
+      }
     end
   end
 end
 
 
-describe VendorAction, "new( vendor_id, string )" do
-  it { expect { VendorAction.new 0x00004cff, "deadbeef" }.to raise_error( TypeError ) }
-end
-
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8-unix

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-01-17 00:00:00 Z
+date: 2013-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false