rearranges test helper modules

test/helper.rb

@@ -20,82 +20,4 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'test'))
 
 require 'rubyx'
 
-module Compiling
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-  def clean_compile(clazz_name , method_name , args , statements)
-    compiler = Vm::MethodCompiler.create_method(clazz_name,method_name,args ).init_method
-    compiler.process( Vm.ast_to_code( statements ) )
-  end
-
-end
-
-module Risc
-  # relies on @interpreter instance to be set up during setup
-  module InterpreterHelpers
-
-    def check_chain should
-      should.each_with_index do |name , index|
-        got = ticks(1)
-        assert_equal got.class ,name , "Wrong class for #{index+1}, expect #{name} , got #{got}"
-      end
-    end
-
-    def check_return val
-      assert_equal Parfait::Message , @interpreter.get_register(:r0).class
-      assert_equal val , @interpreter.get_register(:r0).return_value
-    end
-
-    def ticks num
-      last = nil
-      num.times do
-        last = @interpreter.instruction
-        @interpreter.tick
-      end
-      return last
-    end
-
-    def show_ticks
-      classes = []
-      tick = 1
-      begin
-        while true and (classes.length < 200)
-          cl = ticks(1).class
-          tick += 1
-          classes << cl
-          break if cl == NilClass
-        end
-      rescue => e
-        puts "Error at tick #{tick}"
-        puts e
-        puts e.backtrace
-      end
-      str = classes.to_s.gsub("Risc::","")
-      str.split(",").each_slice(5).each do |line|
-        puts "            " + line.join(",") + ","
-      end
-      puts "length = #{classes.length}"
-      exit(1)
-    end
-  end
-end
-
-
-class Ignored
-  def == other
-    return false unless other.class == self.class
-    Sof::Util.attributes(self).each do |a|
-      begin
-        left = send(a)
-      rescue NoMethodError
-        next  # not using instance variables that are not defined as attr_readers for equality
-      end
-      begin
-        right = other.send(a)
-      rescue NoMethodError
-        return false
-      end
-      return false unless left.class == right.class
-      return false unless left == right
-    end
-    return true
-  end
-end

test/mom/test_assignment.rb

@@ -0,0 +1,11 @@
+require_relative "helper"
+
+module Mom
+  class TestAssignemnt < MiniTest::Test
+    include CompilerHelper
+
+    def test_class_exists
+      assert Instruction.new
+    end
+  end
+end

test/risc/interpreter/test_called_if.rb

@@ -3,7 +3,7 @@ require_relative "helper"
 module Risc
   class IfCalledTest < MiniTest::Test
     include Ticker
-    include Compiling
+    include CleanCompile
 
     def setup
       @string_input = <<HERE

test/risc/interpreter/test_simple_if.rb

@@ -3,7 +3,7 @@ require_relative "helper"
 module Risc
   class IfSimpleTest < MiniTest::Test
     include Ticker
-    include Compiling
+    include CleanCompile
 
     def setup
       @string_input = <<HERE

test/support/compiling.rb

@@ -0,0 +1,47 @@
+
+module CompilerHelper
+
+  def in_Test(statements)
+    "class Test ; #{statements} ; end"
+  end
+
+  def in_Space(statements)
+    "class Space ; #{statements} ; end"
+  end
+
+  def as_main(statements)
+    in_Space("def main ; #{statements}; end")
+  end
+end
+
+
+module CleanCompile
+  def clean_compile(clazz_name , method_name , args , statements)
+    compiler = Vm::MethodCompiler.create_method(clazz_name,method_name,args ).init_method
+    compiler.process( Vm.ast_to_code( statements ) )
+  end
+
+end
+
+
+
+class Ignored
+  def == other
+    return false unless other.class == self.class
+    Sof::Util.attributes(self).each do |a|
+      begin
+        left = send(a)
+      rescue NoMethodError
+        next  # not using instance variables that are not defined as attr_readers for equality
+      end
+      begin
+        right = other.send(a)
+      rescue NoMethodError
+        return false
+      end
+      return false unless left.class == right.class
+      return false unless left == right
+    end
+    return true
+  end
+end

test/support/risc.rb

@@ -0,0 +1,49 @@
+module Risc
+  # relies on @interpreter instance to be set up during setup
+  module InterpreterHelpers
+
+    def check_chain should
+      should.each_with_index do |name , index|
+        got = ticks(1)
+        assert_equal got.class ,name , "Wrong class for #{index+1}, expect #{name} , got #{got}"
+      end
+    end
+
+    def check_return val
+      assert_equal Parfait::Message , @interpreter.get_register(:r0).class
+      assert_equal val , @interpreter.get_register(:r0).return_value
+    end
+
+    def ticks num
+      last = nil
+      num.times do
+        last = @interpreter.instruction
+        @interpreter.tick
+      end
+      return last
+    end
+
+    def show_ticks
+      classes = []
+      tick = 1
+      begin
+        while true and (classes.length < 200)
+          cl = ticks(1).class
+          tick += 1
+          classes << cl
+          break if cl == NilClass
+        end
+      rescue => e
+        puts "Error at tick #{tick}"
+        puts e
+        puts e.backtrace
+      end
+      str = classes.to_s.gsub("Risc::","")
+      str.split(",").each_slice(5).each do |line|
+        puts "            " + line.join(",") + ","
+      end
+      puts "length = #{classes.length}"
+      exit(1)
+    end
+  end
+end

test/vm/method_compiler/helper.rb

@@ -26,7 +26,7 @@ module Risc
 
   module Statements
     include AST::Sexp
-    include Compiling
+    include CleanCompile
     include SpaceHack
 
     def setup

test/vool/helper.rb

@@ -1,18 +1 @@
 require_relative "../helper"
-
-module Vool
-  module CompilerHelper
-
-    def in_Test(statements)
-      "class Test ; #{statements} ; end"
-    end
-
-    def in_Space(statements)
-      "class Space ; #{statements} ; end"
-    end
-
-    def as_main(statements)
-      in_Space("def main ; #{statements}; end")
-    end
-  end
-end