ruby-x/rubyx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix all the test

Browse Source 
many are off course affected by call sequence changes
This commit is contained in:
Torsten Ruger
2015-11-07 22:20:21 +02:00
parent 5ddc96718b
commit f11e8f0a13
20 changed files with 112 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/interpreter/test_add.rb
View File

@ -30,12 +30,12 @@ class AddTest < MiniTest::Test
assert Integer , @interpreter.get_register( :r2 ).class
end
def test_transfer
transfer = ticks 8
transfer = ticks 16
assert_equal Register::RegisterTransfer , transfer.class
assert_equal @interpreter.get_register(transfer.to) , @interpreter.get_register(transfer.from)
end
def test_call
ret = ticks(18)
ret = ticks(15)
assert_equal Register::FunctionReturn , ret.class
object = @interpreter.get_register( ret.register )
@ -44,7 +44,7 @@ class AddTest < MiniTest::Test
assert_equal Register::Label , link.class
end
def test_adding
done_op = ticks(13)
done_op = ticks(12)
assert_equal Register::OperatorInstruction , done_op.class
left = @interpreter.get_register(done_op.left)
rr = done_op.right
@ -53,7 +53,7 @@ class AddTest < MiniTest::Test
assert_equal Fixnum , right.class
assert_equal 7 , right
assert_equal 12 , left
done_tr = ticks(3)
done_tr = ticks(4)
assert_equal Register::RegisterTransfer , done_tr.class
result = @interpreter.get_register(done_op.left)
assert_equal result , 12
@ -62,10 +62,9 @@ class AddTest < MiniTest::Test
def test_chain
#show_ticks # get output of what is
["Branch","Label","LoadConstant","GetSlot","SetSlot",
"LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"LoadConstant","LoadConstant","OperatorInstruction","SetSlot","Label",
"RegisterTransfer","GetSlot","FunctionReturn","RegisterTransfer","Syscall",
"NilClass"].each_with_index do |name , index|
"LoadConstant","SetSlot","FunctionCall","Label","LoadConstant",
"LoadConstant","OperatorInstruction","SetSlot","Label","FunctionReturn",
"RegisterTransfer","Syscall","NilClass"].each_with_index do |name , index|
got = ticks(1)
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
end

20
test/interpreter/test_if.rb
View File

@ -30,18 +30,18 @@ HERE
@interpreter.start Register.machine.init
#show_ticks # get output of what is
["Branch","Label","LoadConstant","GetSlot","SetSlot",
"LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"GetSlot","GetSlot","SetSlot","LoadConstant","SetSlot",
"LoadConstant","SetSlot","FunctionCall","Label","GetSlot",
"GetSlot","SetSlot","LoadConstant","SetSlot","LoadConstant",
"SetSlot","LoadConstant","SetSlot","LoadConstant","SetSlot",
"RegisterTransfer","FunctionCall","Label","GetSlot","LoadConstant",
"OperatorInstruction","IsZero","GetSlot","LoadConstant","SetSlot",
"LoadConstant","SetSlot","LoadConstant","SetSlot","LoadConstant",
"SetSlot","RegisterTransfer","FunctionCall","Label","GetSlot",
"LoadConstant","OperatorInstruction","IsZero","GetSlot","LoadConstant",
"SetSlot","LoadConstant","SetSlot","LoadConstant","SetSlot",
"LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"GetSlot","RegisterTransfer","Syscall","RegisterTransfer","RegisterTransfer",
"SetSlot","Label","RegisterTransfer","GetSlot","FunctionReturn",
"GetSlot","Branch","Label","Label","RegisterTransfer",
"GetSlot","FunctionReturn","GetSlot","Label","RegisterTransfer",
"GetSlot","FunctionReturn","RegisterTransfer","Syscall","NilClass"].each_with_index do |name , index|
"RegisterTransfer","Syscall","RegisterTransfer","RegisterTransfer","SetSlot",
"Label","FunctionReturn","RegisterTransfer","GetSlot","GetSlot",
"Branch","Label","Label","FunctionReturn","RegisterTransfer",
"GetSlot","GetSlot","Label","FunctionReturn","RegisterTransfer",
"Syscall","NilClass"].each_with_index do |name , index|
got = ticks(1)
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
end

47
test/interpreter/test_puti.rb
View File

@ -57,33 +57,32 @@ HERE
@interpreter.start Register.machine.init
#show_ticks # get output of what is
["Branch","Label","LoadConstant","GetSlot","SetSlot",
"LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"GetSlot","LoadConstant","SetSlot","LoadConstant","SetSlot",
"LoadConstant","SetSlot","LoadConstant","SetSlot","RegisterTransfer",
"FunctionCall","Label","LoadConstant","GetSlot","SetSlot",
"GetSlot","GetSlot","SetSlot","LoadConstant","SetSlot",
"LoadConstant","SetSlot","GetSlot","GetSlot","SetSlot",
"LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"GetSlot","LoadConstant","OperatorInstruction","GetSlot","SetSlot",
"GetSlot","GetSlot","GetSlot","OperatorInstruction","GetSlot",
"SetSlot","GetSlot","GetSlot","IsNotzero","Label",
"GetSlot","GetSlot","SetSlot","LoadConstant","SetSlot",
"LoadConstant","SetSlot","GetSlot","GetSlot","SetSlot",
"LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"GetSlot","LoadConstant","OperatorInstruction","IsZero","Branch",
"LoadConstant","SetSlot","FunctionCall","Label","GetSlot",
"LoadConstant","SetSlot","LoadConstant","SetSlot","LoadConstant",
"SetSlot","LoadConstant","SetSlot","RegisterTransfer","FunctionCall",
"Label","LoadConstant","GetSlot","SetSlot","GetSlot",
"GetSlot","SetSlot","LoadConstant","SetSlot","LoadConstant",
"SetSlot","GetSlot","GetSlot","SetSlot","LoadConstant",
"SetSlot","RegisterTransfer","FunctionCall","Label","GetSlot",
"LoadConstant","OperatorInstruction","GetSlot","SetSlot","GetSlot",
"GetSlot","GetSlot","OperatorInstruction","GetSlot","SetSlot",
"GetSlot","GetSlot","IsNotzero","Label","GetSlot",
"GetSlot","SetSlot","LoadConstant","SetSlot","LoadConstant",
"SetSlot","GetSlot","GetSlot","SetSlot","LoadConstant",
"SetSlot","RegisterTransfer","FunctionCall","Label","GetSlot",
"LoadConstant","OperatorInstruction","IsZero","Branch","Label",
"GetSlot","LoadConstant","OperatorInstruction","IsZero","Label",
"LoadConstant","SetSlot","Label","GetSlot","LoadConstant",
"OperatorInstruction","IsZero","Label","LoadConstant","SetSlot",
"Label","GetSlot","LoadConstant","OperatorInstruction","IsZero",
"Label","LoadConstant","SetSlot","Label","GetSlot",
"LoadConstant","OperatorInstruction","IsZero","Label","LoadConstant",
"SetSlot","Label","GetSlot","LoadConstant","OperatorInstruction",
"IsZero","Label","LoadConstant","SetSlot","Label",
"GetSlot","LoadConstant","OperatorInstruction","IsZero","Label",
"LoadConstant","SetSlot","Label","Label","RegisterTransfer",
"GetSlot","FunctionReturn","GetSlot","GetSlot","SetSlot",
"Label","GetSlot","SetSlot","Label","RegisterTransfer",
"GetSlot","FunctionReturn","GetSlot","SetSlot","Label",
"RegisterTransfer","GetSlot","FunctionReturn","GetSlot","Label",
"RegisterTransfer","GetSlot","FunctionReturn","RegisterTransfer","Syscall",
"NilClass"].each_with_index do |name , index|
"SetSlot","Label","Label","FunctionReturn","RegisterTransfer",
"GetSlot","GetSlot","GetSlot","SetSlot","Label",
"GetSlot","SetSlot","Label","FunctionReturn","RegisterTransfer",
"GetSlot","GetSlot","SetSlot","Label","FunctionReturn",
"RegisterTransfer","GetSlot","GetSlot","Label","FunctionReturn",
"RegisterTransfer","Syscall"].each_with_index do |name , index|
got = ticks(1)
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
end

29
test/interpreter/test_puts.rb
View File

@ -38,27 +38,22 @@ class TestPuts < MiniTest::Test
def test_get
assert_equal Register::GetSlot , ticks(4).class
assert @interpreter.get_register( :r1 )
assert Integer , @interpreter.get_register( :r1 ).class
end
def test_transfer
transfer = ticks 8
assert_equal Register::RegisterTransfer , transfer.class
assert_equal @interpreter.get_register(transfer.to) , @interpreter.get_register(transfer.from)
assert Integer , @interpreter.get_register( :r1 ).class
end
def test_call
assert_equal Register::FunctionCall , ticks(9).class
assert_equal Register::FunctionCall , ticks(8).class
end
def test_chain
#show_ticks # get output of what is
["Branch","Label","LoadConstant","GetSlot","SetSlot",
"LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"GetSlot","LoadConstant","SetSlot","LoadConstant","SetSlot",
"LoadConstant","SetSlot","LoadConstant","SetSlot","RegisterTransfer",
"FunctionCall","Label","GetSlot","RegisterTransfer","Syscall",
"RegisterTransfer","RegisterTransfer","SetSlot","Label","RegisterTransfer",
"GetSlot","FunctionReturn","GetSlot","Label","RegisterTransfer",
"GetSlot","FunctionReturn","RegisterTransfer","Syscall","NilClass"].each_with_index do |name , index|
"LoadConstant","SetSlot","FunctionCall","Label","GetSlot",
"LoadConstant","SetSlot","LoadConstant","SetSlot","LoadConstant",
"SetSlot","LoadConstant","SetSlot","RegisterTransfer","FunctionCall",
"Label","GetSlot","RegisterTransfer","Syscall","RegisterTransfer",
"RegisterTransfer","SetSlot","Label","FunctionReturn","RegisterTransfer",
"GetSlot","GetSlot","Label","FunctionReturn","RegisterTransfer",
"Syscall","NilClass"].each_with_index do |name , index|
got = ticks(1)
#puts "TICK #{index}"
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
@ -66,20 +61,20 @@ class TestPuts < MiniTest::Test
end
def test_putstring
done = ticks(25)
done = ticks(24)
assert_equal Register::Syscall , done.class
assert_equal "Hello again" , @interpreter.stdout
end
def test_return
done = ticks(32)
done = ticks(29)
assert_equal Register::FunctionReturn , done.class
assert Register::Label , @interpreter.instruction.class
assert @interpreter.instruction.is_a?(Register::Instruction) , "not instruction #{@interpreter.instruction}"
end
def test_exit
done = ticks(40)
done = ticks(42)
assert_equal NilClass , done.class
assert_equal "Hello again" , @interpreter.stdout
end