organise tests to where they belong

test/risc/test_assembler.rb

@@ -6,29 +6,23 @@ module Risc
     def setup
       @machine = Risc.machine.boot
     end
-    def test_no_object
+    def pest_no_object
       @assembler = Assembler.new(@machine , {})
-      assert @machine.translate_arm
     end
-    def test_space
+    def pest_space
       @assembler = Assembler.new(@machine , Collector.collect_space)
-      assert @machine.translate_arm
     end
-    def test_write_fails
+    def pest_write_fails
       @assembler = Assembler.new(@machine , {})
       assert_raises{ @assembler.write_as_string} #must translate first
     end
-    def test_assemble_no_objects
+    def pest_assemble_no_objects
       @assembler = Assembler.new(@machine , {})
       assert @machine.translate_arm
       assert @assembler.assemble
     end
 
-    def test_translate_space
+    def pest_assemble_space
-      @assembler = Assembler.new(@machine , Collector.collect_space)
-      assert @machine.translate_arm
-    end
-    def test_assemble_space
       @assembler = Assembler.new(@machine , Collector.collect_space)
       assert @machine.translate_arm
       assert @assembler.assemble
@@ -36,7 +30,7 @@ module Risc
     def test_write_space
       @assembler = Assembler.new(@machine , Collector.collect_space)
       assert @machine.translate_arm
-      #assert @assembler.write_as_string
+      assert @assembler.write_as_string
     end
   end
 end

test/risc/test_collector.rb

@@ -2,10 +2,23 @@ require_relative "../helper"
 
 module Risc
   class TestCollector < MiniTest::Test
+
+    def setup
+      @machine = Risc.machine.boot
+    end
+
     def test_simple_collect
-      Machine.new.boot
       objects = Risc::Collector.collect_space
       assert ((350 < objects.length) or (430 > objects.length)) , objects.length.to_s
     end
+
+    def test_collect_all_types
+      objects = Risc::Collector.collect_space
+      objects.each do |id, objekt|
+        next unless objekt.is_a?( Parfait::Type )
+        assert Parfait.object_space.get_type_for( objekt.hash ) , objekt.hash
+      end
+    end
+
   end
 end

test/risc/test_machine.rb

@@ -7,12 +7,8 @@ module Risc
       @machine = Risc.machine.boot
     end
 
-    def test_collect_all_types
+    def test_co
-      objects = Risc::Collector.collect_space
+
-      objects.each do |id, objekt|
-        next unless objekt.is_a?( Parfait::Type )
-        assert Parfait.object_space.get_type_for( objekt.hash ) , objekt.hash
-      end
     end
   end
 end

test/risc/test_translator.rb

@@ -12,5 +12,10 @@ module Risc
       label = Parfait.object_space.get_main.risc_instructions
       assert @translator.translate(label) , label
     end
+
+    def test_translate_space
+      @assembler = Assembler.new(@machine , Collector.collect_space)
+      assert @machine.translate_arm
+    end
   end
 end