split rubyx tests

in vool and mom level

test/risc/test_risc_compiler.rb

@@ -2,7 +2,7 @@ require_relative "helper"
 
 module Risc
   class TestRiscCompiler < MiniTest::Test
-    include CompilerHelper
+    include ScopeHelper
 
     def setup
       Risc.machine.boot

test/rubyx/helper.rb

@@ -0,0 +1,20 @@
+require_relative "../helper"
+
+module RubyX
+  module RubyXHelper
+    def setup
+      Risc.machine.boot
+    end
+    def ruby_to_vool(input)
+      RubyXCompiler.ruby_to_vool(input)
+    end
+    def compile_in_test input
+      vool = ruby_to_vool in_Test(input)
+      vool.to_mom(nil)
+      itest = Parfait.object_space.get_class_by_name(:Test)
+      assert itest
+      itest
+    end
+
+  end
+end

test/rubyx/ruby_compiler/test_class_statement.rb

@@ -27,7 +27,7 @@ module Vool
 
   end
   class TestBasicClassStatement < MiniTest::Test
-    include CompilerHelper
+    include ScopeHelper
     include RubyTests
 
     def test_compile_one_method

test/rubyx/test_rubyx_compiler.rb

@@ -1,20 +1,9 @@
-require_relative "../helper"
+require_relative "helper"
 
 module RubyX
-  class TestClassCompiler < MiniTest::Test
-    include CompilerHelper
-
-    def setup
-      Risc.machine.boot
-    end
-
-    def compile_in_test input
-      vool = RubyXCompiler.ruby_to_vool in_Test(input)
-      vool.to_mom(nil)
-      itest = Parfait.object_space.get_class_by_name(:Test)
-      assert itest
-      itest
-    end
+  class TestVoolCompiler < MiniTest::Test
+    include ScopeHelper
+    include RubyXHelper
 
     def test_compile_class_one
       itest = compile_in_test "def meth; @ivar = 5; end"
@@ -28,49 +17,26 @@ module RubyX
 
     def test_doesnt_create_existing_clas
       space_class = Parfait.object_space.get_class_by_name(:Space)
-      RubyXCompiler.ruby_to_vool "class Space ; end"
+      ruby_to_vool "class Space ; end"
       clazz = Parfait.object_space.get_class_by_name(:Space)
       assert_equal clazz , space_class
     end
 
     def test_class_body_is_scope
-      clazz = RubyXCompiler.ruby_to_vool in_Test("def meth; @ivar = 5 ;end")
+      clazz = ruby_to_vool in_Test("def meth; @ivar = 5 ;end")
       assert_equal Vool::MethodStatement , clazz.body.class
     end
 
-    def test_creates_class_without_deriviation
-      vool = RubyXCompiler.ruby_to_vool "class Testing ; end"
-      vool.to_mom(nil)
-      clazz = Parfait.object_space.get_class_by_name(:Testing)
-      assert clazz , "No classes created"
-      assert_equal :Object , clazz.super_class_name
-    end
-
-    def test_creates_class_deriviation
-      vool = RubyXCompiler.ruby_to_vool "class Testing ; end"
-      mom = vool.to_mom(nil)
-      assert_equal Vool::ClassStatement , vool.class
-      #assert mom , "No classes created"
-    end
-
-    def test_creates_class_with_deriviation
-      vool = RubyXCompiler.ruby_to_vool  "class Test2 < List ;end"
-      vool.to_mom(nil)
-      clazz = Parfait.object_space.get_class_by_name(:Test2)
-      assert clazz, "No classes created"
-      assert_equal :List , clazz.super_class_name
-    end
-
     def test_space_is_unchanged_by_compile
       space1 = Parfait.object_space.get_class_by_name(:Space)
-      RubyXCompiler.ruby_to_vool  "class Space ;end"
+      ruby_to_vool  "class Space ;end"
       space2 = Parfait.object_space.get_class_by_name(:Space)
       assert_equal space1 , space2
     end
 
     def test_space_type_is_unchanged_by_compile
       space1 = Parfait.object_space.get_class_by_name(:Space).instance_type
-      RubyXCompiler.ruby_to_vool  "class Space ;end"
+      ruby_to_vool  "class Space ;end"
       space2 = Parfait.object_space.get_class_by_name(:Space).instance_type
       assert_equal space1 , space2
     end

test/rubyx/test_rubyx_compiler1.rb

@@ -0,0 +1,45 @@
+require_relative "../helper"
+
+module RubyX
+  class TestVoolCompiler < MiniTest::Test
+    include ScopeHelper
+
+    def setup
+      Risc.machine.boot
+    end
+    def ruby_to_vool(input)
+      RubyXCompiler.ruby_to_vool(input)
+    end
+
+    def test_creates_class_without_deriviation
+      vool = ruby_to_vool "class Testing ; end"
+      vool.to_mom(nil)
+      clazz = Parfait.object_space.get_class_by_name(:Testing)
+      assert clazz , "No classes created"
+      assert_equal :Object , clazz.super_class_name
+    end
+
+    def test_creates_class_deriviation
+      vool = ruby_to_vool "class Testing ; end"
+      mom = vool.to_mom(nil)
+      assert_equal Vool::ClassStatement , vool.class
+      #assert mom , "No classes created"
+    end
+
+    def test_creates_class_with_deriviation
+      vool = ruby_to_vool  "class Test2 < List ;end"
+      vool.to_mom(nil)
+      clazz = Parfait.object_space.get_class_by_name(:Test2)
+      assert clazz, "No classes created"
+      assert_equal :List , clazz.super_class_name
+    end
+
+    def test_space_type_is_unchanged_by_compile
+      space1 = Parfait.object_space.get_class_by_name(:Space).instance_type
+      ruby_to_vool  "class Space ;end"
+      space2 = Parfait.object_space.get_class_by_name(:Space).instance_type
+      assert_equal space1 , space2
+    end
+
+  end
+end

test/support/compiling.rb

@@ -1,5 +1,5 @@
 
-module CompilerHelper
+module ScopeHelper
 
   def in_Test(statements)
     "class Test ; #{statements} ; end"
@@ -19,7 +19,7 @@ module CompilerHelper
 end
 
 module MomCompile
-  include CompilerHelper
+  include ScopeHelper
 
   def compile_first_method( input )
     # works a lot like Vool.ruby_to_vool

test/support/risc_interpreter.rb

@@ -4,7 +4,7 @@ require_relative "compiling"
 
 module Risc
   module Ticker
-    include CompilerHelper
+    include ScopeHelper
 
     def setup
       Risc.machine.boot