mplayer-ruby 0.1.0 → 0.2.0

data/test/slave_test.rb

@@ -1,17 +1,67 @@
 require File.expand_path("teststrap", File.dirname(__FILE__))
 
+def setup_with_location(location = "test/test.mp3")
+  mock(Open4).popen4("mplayer -slave -quiet \"#{location}\"") { [true,true,true,true] }.any_times
+  stub(true).gets { "playback" }
+  MPlayer::Slave.new(location)
+end
+
 context "MPlayer::Player" do
   setup do
-    mock(Open4).popen4("/usr/bin/mplayer -slave -quiet test/test.mp3") { [true,true,true,true] }
-    stub(true).gets { "playback" }
-    @player = MPlayer::Slave.new('test/test.mp3')
+    setup_with_location
   end
   asserts("invalid file") { MPlayer::Slave.new('boooger') }.raises ArgumentError,"Invalid File"
-  asserts("@file").assigns(:file)
-  asserts("@pid").assigns(:pid)
-  asserts("@stdin").assigns(:stdin)
-  asserts("@stdout").assigns(:stdout)
-  asserts("@stderr").assigns(:stderr)
+  asserts_topic.assigns(:file)
+  asserts_topic.assigns(:pid)
+  asserts_topic.assigns(:stdin)
+  asserts_topic.assigns(:stdout)
+  asserts_topic.assigns(:stderr)
+end
+
+context "MPlayer::Player for URL" do
+  setup do
+    setup_with_location("http://www.example.com/test.mp3")
+  end
+  denies("url passes") { MPlayer::Slave.new('http://www.example.com/test.mp3') }.raises ArgumentError,"Invalid File"
+  asserts_topic.assigns(:file)
+  asserts_topic.assigns(:pid)
+  asserts_topic.assigns(:stdin)
+  asserts_topic.assigns(:stdout)
+  asserts_topic.assigns(:stderr)
+end
+
+context "MPlayer::Player with arbitrary options" do
+  setup do
+    mock(Open4).popen4('mplayer -slave -quiet -something "test/test.mp3"') { [true,true,true,true] }
+    stub(true).gets { "playback" }
+  end
+  asserts("new :arbitrary") { MPlayer::Slave.new('test/test.mp3', :options => "-something") }
+end
 
-  
+context "MPlayer::Player with fullscreen enabled" do
+  setup do
+    mock(Open4).popen4('mplayer -slave -quiet -fs "test/test.mp3"') { [true,true,true,true] }
+    stub(true).gets { "playback" }
+  end
+  asserts("new :fullscreen") { MPlayer::Slave.new('test/test.mp3', :fullscreen => true) }
+end
+
+context "MPlayer::Player with screenshots enabled" do
+  setup do
+    mock(Open4).popen4('mplayer -slave -quiet -vf screenshot "test/test.mp3"') { [true,true,true,true] }
+    stub(true).gets { "playback" }
+  end
+  asserts("new :screenshot") { MPlayer::Slave.new('test/test.mp3', :screenshot => true) }
+end
+
+context "MPlayer::Player file with space" do
+  setup do
+    setup_with_location("test/test space.mp3")
+  end
+  asserts("invalid file") { MPlayer::Slave.new('boooger') }.raises ArgumentError,"Invalid File"
+  asserts_topic.assigns(:file)
+  asserts_topic.assigns(:pid)
+  asserts_topic.assigns(:stdin)
+  asserts_topic.assigns(:stdout)
+  asserts_topic.assigns(:stderr)
 end

data/test/slave_tv_commands_test.rb

@@ -0,0 +1,109 @@
+require File.expand_path("teststrap", File.dirname(__FILE__))
+
+context "MPlayer::SlaveTvCommands" do
+  setup_player
+
+  context "tv_start_scan" do
+    setup { mock_stdin @player, "tv_start_scan" ; @player}
+    asserts("tv_start_scan") { @player.tv_start_scan }
+  end
+
+  context "tv_step_channel" do
+    context "next" do
+      setup { mock_stdin @player, "tv_step_channel 1" }
+      asserts("tv_step_channel :next") { @player.tv_step_channel :next }
+    end
+    context "previous" do
+      setup { mock_stdin @player, "tv_step_channel -1" }
+      asserts("tv_step_channel :prev") { @player.tv_step_channel :prev }
+    end
+  end
+
+  context "next_channel" do
+    setup { mock(@player).tv_step_channel(:next) { true } }
+    asserts("next_channel") { @player.next_channel }
+  end
+
+  context "prev_channel" do
+    setup { mock(@player).tv_step_channel(:prev) { true } }
+    asserts("prev_channel") { @player.prev_channel }
+  end
+
+  context "tv_step_norm" do
+    setup { mock_stdin @player, "tv_step_norm" }
+    asserts("tv_step_norm") { @player.tv_step_norm }
+  end
+
+  context "tv_step_chanlist" do
+    setup { mock_stdin @player, "tv_step_chanlist" }
+    asserts("tv_step_chanlist") { @player.tv_step_chanlist }
+  end
+
+  context "tv_set_channel" do
+    setup { mock_stdin @player, "tv_set_channel 1" }
+    asserts("tv_set_channel 1") { @player.tv_set_channel 1 }
+  end
+
+  context "set_channel" do
+    setup { mock_stdin @player, "tv_set_channel 1" }
+    asserts("set_channel 1") { @player.set_channel 1 }
+  end
+
+  context "tv_last_channel" do
+    setup { mock_stdin @player, "tv_last_channel" }
+    asserts("tv_last_channel") { @player.tv_last_channel }
+  end
+
+  context "last_channel" do
+    setup { mock_stdin @player, "tv_last_channel" }
+    asserts("last_channel") { @player.last_channel }
+  end
+
+  context "tv_set_freq" do
+    setup { mock_stdin @player, "tv_set_freq 1.92" }
+    asserts("tv_set_freq 1.92") { @player.tv_set_freq 1.92 }
+  end
+
+  context "tv_step_freq" do
+    setup { mock_stdin @player, "tv_step_freq 2.3" }
+    asserts("tv_step_freq 2.3") { @player.tv_step_freq 2.3 }
+  end
+
+  context "tv_set_norm" do
+    setup { mock_stdin @player, "tv_set_norm NTSC" }
+    asserts(":ntsc") {  @player.tv_set_norm :ntsc }
+  end
+
+  context "tv_set_norm ntsc" do
+    setup { mock_stdin @player, "tv_set_norm NTSC" }
+    asserts("ntsc") { @player.tv_set_norm 'ntsc' }
+  end
+
+  context "tv_set_norm NTSC" do
+    setup { mock_stdin @player, "tv_set_norm NTSC" }
+    asserts("NTSC") { @player.tv_set_norm 'NTSC' }
+  end
+
+  %w[tv_set_contrast tv_set_brightness tv_set_hue tv_set_saturation].each do |setting|
+    context setting do
+
+      context "relative" do
+        setup { mock_stdin @player, "#{setting} 5 0" }
+        asserts("#{setting} 5") { @player.method(setting).call(5) }
+      end
+
+      context "explicit relative" do
+        setup { mock_stdin @player, "#{setting} 5 0" }
+        asserts("#{setting} 5, :relative") { @player.method(setting).call(5, :relative) }
+      end
+
+      context "absolute" do
+        setup { mock_stdin @player, "#{setting} 5 1" }
+        asserts("#{setting} 5, :absolute") { @player.method(setting).call( 5, :absolute) }
+      end
+
+      asserts("value out of range [-100,100]") { @player.method(setting).call(1000) }.raises(ArgumentError,"Value out of Range -100..100")
+    end
+  end
+
+end

data/test/slave_video_commands_test.rb

@@ -1,17 +1,17 @@
 require File.expand_path("teststrap", File.dirname(__FILE__))
 
-context "MPlayer::Player" do
-  setup do
-    mock(Open4).popen4("/usr/bin/mplayer -slave -quiet test/test.mp3") { [true,true,true,true] }
-    stub(true).gets { "playback" }
-    @player = MPlayer::Slave.new('test/test.mp3')
-  end
-  
+context "MPlayer::SlaveVideoCommands" do
+  setup_player
+
   context "audio_delay" do
 
     context "by relative" do
       setup { mock_stdin @player, "audio_delay 5 0" }
       asserts("audio_delay 5") { @player.audio_delay 5 }
+    end
+
+    context "explicitly by relative" do
+      setup { mock_stdin @player, "audio_delay 5 0" }
       asserts("audio_delay 5,:relative") {  @player.audio_delay 5,:relative }
     end
 
@@ -20,35 +20,6 @@ context "MPlayer::Player" do
       asserts("audio_delay 5,:absolute") {  @player.audio_delay 5,:absolute }
     end
   end
-  
-  context "sub_delay" do
-
-    context "absolute" do
-      setup { mock_stdin @player, "sub_delay 5 1" }
-      asserts("sub_delay 5") {  @player.sub_delay 5 }
-      asserts("sub_delay 5, :relative") { @player.sub_delay 5,:absolute }
-    end
-
-    context "relative" do
-      setup { mock_stdin @player, "sub_delay 5 0" }
-      asserts("sub_delay 5, :absolute") { @player.sub_delay 5, :relative }
-    end
-  end
-
-  context "sub_step" do
-
-    context "forward" do
-      setup { mock_stdin @player, "sub_step 5" }
-      asserts("sub_step 5") { @player.sub_step 5 }
-      asserts("sub_step 5,:forward") { @player.sub_step 5, :forward }
-    end
-
-    context "backward" do
-      setup { mock_stdin @player, "sub_step -5" }
-      asserts("sub_step -5") { @player.sub_step -5 }
-      asserts("sub_step 5,:backward") { @player.sub_step 5,:backward }
-    end
-  end
 
   context "osd" do
 
@@ -98,13 +69,17 @@ context "MPlayer::Player" do
       asserts("mock_stdin 'hello', :level => 5") { @player.osd_show_property_text 'hello', :level => 5 }
     end
   end
-  
+
   %w[contrast gamma brightness hue saturation].each do |setting|
     context setting do
 
       context "relative" do
         setup { mock_stdin @player, "#{setting} 5 0" }
         asserts("#{setting} 5, :relative") { @player.method(setting).call(5, :relative) }
+      end
+
+      context "explicit relative" do
+        setup { mock_stdin @player, "#{setting} 5 0" }
         asserts("#{setting} 5") { @player.method(setting).call(5) }
       end
 
@@ -135,199 +110,290 @@ context "MPlayer::Player" do
     end
   end
 
-  context "sub_pos" do
-    context "by relative" do
-      setup { mock_stdin @player, "sub_pos 5 0"  }
-      asserts("sub_pos 5") { @player.sub_pos 5 }
-      asserts("sub_pos 5,:relative") {  @player.sub_pos 5,:relative }
-    end
+  %w[switch_angle switch_audio switch_title].each do |switch|
+
+    context switch do
+
+      context "select" do
+        setup { mock_stdin @player, "#{switch} 1" }
+        asserts("#{switch} 1") { @player.method(switch).call 1 }
+      end
+
+      context "cycle" do
+        setup { mock_stdin @player, "#{switch} -2" }
+        asserts("#{switch}") { @player.method(switch).call }
+      end
+
+      context "explicit cycle" do
+        setup { mock_stdin @player, "#{switch} -2" }
+        asserts("#{switch} :cycle") { @player.method(switch).call :cycle }
+      end
 
-    context "by absolute" do
-      setup { mock_stdin @player, "sub_pos 5 1" }
-      asserts("sub_pos 5,:absolute") {  @player.sub_pos 5,:absolute }
     end
   end
 
-  context "sub_alignment" do
+  context "switch_ratio" do
+    setup { mock_stdin @player,"switch_ratio 1" }
+    asserts("switch_ratio 1") { @player.switch_ratio 1 }
+  end
 
+  context "switch_vsync" do
     context "toggle" do
-      setup { mock_stdin @player, "sub_alignment" }
-      asserts("returns true") { @player.sub_alignment }
-    end
-
-    context "top" do
-      setup { mock_stdin @player, "sub_alignment 0" }
-      asserts("sub_alignment :top") { @player.sub_alignment :top }
+      setup { mock_stdin @player, "switch_vsync" }
+      asserts("switch_vsynce") { @player.switch_vsync }
     end
 
-    context "center" do
-      setup { mock_stdin @player, "sub_alignment 1" }
-      asserts("sub_alignment :top") { @player.sub_alignment :center }
+    context "on" do
+      setup { mock_stdin @player, "switch_vsync 1" }
+      asserts("switch_vsync :on") { @player.switch_vsync :on }
     end
 
-    context "bottom" do
-      setup { mock_stdin @player, "sub_alignment 2" }
-      asserts("sub_alignment :top") { @player.sub_alignment :bottom }
+    context "off" do
+      setup { mock_stdin @player, "switch_vsync 0" }
+      asserts("switch_vsync :off") { @player.switch_vsync :off }
     end
   end
 
-  context "sub_visibility" do
-
+  context "vo_border" do
     context "toggle" do
-      setup { mock_stdin @player, "sub_visibility" }
-      asserts("sub_visiblity") { @player.sub_visibility }
+      setup { mock_stdin @player, "vo_border" }
+      asserts("vo_border") { @player.vo_border }
     end
 
     context "on" do
-      setup { mock_stdin @player, "sub_visibility 1" }
-      asserts("sub_visibility :on") { @player.sub_visibility :on }
+      setup { mock_stdin @player, "vo_border 1" }
+      asserts("vo_border :on") { @player.vo_border :on }
     end
 
     context "off" do
-      setup { mock_stdin @player, "sub_visibility 0" }
-      asserts("sub_visibility :off") { @player.sub_visibility :off }
+      setup { mock_stdin @player, "vo_border 0" }
+      asserts("vo_border :off") { @player.vo_border :off }
     end
   end
 
-  context "sub_load" do
+  context "vo_fullscreen" do
+    context "toggle" do
+      setup { mock_stdin @player, "vo_fullscreen" }
+      asserts("vo_fullscreen") { @player.vo_fullscreen }
+    end
 
-    asserts("invalid file") { @player.sub_load "booger" }.raises ArgumentError,"Invalid File"
-    context "valid file" do
-      setup { mock_stdin @player, "sub_load test/test.mp3" }
-      asserts("sub_load 'test/test.mp3'") { @player.sub_load "test/test.mp3" }
+    context "on" do
+      setup { mock_stdin @player, "vo_fullscreen 1" }
+      asserts("vo_fullscreen :on") { @player.vo_fullscreen :on }
+    end
+
+    context "off" do
+      setup { mock_stdin @player, "vo_fullscreen 0" }
+      asserts("vo_fullscreen :off") { @player.vo_fullscreen :off }
     end
   end
 
-  context "sub_remove" do
+  context "vo_ontop" do
+    context "toggle" do
+      setup { mock_stdin @player, "vo_ontop" }
+      asserts("vo_ontop") { @player.vo_ontop }
+    end
 
-    context "all" do
-      setup { mock_stdin @player, "sub_remove -1" }
-      asserts("sub_remove") { @player.sub_remove }
-      asserts("sub_remove :all") { @player.sub_remove :all }
+    context "on" do
+      setup { mock_stdin @player, "vo_ontop 1" }
+      asserts("vo_ontop :on") { @player.vo_ontop :on }
     end
 
-    context "index" do
-      setup { mock_stdin @player, "sub_remove 1" }
-      asserts("sub_remove 1") { @player.sub_remove 1 }
+    context "off" do
+      setup { mock_stdin @player, "vo_ontop 0" }
+      asserts("vo_ontop :off") { @player.vo_ontop :off }
     end
   end
 
-  context "sub_select" do
+  context "vo_rootwin" do
+    context "toggle" do
+      setup { mock_stdin @player, "vo_rootwin" }
+      asserts("vo_rootwin") { @player.vo_rootwin }
+    end
 
-    context "select" do
-      setup { mock_stdin @player, "sub_select 1" }
-      asserts("sub_select 1") { @player.sub_select 1 }
+    context "on" do
+      setup { mock_stdin @player, "vo_rootwin 1" }
+      asserts("vo_rootwin :on") { @player.vo_rootwin :on }
     end
 
-    context "cycle" do
-      setup { mock_stdin @player, "sub_select -2" }
-      asserts("sub_select") { @player.sub_select }
-      asserts("sub_select :cycle") { @player.sub_select :cycle }
+    context "off" do
+      setup { mock_stdin @player, "vo_rootwin 0" }
+      asserts("vo_rootwin :off") { @player.vo_rootwin :off }
     end
   end
 
-  context "sub_source" do
-
-    context "sub" do
-      setup { mock_stdin @player, "sub_source 0" }
-      asserts("sub_source :sub") { @player.sub_source :sub }
+  context "screenshot" do
+    context "take screenshot" do
+      setup do
+        mock_stdin @player, "screenshot 0"
+        mock_stdout @player, "", "*** screenshot 'shot0001.png' ***"
+      end
+      asserts("screenshot") { @player.screenshot == 'shot0001.png' }
     end
 
-    context "vobsub" do
-      setup { mock_stdin @player, "sub_source 1"}
-      asserts("sub_source :vobsub") { @player.sub_source :vobsub }
+    context "start/stop screenshot" do
+      setup do
+        mock_stdin @player, "screenshot 1"
+      end
+      asserts("screenshot :toggle") { @player.screenshot :toggle }
     end
 
-    context "demux" do
-      setup { mock_stdin @player, "sub_source 2" }
-      asserts("sub_source :demux") { @player.sub_source :demux }
+    context "no file output on toggle" do
+      setup do
+        mock_stdin @player, "screenshot 1"
+        dont_allow(@player.stdout).gets
+      end
+      asserts("screenshot :toggle") { @player.screenshot(:toggle) == "" }
     end
+  end
 
-    context "off" do
-      setup { mock_stdin @player, "sub_source -1" }
-      asserts("sub_source :off") { @player.sub_source :off }
+  context "panscan" do
+    asserts("panscan 2") { @player.panscan 2}.raises ArgumentError, "Value out of Range -1.0 .. 1.0"
+    context "valid range" do
+      setup { mock_stdin @player, "panscan 0.1 0" }
+      asserts("panscan 0.1") { @player.panscan 0.1 }
     end
+  end
 
-    context "cycle" do
-      setup { mock_stdin @player, "sub_source -2" }
-      asserts("sub_source :cycle") { @player.sub_source :cycle }
-      asserts("sub_source") { @player.sub_source }
+  context "dvdnav" do
+    asserts("dvdnav :what") { @player.dvdnav :what }.raises ArgumentError, "Invalid button name"
+    context "up" do
+      setup { mock_stdin @player, "dvdnav up" }
+      asserts("dvdnav :up") { @player.dvdnav :up }
+    end
+    context "down" do
+      setup { mock_stdin @player, "dvdnav down" }
+      asserts("dvdnav :downleft") { @player.dvdnav :down }
+    end
+    context "left" do
+      setup { mock_stdin @player, "dvdnav left" }
+      asserts("dvdnav :left") { @player.dvdnav :left }
+    end
+    context "right" do
+      setup { mock_stdin @player, "dvdnav right" }
+      asserts("dvdnav :right") { @player.dvdnav :right }
+    end
+    context "select" do
+      setup { mock_stdin @player, "dvdnav select" }
+      asserts("dvdnav :select") { @player.dvdnav :select }
+    end
+    context "menu" do
+      setup { mock_stdin @player, "dvdnav menu" }
+      asserts("dvdnav :menu") { @player.dvdnav :menu }
+    end
+    context "prev" do
+      setup { mock_stdin @player, "dvdnav prev" }
+      asserts("dvdnav :prev") { @player.dvdnav :prev }
+    end
+    context "mouse" do
+      setup { mock_stdin @player, "dvdnav mouse" }
+      asserts("dvdnav :mouse") { @player.dvdnav :mouse }
     end
   end
 
-  %w[sub_file sub_vob sub_demux].each do |sub|
+  context "get_property" do
+    context "valid property" do
+      setup { mock_command @player, "get_property pause","ANS_pause=no",/pause/ }
+      asserts("get_property :hue") { @player.get_property :pause }.equals "no"
+    end
+    context "failed property" do
+      setup { mock_command @player, "get_property saturation","Failed to get value of property 'saturation'.",/saturation/}
+      asserts("get_property :saturation") { @player.get_property :saturation }.raises StandardError, "Failed to get value of property 'saturation'."
+    end
+  end
 
-    context sub do
+  context "set_property" do
+    setup { mock_command @player, "set_property volume 40" }
+    asserts("set_property :volume, 40") { @player.set_property :volume, 40 }
+  end
 
-      context "index" do
-        setup { mock_stdin @player, "#{sub} 1" }
-        asserts("#{sub} 1") { @player.method(sub).call 1 }
-      end
+  context "step_property" do
+    context ":up" do
+      setup { mock_command @player, "step_property volume 10 1"}
+      asserts("step_property :volume, 10") { @player.step_property :volume, 10}
+    end
+    context ":down" do
+      setup { mock_command @player, "step_property volume 10 -1"}
+      asserts("step_property :volume, -10") { @player.step_property :volume, -10}
+    end
 
-      context "off" do
-        setup { mock_stdin @player, "#{sub} -1" }
-        asserts("#{sub} :off") { @player.method(sub).call :off}
-      end
+  end
 
-      context "cycle" do
-        setup { mock_stdin @player, "#{sub} -2" }
-        asserts("#{sub} :cycle") { @player.method(sub).call :cycle }
-        asserts("#{sub}") { @player.method(sub).call }
-      end
+  context "get_vofullscreen" do
+    context "fullscreen" do
+      setup { mock_command @player, "get_vofullscreen","1",/(0|1)/ }
+      asserts("get_vofullscreen") { @player.get_vofullscreen }
+    end
+    context "windowed" do
+      setup { mock_command @player, "get_vofullscreen","0",/(0|1)/ }
+      asserts("get_vofullscreen") { @player.get_vofullscreen }.equals false
     end
+
   end
 
-  context "sub_scale" do
-    context "by relative" do
-      setup { mock_stdin @player, "sub_scale 5 0" }
-      asserts("sub_scale 5") { @player.sub_scale 5 }
-      asserts("sub_scale 5,:relative") {  @player.sub_scale 5,:relative }
+  context "get_sub_visibility" do
+    context "on" do
+      setup { mock_command @player, "get_sub_visibility","1",/(0|1)/ }
+      asserts("get_sub_visiblity") { @player.get_sub_visibility }
     end
-
-    context "by absolute" do
-      setup { mock_stdin @player, "sub_scale 5 1" }
-      asserts("sub_scale 5,:absolute") {  @player.sub_scale 5,:absolute }
+    context "off" do
+      setup { mock_command @player, "get_sub_visibility","0",/(0|1)/ }
+      asserts("get_sub_visiblity") { @player.get_sub_visibility }.equals false
     end
   end
 
-  %w[switch_angle switch_audio switch_title].each do |switch|
+  context "seek_chapter" do
 
-    context switch do
-
-      context "select" do
-        setup { mock_stdin @player, "#{switch} 1" }
-        asserts("#{switch} 1") { @player.method(switch).call 1 }
-      end
+    context "relative" do
+      setup { mock_stdin @player, "seek_chapter 5 0" }
+      asserts("seek_chapter 5") { @player.seek_chapter(5) }
+    end
 
-      context "cycle" do
-        setup { mock_stdin @player, "#{switch} -2" }
-        asserts("#{switch}") { @player.method(switch).call }
-        asserts("#{switch} :cycle") { @player.method(switch).call :cycle }
-      end
+    context "explicit relative" do
+      setup { mock_stdin @player, "seek_chapter 5 0" }
+      asserts("seek_chapter 5, :relative") { @player.seek_chapter(5, :relative) }
+    end
 
+    context "absolute" do
+      setup { mock_stdin @player, "seek_chapter 5 1" }
+      asserts("seek_chapter 5, :absolute") { @player.seek_chapter( 5, :absolute) }
     end
   end
 
-  context "switch_ratio" do
-    setup { mock_stdin @player,"switch_ratio 1" }
-    asserts("switch_ratio 1") { @player.switch_ratio 1 }
-  end
+  context "change_rectangle" do
+    context "relative" do
+      context "x" do
+        setup { mock_command @player, "change_rectangle 2 2" }
+        asserts("change_rectangle :x, 2") { @player.change_rectangle :x, 2 }
+      end
 
-  context "switch_vsync" do
-    context "toggle" do
-      setup { mock_stdin @player, "switch_vsync" }
-      asserts("switch_vsynce") { @player.switch_vsync }
-    end
+      context "explicit relative x" do
+        setup { mock_command @player, "change_rectangle 2 2" }
+        asserts("change_rectangle :x, 2, :relative") { @player.change_rectangle :x, 2, :relative }
+      end
 
-    context "on" do
-      setup { mock_stdin @player, "switch_vsync 1" }
-      asserts("switch_vsync :on") { @player.switch_vsync :on }
+      context "y" do
+        setup { mock_command @player, "change_rectangle 3 2" }
+        asserts("change_rectangle :y, 2, :relative") { @player.change_rectangle :y, 2, :relative }
+      end
+
+      context "explicit relative y" do
+        setup { mock_command @player, "change_rectangle 3 2" }
+        asserts("change_rectangle :y, 2") { @player.change_rectangle :y, 2 }
+      end
     end
+    context "absolute" do
+      context "x" do
+        setup { mock_command @player, "change_rectangle 0 2" }
+        asserts("change_rectangle :x, 2, :absolute") { @player.change_rectangle :x, 2, :absolute }
+      end
 
-    context "off" do
-      setup { mock_stdin @player, "switch_vsync 0" }
-      asserts("switch_vsync :off") { @player.switch_vsync :off }
+      context "y" do
+        setup { mock_command @player, "change_rectangle 1 2" }
+        asserts("change_rectangle :y, 2, :absolute") { @player.change_rectangle :y, 2, :absolute }
+      end
     end
   end
-  
-end
+
+
+end