state_machine 0.6.2 → 0.6.3

data/test/unit/machine_test.rb

@@ -1497,31 +1497,34 @@ begin
     end
     
     def test_should_save_file_with_class_name_by_default
-      @machine.draw
-      assert File.exist?('./Vehicle_state.png')
-    ensure
-      FileUtils.rm('./Vehicle_state.png')
+      graph = @machine.draw(:output => false)
+      assert_equal './Vehicle_state.png', graph.instance_variable_get('@filename')
     end
     
     def test_should_allow_base_name_to_be_customized
-      @machine.draw(:name => 'machine')
-      assert File.exist?('./machine.png')
-    ensure
-      FileUtils.rm('./machine.png')
+      graph = @machine.draw(:name => 'machine', :output => false)
+      assert_equal './machine.png', graph.instance_variable_get('@filename')
     end
     
     def test_should_allow_format_to_be_customized
-      @machine.draw(:format => 'jpg')
-      assert File.exist?('./Vehicle_state.jpg')
-    ensure
-      FileUtils.rm('./Vehicle_state.jpg')
+      graph = @machine.draw(:format => 'jpg', :output => false)
+      assert_equal './Vehicle_state.jpg', graph.instance_variable_get('@filename')
+      assert_equal 'jpg', graph.instance_variable_get('@format')
     end
     
     def test_should_allow_path_to_be_customized
-      @machine.draw(:path => "#{File.dirname(__FILE__)}/")
-      assert File.exist?("#{File.dirname(__FILE__)}/Vehicle_state.png")
-    ensure
-      FileUtils.rm("#{File.dirname(__FILE__)}/Vehicle_state.png")
+      graph = @machine.draw(:path => "#{File.dirname(__FILE__)}/", :output => false)
+      assert_equal "#{File.dirname(__FILE__)}/Vehicle_state.png", graph.instance_variable_get('@filename')
+    end
+    
+    def test_should_allow_orientation_to_be_landscape
+      graph = @machine.draw(:orientation => 'landscape', :output => false)
+      assert_equal 'LR', graph['rankdir']
+    end
+    
+    def test_should_allow_orientation_to_be_portrait
+      graph = @machine.draw(:orientation => 'portrait', :output => false)
+      assert_equal 'TB', graph['rankdir']
     end
   end
   
@@ -1536,7 +1539,15 @@ begin
       end
       @machine.state :parked, :value => 1
       @machine.state :idling, :value => 2
-      @machine.draw
+      @graph = @machine.draw
+    end
+    
+    def test_should_draw_all_states
+      assert_equal 3, @graph.node_count
+    end
+    
+    def test_should_draw_all_events
+      assert_equal 2, @graph.edge_count
     end
     
     def test_should_draw_machine
@@ -1556,7 +1567,15 @@ begin
         transition :parked => :idling
       end
       @machine.state :parked, :value => nil
-      @machine.draw
+      @graph = @machine.draw
+    end
+    
+    def test_should_draw_all_states
+      assert_equal 3, @graph.node_count
+    end
+    
+    def test_should_draw_all_events
+      assert_equal 2, @graph.edge_count
     end
     
     def test_should_draw_machine
@@ -1576,7 +1595,15 @@ begin
         transition :parked => :idling
       end
       @machine.state :idling, :value => lambda {Time.now}
-      @machine.draw
+      @graph = @machine.draw
+    end
+    
+    def test_should_draw_all_states
+      assert_equal 3, @graph.node_count
+    end
+    
+    def test_should_draw_all_events
+      assert_equal 2, @graph.edge_count
     end
     
     def test_should_draw_machine

data/test/unit/state_test.rb

@@ -258,6 +258,7 @@ class StateInitialTest < Test::Unit::TestCase
   
   def test_should_be_initial
     assert @state.initial
+    assert @state.initial?
   end
 end
 
@@ -269,6 +270,65 @@ class StateNotInitialTest < Test::Unit::TestCase
   
   def test_should_not_be_initial
     assert !@state.initial
+    assert !@state.initial?
+  end
+end
+
+class StateFinalTest < Test::Unit::TestCase
+  def setup
+    @machine = StateMachine::Machine.new(Class.new)
+    @state = StateMachine::State.new(@machine, :parked)
+  end
+  
+  def test_should_be_final_without_input_transitions
+    assert @state.final?
+  end
+  
+  def test_should_be_final_with_input_transitions
+    @machine.event :park do
+      transition :idling => :parked
+    end
+    
+    assert @state.final?
+  end
+  
+  def test_should_be_final_with_loopback
+    @machine.event :ignite do
+      transition :parked => same
+    end
+    
+    assert @state.final?
+  end
+end
+
+class StateNotFinalTest < Test::Unit::TestCase
+  def setup
+    @machine = StateMachine::Machine.new(Class.new)
+    @state = StateMachine::State.new(@machine, :parked)
+  end
+  
+  def test_should_not_be_final_with_outgoing_whitelist_transitions
+    @machine.event :ignite do
+      transition :parked => :idling
+    end
+    
+    assert !@state.final?
+  end
+  
+  def test_should_not_be_final_with_outgoing_all_transitions
+    @machine.event :ignite do
+      transition all => :idling
+    end
+    
+    assert !@state.final?
+  end
+  
+  def test_should_not_be_final_with_outgoing_blacklist_transitions
+    @machine.event :ignite do
+      transition all - :first_gear => :idling
+    end
+    
+    assert !@state.final?
   end
 end
 
@@ -531,6 +591,9 @@ begin
   class StateDrawingTest < Test::Unit::TestCase
     def setup
       @machine = StateMachine::Machine.new(Class.new)
+      @machine.event :ignite do
+        transition :parked => :idling
+      end
       @state = StateMachine::State.new(@machine, :parked, :value => 1)
       
       graph = GraphViz.new('G')
@@ -561,14 +624,22 @@ begin
   class StateDrawingInitialTest < Test::Unit::TestCase
     def setup
       @machine = StateMachine::Machine.new(Class.new)
+      @machine.event :ignite do
+        transition :parked => :idling
+      end
       @state = StateMachine::State.new(@machine, :parked, :initial => true)
       
-      graph = GraphViz.new('G')
-      @node = @state.draw(graph)
+      @graph = GraphViz.new('G')
+      @node = @state.draw(@graph)
     end
     
-    def test_should_use_doublecircle_as_shape
-      assert_equal 'doublecircle', @node['shape']
+    def test_should_use_ellipse_as_shape
+      assert_equal 'ellipse', @node['shape']
+    end
+    
+    def test_should_draw_edge_between_point_and_state
+      assert_equal 2, @graph.node_count
+      assert_equal 1, @graph.edge_count
     end
   end
   
@@ -607,6 +678,37 @@ begin
       assert_equal 'parked (*)', @node['label']
     end
   end
+  
+  class StateDrawingNonFinalTest < Test::Unit::TestCase
+    def setup
+      @machine = StateMachine::Machine.new(Class.new)
+      @machine.event :ignite do
+        transition :parked => :idling
+      end
+      @state = StateMachine::State.new(@machine, :parked)
+      
+      graph = GraphViz.new('G')
+      @node = @state.draw(graph)
+    end
+    
+    def test_should_use_ellipse_as_shape
+      assert_equal 'ellipse', @node['shape']
+    end
+  end
+  
+  class StateDrawingFinalTest < Test::Unit::TestCase
+    def setup
+      @machine = StateMachine::Machine.new(Class.new)
+      @state = StateMachine::State.new(@machine, :parked)
+      
+      graph = GraphViz.new('G')
+      @node = @state.draw(graph)
+    end
+    
+    def test_should_use_doublecircle_as_shape
+      assert_equal 'doublecircle', @node['shape']
+    end
+  end
 rescue LoadError
   $stderr.puts 'Skipping GraphViz StateMachine::State tests. `gem install ruby-graphviz` and try again.'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-07 23:00:00 -05:00
+date: 2009-03-10 00:00:00 -04:00
 default_executable: 
 dependencies: []