From 66f359a14fbbe3da96b4b9b3581ab2fc53cc9e70 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Tue, 3 Jan 2017 22:18:41 +0200 Subject: [PATCH] move expression tests to standard dir for guard --- test/register/test_collector.rb | 2 +- test/typed/expressions/helper.rb | 21 ------------------- test/typed/expressions/test_all.rb | 5 ----- test/typed/method_compiler/helper.rb | 19 +++++++++++++++++ test/typed/method_compiler/test_all.rb | 7 +++++++ .../test_basic.rb | 0 .../test_call.rb | 0 .../test_field_access.rb | 0 .../test_ops.rb | 0 .../test_vars.rb | 0 test/typed/test_all.rb | 2 -- 11 files changed, 27 insertions(+), 29 deletions(-) delete mode 100644 test/typed/expressions/helper.rb delete mode 100644 test/typed/expressions/test_all.rb rename test/typed/{expressions => method_compiler}/test_basic.rb (100%) rename test/typed/{expressions => method_compiler}/test_call.rb (100%) rename test/typed/{expressions => method_compiler}/test_field_access.rb (100%) rename test/typed/{expressions => method_compiler}/test_ops.rb (100%) rename test/typed/{expressions => method_compiler}/test_vars.rb (100%) diff --git a/test/register/test_collector.rb b/test/register/test_collector.rb index 53e6ce11..3d687b0c 100644 --- a/test/register/test_collector.rb +++ b/test/register/test_collector.rb @@ -5,7 +5,7 @@ module Register def test_simple_collect Machine.new.boot objects = Register::Collector.collect_space - assert ((352 == objects.length) or (419 == objects.length)) , objects.length.to_s + assert ((352 == objects.length) or (420 == objects.length)) , objects.length.to_s end end end diff --git a/test/typed/expressions/helper.rb b/test/typed/expressions/helper.rb deleted file mode 100644 index 45484f7b..00000000 --- a/test/typed/expressions/helper.rb +++ /dev/null @@ -1,21 +0,0 @@ -require_relative '../helper' - -module ExpressionHelper - - def check - Register.machine.boot unless Register.machine.booted - compiler = Typed::MethodCompiler.new Parfait.object_space.get_main - code = Typed.ast_to_code @input - assert code.to_s , @input - produced = compiler.process( code ) - assert @output , "No output given" - assert_equal produced.class , @output , "Wrong class" - produced - end - - # test hack to in place change object type - def add_space_field(name,type) - class_type = Parfait.object_space.get_class_by_name(:Space).instance_type - class_type.send(:private_add_instance_variable, name , type) - end -end diff --git a/test/typed/expressions/test_all.rb b/test/typed/expressions/test_all.rb deleted file mode 100644 index 5f9e5bbf..00000000 --- a/test/typed/expressions/test_all.rb +++ /dev/null @@ -1,5 +0,0 @@ -require_relative "test_basic" -require_relative "test_call" -require_relative "test_field_access" -require_relative "test_ops" -require_relative "test_vars" diff --git a/test/typed/method_compiler/helper.rb b/test/typed/method_compiler/helper.rb index ea4949c2..5488691e 100644 --- a/test/typed/method_compiler/helper.rb +++ b/test/typed/method_compiler/helper.rb @@ -1,5 +1,24 @@ require_relative '../helper' +module ExpressionHelper + + def check + Register.machine.boot unless Register.machine.booted + compiler = Typed::MethodCompiler.new Parfait.object_space.get_main + code = Typed.ast_to_code @input + assert code.to_s , @input + produced = compiler.process( code ) + assert @output , "No output given" + assert_equal produced.class , @output , "Wrong class" + produced + end + + # test hack to in place change object type + def add_space_field(name,type) + class_type = Parfait.object_space.get_class_by_name(:Space).instance_type + class_type.send(:private_add_instance_variable, name , type) + end +end module Statements include AST::Sexp diff --git a/test/typed/method_compiler/test_all.rb b/test/typed/method_compiler/test_all.rb index 632c2a7b..4e617291 100644 --- a/test/typed/method_compiler/test_all.rb +++ b/test/typed/method_compiler/test_all.rb @@ -1,3 +1,4 @@ +#statements require_relative "test_assign" require_relative "test_call_site" require_relative "test_class" @@ -5,3 +6,9 @@ require_relative "test_fields" require_relative "test_if" require_relative "test_return" require_relative "test_while" +#expressions +require_relative "test_basic" +require_relative "test_call" +require_relative "test_field_access" +require_relative "test_ops" +require_relative "test_vars" diff --git a/test/typed/expressions/test_basic.rb b/test/typed/method_compiler/test_basic.rb similarity index 100% rename from test/typed/expressions/test_basic.rb rename to test/typed/method_compiler/test_basic.rb diff --git a/test/typed/expressions/test_call.rb b/test/typed/method_compiler/test_call.rb similarity index 100% rename from test/typed/expressions/test_call.rb rename to test/typed/method_compiler/test_call.rb diff --git a/test/typed/expressions/test_field_access.rb b/test/typed/method_compiler/test_field_access.rb similarity index 100% rename from test/typed/expressions/test_field_access.rb rename to test/typed/method_compiler/test_field_access.rb diff --git a/test/typed/expressions/test_ops.rb b/test/typed/method_compiler/test_ops.rb similarity index 100% rename from test/typed/expressions/test_ops.rb rename to test/typed/method_compiler/test_ops.rb diff --git a/test/typed/expressions/test_vars.rb b/test/typed/method_compiler/test_vars.rb similarity index 100% rename from test/typed/expressions/test_vars.rb rename to test/typed/method_compiler/test_vars.rb diff --git a/test/typed/test_all.rb b/test/typed/test_all.rb index 4eb9bdb3..2b12b39d 100644 --- a/test/typed/test_all.rb +++ b/test/typed/test_all.rb @@ -2,8 +2,6 @@ require_relative "parfait/test_all" require_relative "type/test_all" -require_relative "expressions/test_all" - require_relative "method_compiler/test_all" require_relative "test_to_code"