refactoring on tests

test/helper.rb

@@ -17,8 +17,9 @@ require 'salama-object-file'
 
 module Checker
   def check should
-    same = (should == @out)
+    out = Sof::Writer.write(@out)
-    puts "Shouldda\n#{@out}" unless same
+    same = (should == out)
-    assert_equal should , @out
+    puts "Shouldda\n#{out}" unless same
+    assert_equal should , out
   end
 end

test/test_basic.rb

@@ -4,45 +4,45 @@ class BasicSof < MiniTest::Test
   include Checker
 
   def test_true
-    @out = Sof::Writer.write(true)
+    @out = true
     check "true"
   end
   def test_string
-    @out = Sof::Writer.write("true")
+    @out = "true"
     check "'true'"
   end
   def test_num
-    @out = Sof::Writer.write(124)
+    @out = 124
     check  "124"
   end
   def test_simple_array
-    @out = Sof::Writer.write([true, 1234])
+    @out = [true, 1234]
     check "[true, 1234]"
   end
   def test_array_array
-    @out = Sof::Writer.write([true, 1 , [true , 12 ]])
+    @out = [true, 1 , [true , 12 ]]
     check "-true\n-1\n-[true, 12]"
   end
   def test_array_array_reverse
-    @out = Sof::Writer.write([ [true , 12 ], true, 1])
+    @out = [ [true , 12 ], true, 1]
     check "-[true, 12]\n-true\n-1"
   end
   def test_array_array_array
-    @out = Sof::Writer.write([true, 1 , [true , 12 , [true , 123 ]]])
+    @out = [true, 1 , [true , 12 , [true , 123 ]]]
     check "-true\n-1\n--true\n -12\n -[true, 123]"
   end
   def test_simple_hash
-    @out = Sof::Writer.write({ one: 1 , tru: true })
+    @out = { one: 1 , tru: true }
     check "{:one => 1, :tru => true}"
   end
   def test_array_hash
-    @out = Sof::Writer.write([true, 1 , { one: 1 , tru: true }])
+    @out = [true, 1 , { one: 1 , tru: true }]
     check "-true\n-1\n-{:one => 1, :tru => true}"
   end
   def test_array_recursive
     ar = [true, 1 ]
     ar << ar
-    @out = Sof::Writer.write(ar)
+    @out = ar
     check "&1 [true, 1, *1]"
   end
 end

test/test_ext.rb

@@ -24,7 +24,7 @@ class ObjectSof < MiniTest::Test
   end
 
   def test_basic
-    @out = Sof::Writer.write(BasicValue.new("name"))
+    @out = BasicValue.new("name")
     check "'name'"
   end
 

test/test_object.rb

@@ -11,52 +11,52 @@ class ObjectSof < MiniTest::Test
   include Checker
 
   def test_simple_object
-    @out = Sof::Writer.write(ObjectWithAttributes.new)
+    @out = ObjectWithAttributes.new
     check "#{OBJECT_STRING}"
   end
   def test_object_extra_array
     object = ObjectWithAttributes.new
     object.extra = [:sym , 123]
-    @out = Sof::Writer.write(object)
+    @out = object
     check "#{OBJECT_STRING}\n :extra [:sym, 123]"
   end
   def test_array_object
-    @out = Sof::Writer.write([true, 1234 , ObjectWithAttributes.new])
+    @out = [true, 1234 , ObjectWithAttributes.new]
     check "-true\n-1234\n-#{OBJECT_STRING}"
   end
   def test_array_array_object
-    @out = Sof::Writer.write([true, 1 , [true , 12 , ObjectWithAttributes.new]])
+    @out = [true, 1 , [true , 12 , ObjectWithAttributes.new]]
     check "-true\n-1\n--true\n -12\n -#{OBJECT_STRING}"
   end
   def test_hash_object
-    @out = Sof::Writer.write({ one: 1 , two: ObjectWithAttributes.new })
+    @out = { one: 1 , two: ObjectWithAttributes.new }
     check "-:one => 1\n-:two => #{OBJECT_STRING}"
   end
   def test_hash_array
-    @out = Sof::Writer.write({ one: [1 , ObjectWithAttributes.new] , two: true })
+    @out = { one: [1 , ObjectWithAttributes.new] , two: true }
     check "-:one => -1\n -#{OBJECT_STRING}\n-:two => true"
   end
   def test_object_recursive
     object = ObjectWithAttributes.new
     object.extra = object
-    @out = Sof::Writer.write(object)
+    @out = object
     check "&1 ObjectWithAttributes(:name => 'some name', :number => 1234, :extra => *1)"
   end
   def test_object_inline
     object = ObjectWithAttributes.new
     object.extra = Object.new
-    @out = Sof::Writer.write(object)
+    @out = object
     check "ObjectWithAttributes(:name => 'some name', :number => 1234, :extra => Object())"
   end
   def test_class
-    @out = Sof::Writer.write(ObjectWithAttributes)
+    @out = ObjectWithAttributes
     check "ObjectWithAttributes"
   end
   def test_class_ref
     object = ObjectWithAttributes.new
     object.extra = ObjectWithAttributes
     ar = [object , ObjectWithAttributes]
-    @out = Sof::Writer.write(ar)
+    @out = ar
     check "-ObjectWithAttributes(:name => 'some name', :number => 1234, :extra => *1)\n-&1 ObjectWithAttributes"
   end
 end