test/import/test_syntheyes_import.rb in tracksperanto-2.1.1 vs test/import/test_syntheyes_import.rb in tracksperanto-2.2.0

@@ -1,20 +1,20 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class SyntheyesImportTest < Test::Unit::TestCase
   DELTA = 0.9 # our SynthEyes sample is somewhat inaccurate :-P
+  
   def test_introspects_properly
     i = Tracksperanto::Import::Syntheyes
     assert_equal "Syntheyes 2D tracker paths file", i.human_name
     assert !i.autodetects_size?
   end
   
   def test_parsing_from_importable
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/shake_tracker_nodes_to_syntheyes.txt')
-    parser = Tracksperanto::Import::Syntheyes.new(:width => 2560, :height => 1080)
+    trackers = Tracksperanto::Import::Syntheyes.new(:io => fixture, :width => 2560, :height => 1080).to_a
     
-    trackers = parser.parse(fixture)
     assert_equal 50, trackers.length
     
     first_kf = trackers[0].keyframes[0]
     
     assert_equal "Tracker1", trackers[0].name
@@ -25,26 +25,25 @@
     assert_in_delta 0.0, first_kf.residual, DELTA
   end
   
   def test_parsing_cola_plate
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/cola_plate.txt')
-    parser = Tracksperanto::Import::Syntheyes.new(:width => 1920, :height => 1080)
+    trackers = Tracksperanto::Import::Syntheyes.new(:io => fixture, :width => 1920, :height => 1080).to_a
     
-    trackers = parser.parse(fixture)
     assert_equal 6, trackers.length
   end
   
   def test_parsing_with_one_tracker
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/one_tracker.txt')
-    parser = Tracksperanto::Import::Syntheyes.new(:width => 1920, :height => 1080)
-    trackers = parser.parse(fixture)
+    trackers = Tracksperanto::Import::Syntheyes.new(:io => fixture, :width => 1920, :height => 1080).to_a
+    
     assert_equal 1, trackers.length
     assert_equal 49, trackers[0].length
   end
   
   def test_parsing_from_sy_2010
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/morePoints_sy2010.txt')
-    parser = Tracksperanto::Import::Syntheyes.new(:width => 1920, :height => 1080)
-    trackers = parser.parse(fixture)
+    trackers = Tracksperanto::Import::Syntheyes.new(:io => fixture, :width => 1920, :height => 1080).to_a
+    
     assert_equal 26, trackers.length
   end
 end
\ No newline at end of file