X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2Fyoutube_test.rb;h=622ddc056ed6f86916e80f4ec6352bfa148ec72c;hb=cfb766c18f5f6347f002e3f5b1b4b47647c43a5a;hp=ec91d357112a2c1b6e24e6cbd41bb15653d4a16f;hpb=60c71dd77a54a8e2e482e9b43c0c917d174ffe03;p=dead%2Fwhatever-dl.git

diff --git a/test/youtube_test.rb b/test/youtube_test.rb
index ec91d35..622ddc0 100644
--- a/test/youtube_test.rb
+++ b/test/youtube_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/youtube'
+require 'whatever-dl/websites/youtube'
 
 class YoutubeTest < Test::Unit::TestCase
 
@@ -35,6 +35,7 @@ class YoutubeTest < Test::Unit::TestCase
     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
 
 
@@ -62,78 +63,6 @@ class YoutubeTest < Test::Unit::TestCase
   end
 
 
-  def test_parse_t_parameter
-    yt = Youtube.new(nil)
-    
-    page_data = nil
-    
-    File.open('test/fixtures/youtube/SudixyugiX4.html') do |f|
-      page_data = f.read
-    end
-
-    expected_result = 'OEgsToPDskLQUAntWWpzhEMhBMlgqHdo'
-    actual_result = yt.send('parse_t_parameter', page_data)
-    assert_equal(expected_result, actual_result)
-  end
-
-  
-  def test_parse_t_parameter_again
-    # This was failing once because my regex missed a hyphen.
-    # I modified the regex to match anything between the pair
-    # of quotes, so it should now catch the hyphen and underscore.
-    yt = Youtube.new(nil)
-    
-    page_data = nil
-    
-    File.open('test/fixtures/youtube/K9iDMcmm0tE.html') do |f|
-      page_data = f.read
-    end
-
-    expected_result = 'O_EgsToPDskJsXVvAXpAct1zug-lBJBz'
-    actual_result = yt.send('parse_t_parameter', page_data)
-    assert_equal(expected_result, actual_result)
-  end
-
-
-  def test_get_available_formats
-    # Make sure that we can parse the available formats from a page.
-    yt = Youtube.new(nil)
-
-    page_data = nil
-
-    File.open('test/fixtures/youtube/BUer8Dv2HW8.html') do |f|
-      page_data = f.read
-    end
-
-    actual_formats = yt.send('get_available_formats', page_data)
-    expected_formats = [ 37, 22, 35, 18, 34, 5 ]
-    
-    # Make sure that all of the elements of the "expected" set are in
-    # the "actual" set and vice-versa.
-    assert_equal([], expected_formats - actual_formats)
-    assert_equal([], actual_formats - expected_formats)
-  end
-
-
-  def test_get_desired_format
-    # The get_desired_format() method should choose the best of the
-    # available formats.
-    yt = Youtube.new(nil)
-
-    page_data = nil
-
-    File.open('test/fixtures/youtube/BUer8Dv2HW8.html') do |f|
-      page_data = f.read
-    end
-
-    available_formats = yt.send('get_available_formats', page_data)
-    actual_result = yt.send('get_desired_format', available_formats)
-    expected_result = 37
-
-    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'