diff --git a/test/risc/position/test_position.rb b/test/risc/position/test_position.rb index 03bf834b..42b360f1 100644 --- a/test/risc/position/test_position.rb +++ b/test/risc/position/test_position.rb @@ -14,6 +14,7 @@ module Risc assert !@pos.valid? end def test_next_slot + Parfait.boot! mov = Arm::ArmMachine.mov(:r1 , :r1) position = Position.new(mov ).set(0) assert_equal 4, position.next_slot diff --git a/test/ruby/test_send_statement.rb b/test/ruby/test_send_statement.rb index 4ab19949..ebb3963e 100644 --- a/test/ruby/test_send_statement.rb +++ b/test/ruby/test_send_statement.rb @@ -61,22 +61,4 @@ module Ruby assert_nil lst.name end end - class TestSendReceiverType < MiniTest::Test - include RubyTests - - def setup - Parfait.boot! - end - - def test_int_receiver - sent = compile( "5.div4") - assert_equal Parfait::Type , sent.receiver.ct_type.class - assert_equal "Integer_Type" , sent.receiver.ct_type.name - end - def test_string_receiver - sent = compile( "'5'.putstring") - assert_equal Parfait::Type , sent.receiver.ct_type.class - assert_equal "Word_Type" , sent.receiver.ct_type.name - end - end end diff --git a/test/support/compiling.rb b/test/support/compiling.rb index a5033068..a6b2cf82 100644 --- a/test/support/compiling.rb +++ b/test/support/compiling.rb @@ -39,7 +39,7 @@ module MomCompile end def compile_first_block( block_input , method_input = "main_local = 5") source = "#{method_input} ; self.main{|val| #{block_input}}" - vool = RubyX::RubyCompiler.compile( as_test_main(source) ).normalize + vool = Ruby::RubyCompiler.compile( as_test_main(source) ).to_vool mom_c = vool.to_mom(nil) compiler = mom_c.method_compilers.find{|c| c.get_method.name == :main and c.get_method.self_type.object_class.name == :Test} block = nil