seperate different Position classes into own files

also tests
and have Position module keep all positions
(singletons should be at module, not class level)

test/risc/position/test_code_position.rb

@@ -8,26 +8,9 @@ module Risc
       @binary = Parfait::BinaryCode.new(1)
       @label = Label.new("hi","ho")
     end
-    def test_set_instr
-      pos = Position.set( @label , 0 , @binary)
-      assert_equal IPosition , pos.class
-    end
     def test_set_bin
       pos = Position.set( @binary , 0 , Parfait.object_space.get_main)
-      assert_equal BPosition , pos.class
-    end
-    def test_ins_propagates
-      @label.set_next Arm::ArmMachine.b( @label)
-      Position.set( @label , 0 , @binary)
-      assert_equal 0 , Position.get(@label.next).at
-    end
-    def test_ins_propagates_again
-      second = Arm::ArmMachine.b( @label)
-      @label.set_next(second)
-      Position.set( @label , 0 , @binary)
-      Position.set(second , 2 , @binary)
-      Position.set( @label , 0 , @binary)
-      assert_equal 0 , Position.get(@label.next).at
+      assert_equal Position::CodePosition , pos.class
     end
     def test_bin_propagates_existing
       @binary.extend_to(16)

test/risc/position/test_instruction_position.rb

@@ -0,0 +1,31 @@
+require_relative "../helper"
+
+module Risc
+  module Position
+    # tests that require a boot and test propagation
+    class TestPositionBasic < MiniTest::Test
+      def setup
+        Risc.machine.boot
+        @binary = Parfait::BinaryCode.new(1)
+        @label = Label.new("hi","ho")
+      end
+      def test_set_instr
+        pos = Position.set( @label , 0 , @binary)
+        assert_equal InstructionPosition , pos.class
+      end
+      def test_ins_propagates
+        @label.set_next Arm::ArmMachine.b( @label)
+        Position.set( @label , 0 , @binary)
+        assert_equal 0 , Position.get(@label.next).at
+      end
+      def test_ins_propagates_again
+        second = Arm::ArmMachine.b( @label)
+        @label.set_next(second)
+        Position.set( @label , 0 , @binary)
+        Position.set(second , 2 , @binary)
+        Position.set( @label , 0 , @binary)
+        assert_equal 0 , Position.get(@label.next).at
+      end
+    end
+  end
+end

test/risc/position/test_object_position.rb

@@ -0,0 +1,47 @@
+require_relative "../helper"
+
+module Risc
+  module Position
+    # tests that do no require a boot and only test basic positioning
+    class TestPositionBasic < MiniTest::Test
+
+      def test_creation_ok
+        assert ObjectPosition.new(0)
+      end
+      def test_creation_fail
+        assert_raises {Position.new("0")}
+      end
+      def test_add
+        res = ObjectPosition.new(0) + 5
+        assert_equal 5 , res
+      end
+      def test_sub
+        res = ObjectPosition.new(5) - 1
+        assert_equal 4 , res
+      end
+      def test_sub_pos
+        res = ObjectPosition.new(5) - ObjectPosition.new(1)
+        assert_equal 4 , res
+      end
+      def test_set
+        pos = Position.set(self , 5)
+        assert_equal 5 , pos.at
+      end
+      def tet_tos
+        assert_equal "0x10" , Position.set(self).to_s
+      end
+      def test_reset_ok
+        pos = Position.set(self , 5)
+        pos = Position.set(self , 10)
+        assert_equal 10 , pos.at
+      end
+      def test_reset_fail
+        Position.set(self , 5)
+        assert_raises{Position.set(self , 10000)}
+      end
+      def test_raises_set_nil
+        assert_raises { Position.set(self,nil)}
+      end
+    end
+  end
+end

test/risc/test_machine.rb

@@ -41,5 +41,20 @@ module Risc
     def test_has_jump
       assert_equal "ea0011f4" ,  @machine.binary_init.get_word(1).to_s(16)
     end
+    def test_pos_bin
+      assert_equal "0x0" ,  Position.get(@machine.binary_init).to_s
+    end
+    def test_pos_cpu
+      assert_equal 12 ,  Position.get(@machine.cpu_init).at
+    end
+    def test_cpu_at
+      assert_equal 3 ,  Position.get(@machine.cpu_init.first).at
+    end
+    def test_cpu_bin
+      assert_equal "0x3ed8" ,  Position.get(Position.get(@machine.cpu_init.first).binary).to_s
+    end
+    def test_cpu_label
+      assert_equal Position::InstructionPosition ,  Position.get(@machine.cpu_init.first).class
+    end
   end
 end

test/risc/test_position1.rb

@@ -1,45 +0,0 @@
-require_relative "../helper"
-
-module Risc
-  # tests that do no require a boot and only test basic positioning
-  class TestPositionBasic < MiniTest::Test
-
-    def test_creation_ok
-      assert Position.new(0)
-    end
-    def test_creation_fail
-      assert_raises {Position.new("0")}
-    end
-    def test_add
-      res = Position.new(0) + 5
-      assert_equal 5 , res
-    end
-    def test_sub
-      res = Position.new(5) - 1
-      assert_equal 4 , res
-    end
-    def test_sub_pos
-      res = Position.new(5) - Position.new(1)
-      assert_equal 4 , res
-    end
-    def test_set
-      pos = Position.set(self , 5)
-      assert_equal 5 , pos.at
-    end
-    def tet_tos
-      assert_equal "0x10" , Position.set(self).to_s
-    end
-    def test_reset_ok
-      pos = Position.set(self , 5)
-      pos = Position.set(self , 10)
-      assert_equal 10 , pos.at
-    end
-    def test_reset_fail
-      Position.set(self , 5)
-      assert_raises{Position.set(self , 10000)}
-    end
-    def test_raises_set_nil
-      assert_raises { Position.set(self,nil)}
-    end
-  end
-end