fixing rest of the send test cases

test/mom/test_if_statement.rb

@@ -21,10 +21,10 @@ module Mom
       assert_equal SlotDefinition , @first.condition.class , @first
     end
     def test_length
-      assert_equal 9 , @stats.length
+      assert_equal 11 , @stats.length
     end
     def test_array
-      check_array [SlotMove,TruthCheck,Label,SimpleCall,SlotConstant,Label,SimpleCall,SlotConstant,Label] , @stats
+      check_array [SlotMove,TruthCheck,Label,SimpleCall,ArgumentTransfer,MessageSetup,Label,SimpleCall,ArgumentTransfer,MessageSetup,Label] , @stats
     end
   end
 end

test/vool/to_mom/send/simple_send_harness.rb

@@ -0,0 +1,31 @@
+module Vool
+  # relies on @stats and receiver_type method
+  module SimpleSendHarness
+    def test_compiles_not_array
+      assert Array != @stats.class , @stats
+    end
+    def test_class_compiles
+      assert_equal Mom::MessageSetup , @stats.first.class , @stats
+    end
+    def test_two_instructions_are_returned
+      assert_equal 3 ,  @stats.length
+    end
+    def test_receiver_move_class
+      assert_equal Mom::ArgumentTransfer,  @stats[1].class
+    end
+    def test_receiver_move
+      assert_equal :receiver,  @stats[1].receiver.left[2]
+    end
+    def test_receiver
+      type , value = receiver
+      assert_equal type,  @stats[1].receiver.right.class
+      assert_equal value,  @stats[1].receiver.right.value
+    end
+    def test_call_is
+        assert_equal Mom::SimpleCall,  @stats[2].class
+    end
+    def test_call_has_method
+      assert_equal Parfait::TypedMethod,  @stats[2].method.class
+    end
+  end
+end

test/vool/to_mom/send/test_send_self.rb

@@ -1,8 +1,10 @@
 require_relative "../helper"
+require_relative "simple_send_harness"
 
 module Vool
   class TestSendSelfMom < MiniTest::Test
     include MomCompile
+    include SimpleSendHarness
 
     def do_setup(str)
       Risc.machine.boot
@@ -13,30 +15,10 @@ module Vool
       do_setup("self.get_internal_word(0)")
     end
 
-    def test_compiles
-      assert_equal Mom::Statements , @stats.class , @stats
-    end
-    def test_compile_starts_with_setup
-      assert_equal Mom::MessageSetup , @stats[0].class , @stats
-    end
-    def test_compile_continues_with_transfer
-      assert_equal Mom::ArgumentTransfer , @stats[1].class , @stats
-    end
-    def test_method_is_set
-      assert @first.method
-    end
-    def test_three_instructions_are_returned
-      assert_equal 3 ,  @stats.length
-    end
-    def test_arg_transfers
-      assert_equal Mom::ArgumentTransfer,  @stats[1].class
-    end
-    def test_receiver_move
-      assert_equal Mom::SlotMove,  @stats[1].receiver.class
-    end
-    def test_receiver_self
+    def test_receiver
       assert_equal SelfStatement,  @stats[1].receiver.right.class
     end
+
     def test_arg_one
       assert_equal Mom::SlotConstant,  @stats[1].arguments[0].class
     end

test/vool/to_mom/send/test_send_simple.rb

@@ -1,45 +1,22 @@
 require_relative "../helper"
+require_relative "simple_send_harness"
 
 module Vool
   class TestSendSimpleMom < MiniTest::Test
     include MomCompile
+    include SimpleSendHarness
 
     def setup
       Risc.machine.boot
       @stats = compile_first_method( "5.mod4").first
       @first = @stats.first
     end
-
-    def test_compiles_not_array
-      assert Array != @stats.class , @stats
-    end
-    def test_class_compiles
-      assert_equal Mom::SlotConstant , @first.class , @stats
-    end
-    def test_slot_is_set
-      assert @stats.first.left
-    end
-    def test_two_instructions_are_returned
-      assert_equal 2 ,  @stats.length
-    end
-    def test_receiver_move_class
-      assert_equal Mom::SlotConstant,  @first.class
-    end
-    def test_receiver_move
-      assert_equal :receiver,  @first.left[2]
-    end
-    def test_receiver
-      assert_equal IntegerStatement,  @first.right.class
-      assert_equal 5,  @stats.first.right.value
-    end
-    def test_call_is
-      assert_equal Mom::SimpleCall,  @stats[1].class
-    end
-    def test_call_has_method
-      assert_equal Parfait::TypedMethod,  @stats[1].method.class
+    def receiver
+      [IntegerStatement , 5]
     end
     def test_call_has_right_method
-      assert_equal :mod4,  @stats[1].method.name
+      assert_equal :mod4,  @stats[2].method.name
     end
+
   end
 end

test/vool/to_mom/send/test_send_simple_args.rb

@@ -1,57 +1,26 @@
 require_relative "../helper"
+require_relative "simple_send_harness"
 
 module Vool
   class TestSendSimpleArgsMom < MiniTest::Test
     include MomCompile
+    include SimpleSendHarness
 
     def setup
       Risc.machine.boot
       @stats = compile_first_method( "5.mod4(1,2)").first
     end
 
-    def test_stats
-      assert_equal Mom::Statements , @stats.class
-    end
-    def test_class_compiles
-      assert_equal Mom::SlotConstant , @stats.first.class , @stats
-    end
-    def test_four_instructions_are_returned
-      assert_equal 4 ,  @stats.length
-    end
-    def test_receiver_move
-      assert_equal Mom::SlotConstant,  @stats[0].class
-      assert_equal :receiver,  @stats[0].left[2]
-    end
-    def test_receiver
-      assert_equal IntegerStatement,  @stats[0].right.class
-      assert_equal 5,  @stats[0].right.value
-    end
-    def test_args_one_move
-      assert_equal :next_message, @stats[1].left[1]
-      assert_equal :arguments,    @stats[1].left[2]
-      assert_equal 0 ,    @stats[1].left[3]
-    end
-    def test_args_one_int
-      assert_equal IntegerStatement, @stats[1].right.class
-      assert_equal 1,    @stats[1].right.value
+    def receiver
+      [IntegerStatement , 5]
     end
     def test_args_two_move
-      assert_equal :next_message, @stats[2].left[1]
-      assert_equal :arguments,  @stats[2].left[2]
-      assert_equal 1 ,  @stats[2].left[3]
+      assert_equal :next_message, @stats[1].arguments[1].left[1]
+      assert_equal :arguments,    @stats[1].arguments[1].left[2]
     end
-    def test_args_two_int
-      assert_equal IntegerStatement,  @stats[2].right.class
-      assert_equal 2,    @stats[2].right.value
-    end
-    def test_call_is
-      assert_equal Mom::SimpleCall,  @stats[3].class
-    end
-    def test_call_has_method
-      assert_equal Parfait::TypedMethod ,  @stats[3].method.class
-    end
-    def test_call_has_right_method
-      assert_equal :mod4,  @stats[3].method.name
+    def test_args_two_str
+      assert_equal IntegerStatement,    @stats[1].arguments[1].right.class
+      assert_equal 2,    @stats[1].arguments[1].right.value
     end
   end
 end

test/vool/to_mom/send/test_send_simple_string.rb

@@ -1,48 +1,27 @@
 require_relative "../helper"
+require_relative "simple_send_harness"
 
 module Vool
   class TestSendSimpleStringArgsMom < MiniTest::Test
     include MomCompile
+    include SimpleSendHarness
 
     def setup
       Risc.machine.boot
       @stats = compile_first_method( "'5'.get_internal_byte(1)").first
       @first = @stats.first
     end
+    def receiver
+      [StringStatement , "5"]
+    end
 
-    def test_compiles_not_array
-      assert Array != @stats.class , @stats
-    end
-    def test_class_compiles
-      assert_equal Mom::SlotConstant , @first.class , @stats
-    end
-    def test_four_instructions_are_returned
-      assert_equal 3 ,  @stats.length
-    end
-    def test_receiver_move
-      assert_equal Mom::SlotConstant,  @stats.first.class
-      assert_equal :receiver,  @first.left[2]
-    end
-    def test_receiver
-      assert_equal StringStatement,  @stats[0].right.class
-      assert_equal "5",  @first.right.value
-    end
     def test_args_one_move
-      assert_equal :next_message, @stats[1].left[1]
-      assert_equal :arguments,    @stats[1].left[2]
+      assert_equal :next_message, @stats[1].arguments[0].left[1]
+      assert_equal :arguments,    @stats[1].arguments[0].left[2]
     end
-    def test_args_one_int
-      assert_equal IntegerStatement,    @stats[1].right.class
-      assert_equal 1,    @stats[1].right.value
-    end
-    def test_call_is
-      assert_equal Mom::SimpleCall,  @stats[2].class
-    end
-    def test_call_has_method
-      assert_equal Parfait::TypedMethod ,  @stats[2].method.class
-    end
-    def test_call_has_right_method
-      assert_equal :get_internal_byte,  @stats[2].method.name
+    def test_args_one_str
+      assert_equal IntegerStatement,    @stats[1].arguments[0].right.class
+      assert_equal 1,    @stats[1].arguments[0].right.value
     end
   end
 end