X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2Fyoutube_test.rb;h=bcb350db3aaad7eb2fd11753da2ce48c11514578;hb=f5ccab0be24345c14dd0da5cb152a44776fb1b6a;hp=08e8030e8b8686a5898ce735f5d6d50c6b3e1530;hpb=af614c64b3d5998471af5e54b3d8f36d3e00cc63;p=dead%2Fwhatever-dl.git

diff --git a/test/youtube_test.rb b/test/youtube_test.rb
index 08e8030..bcb350d 100644
--- a/test/youtube_test.rb
+++ b/test/youtube_test.rb
@@ -28,6 +28,14 @@ class YoutubeTest < Test::Unit::TestCase
     assert(Youtube.owns_url?('http://www.youtube.com/v/SudixyugiX4'))
     assert(Youtube.owns_url?('http://www.youtube.com/v/SudixyugiX4&hl=en'))
     assert(Youtube.owns_url?('http://youtube.com/v/SudixyugiX4&hl=en'))
+    assert(Youtube.owns_url?('http://www.youtube.com/watch?v=K9iDMcmm0tE'))
+    assert(Youtube.owns_url?('http://www.youtube.com/watch?v=K9iDMcmm0tE#'))
+    assert(Youtube.owns_url?('http://www.youtube.com/v/K9iDMcmm0tE'))
+    assert(Youtube.owns_url?('http://www.youtube.com/watch?v=83-hlYMH1XE'))
+    assert(Youtube.owns_url?('http://www.youtube.com/watch?v=83-hlYMH1XE&feature=dir'))
+    assert(Youtube.owns_url?('http://in.youtube.com/watch?v=VcydqSpYN00&feature=channel_page'))
+    assert(Youtube.owns_url?('http://uk.youtube.com/watch?v=LN4Ov6ZLcrI'))
+    assert(Youtube.owns_url?('http://www.youtube.com/meetlocalbiz#p/u/0/rJVWV4aA6Jk'))
   end
 
 
@@ -40,25 +48,52 @@ class YoutubeTest < Test::Unit::TestCase
 
 
   def test_parse_video_id
-    yt = Youtube.new()
+    yt = Youtube.new('http://www.youtube.com/watch?v=SudixyugiX4')
     expected_result = 'SudixyugiX4'
-    actual_result = yt.send('parse_video_id', 'http://www.youtube.com/watch?v=SudixyugiX4')
+    actual_result = yt.send('parse_video_id')
+    assert_equal(expected_result, actual_result)
+  end
+
+
+  def test_parse_video_id_again
+    yt = Youtube.new('http://www.youtube.com/watch?v=K9iDMcmm0tE')
+    expected_result = 'K9iDMcmm0tE'
+    actual_result = yt.send('parse_video_id')
+    assert_equal(expected_result, actual_result)
+  end
+
+
+  def test_get_video_filename
+    yt = Youtube.new('http://www.youtube.com/watch?v=SudixyugiX4')
+    expected_result = 'SudixyugiX4.flv'
+    actual_result = yt.get_video_filename()
     assert_equal(expected_result, actual_result)
   end
 
   
-  def test_parse_t_parameter
-    yt = Youtube.new()
-    
-    page_data = nil
-    
-    File.open('test/fixtures/youtube/SudixyugiX4.html') do |f|
-      page_data = f.read
-    end
+  def test_get_video_filename_again
+    yt = Youtube.new('http://www.youtube.com/watch?v=K9iDMcmm0tE')
+    expected_result = 'K9iDMcmm0tE.flv'
+    actual_result = yt.get_video_filename()
+    assert_equal(expected_result, actual_result)
+  end
+
+  
+  def test_get_troublesome_video_filename_first_form
+    # This non-alphanumeric video id was causing
+    # get_video_filename to barf.
+    yt = Youtube.new('http://www.youtube.com/watch?v=83-hlYMH1XE&feature=dir')
+    expected_result = '83-hlYMH1XE.flv'
+    actual_result = yt.get_video_filename()
+    assert_equal(expected_result, actual_result)
+  end
 
-    expected_result = 'OEgsToPDskLQUAntWWpzhEMhBMlgqHdo'
-    actual_result = yt.send('parse_t_parameter', page_data)
+
+  def test_get_troublesome_video_filename_second_form
+    yt = Youtube.new('http://www.youtube.com/v/83-hlYMH1XE&feature=dir')
+    expected_result = '83-hlYMH1XE.flv'
+    actual_result = yt.get_video_filename()
     assert_equal(expected_result, actual_result)
   end
-    
+  
 end