Fix almost all of the name_parser tests

tests/name_parser_tests.py

@@ -6,9 +6,11 @@ import datetime
 import unittest
 
 import test_lib as test
-from sickbeard.name_parser import parser
 
 import sickbeard
+from sickbeard import tv
+from sickbeard.name_parser import parser
+
 sickbeard.SYS_ENCODING = 'UTF-8'
 
 DEBUG = VERBOSE = False
@@ -29,7 +31,7 @@ simple_test_cases = {
         'Show-Name-S06E01-720p': parser.ParseResult(None, 'Show-Name', 6, [1], '720p'),
         'Show-Name-S06E01-1080i': parser.ParseResult(None, 'Show-Name', 6, [1], '1080i'),
         'Show.Name.S06E01.Other.WEB-DL': parser.ParseResult(None, 'Show Name', 6, [1], 'Other.WEB-DL'),
-              'Show.Name.S06E01 Some-Stuff Here': parser.ParseResult(None, 'Show Name', 6, [1], 'Some-Stuff Here' ),
+        'Show.Name.S06E01 Some-Stuff Here': parser.ParseResult(None, 'Show Name', 6, [1], 'Some-Stuff Here')
     },
 
     'fov': {
@@ -43,21 +45,21 @@ simple_test_cases = {
         'Show-Name-1x02-720p': parser.ParseResult(None, 'Show-Name', 1, [2], '720p'),
         'Show-Name-1x02-1080i': parser.ParseResult(None, 'Show-Name', 1, [2], '1080i'),
         'Show Name [05x12] Ep Name': parser.ParseResult(None, 'Show Name', 5, [12], 'Ep Name'),
-              'Show.Name.1x02.WEB-DL': parser.ParseResult(None, 'Show Name', 1, [2], 'WEB-DL'),
+        'Show.Name.1x02.WEB-DL': parser.ParseResult(None, 'Show Name', 1, [2], 'WEB-DL')
     },
 
     'standard_repeat': {
         'Show.Name.S01E02.S01E03.Source.Quality.Etc-Group': parser.ParseResult(None, 'Show Name', 1, [2, 3], 'Source.Quality.Etc', 'Group'),
         'Show.Name.S01E02.S01E03': parser.ParseResult(None, 'Show Name', 1, [2, 3]),
         'Show Name - S01E02 - S01E03 - S01E04 - Ep Name': parser.ParseResult(None, 'Show Name', 1, [2, 3, 4], 'Ep Name'),
-              'Show.Name.S01E02.S01E03.WEB-DL': parser.ParseResult(None, 'Show Name', 1, [2,3], 'WEB-DL'),
+        'Show.Name.S01E02.S01E03.WEB-DL': parser.ParseResult(None, 'Show Name', 1, [2, 3], 'WEB-DL')
     },
 
     'fov_repeat': {
         'Show.Name.1x02.1x03.Source.Quality.Etc-Group': parser.ParseResult(None, 'Show Name', 1, [2, 3], 'Source.Quality.Etc', 'Group'),
         'Show.Name.1x02.1x03': parser.ParseResult(None, 'Show Name', 1, [2, 3]),
         'Show Name - 1x02 - 1x03 - 1x04 - Ep Name': parser.ParseResult(None, 'Show Name', 1, [2, 3, 4], 'Ep Name'),
-              'Show.Name.1x02.1x03.WEB-DL': parser.ParseResult(None, 'Show Name', 1, [2,3], 'WEB-DL'),
+        'Show.Name.1x02.1x03.WEB-DL': parser.ParseResult(None, 'Show Name', 1, [2, 3], 'WEB-DL')
     },
 
     'bare': {
@@ -66,18 +68,18 @@ simple_test_cases = {
         'show.name.2010.222.123.source.quality.etc-group': parser.ParseResult(None, 'show name 2010.222', 1, [23], 'source.quality.etc', 'group'),
         'Show.Name.102': parser.ParseResult(None, 'Show Name', 1, [2]),
         'the.event.401.hdtv-lol': parser.ParseResult(None, 'the event', 4, [1], 'hdtv', 'lol'),
-              'show.name.2010.special.hdtv-blah': None,
+        'show.name.2010.special.hdtv-blah': None
     },
 
     'stupid': {
         'tpz-abc102': parser.ParseResult(None, None, 1, [2], None, 'tpz'),
-              'tpz-abc.102': parser.ParseResult(None, None, 1, [2], None, 'tpz'),
+        'tpz-abc.102': parser.ParseResult(None, None, 1, [2], None, 'tpz')
     },
 
     'no_season': {
         'Show Name - 01 - Ep Name': parser.ParseResult(None, 'Show Name', None, [1], 'Ep Name'),
         '01 - Ep Name': parser.ParseResult(None, None, None, [1], 'Ep Name'),
-              'Show Name - 01 - Ep Name - WEB-DL': parser.ParseResult(None, 'Show Name', None, [1], 'Ep Name - WEB-DL'),
+        'Show Name - 01 - Ep Name - WEB-DL': parser.ParseResult(None, 'Show Name', None, [1], 'Ep Name - WEB-DL')
     },
 
     'no_season_general': {
@@ -87,19 +89,19 @@ simple_test_cases = {
         'Show.Name.Part.1.and.Part.2.Blah-Group': parser.ParseResult(None, 'Show Name', None, [1, 2], 'Blah', 'Group'),
         'Show.Name.Part.IV.Source.Quality.Etc-Group': parser.ParseResult(None, 'Show Name', None, [4], 'Source.Quality.Etc', 'Group'),
         'Deconstructed.E07.1080i.HDTV.DD5.1.MPEG2-TrollHD': parser.ParseResult(None, 'Deconstructed', None, [7], '1080i.HDTV.DD5.1.MPEG2', 'TrollHD'),
-              'Show.Name.E23.WEB-DL': parser.ParseResult(None, 'Show Name', None, [23], 'WEB-DL'),
+        'Show.Name.E23.WEB-DL': parser.ParseResult(None, 'Show Name', None, [23], 'WEB-DL')
     },
 
     'no_season_multi_ep': {
         'Show.Name.E23-24.Source.Quality.Etc-Group': parser.ParseResult(None, 'Show Name', None, [23, 24], 'Source.Quality.Etc', 'Group'),
         'Show Name - Episode 01-02 - Ep Name': parser.ParseResult(None, 'Show Name', None, [1, 2], 'Ep Name'),
-              'Show.Name.E23-24.WEB-DL': parser.ParseResult(None, 'Show Name', None, [23,24], 'WEB-DL'),
+        'Show.Name.E23-24.WEB-DL': parser.ParseResult(None, 'Show Name', None, [23, 24], 'WEB-DL')
     },
 
     'season_only': {
         'Show.Name.S02.Source.Quality.Etc-Group': parser.ParseResult(None, 'Show Name', 2, [], 'Source.Quality.Etc', 'Group'),
         'Show Name Season 2': parser.ParseResult(None, 'Show Name', 2),
-              'Season 02': parser.ParseResult(None, None, 2),
+        'Season 02': parser.ParseResult(None, None, 2)
     },
 
     'scene_date_format': {
@@ -108,7 +110,7 @@ simple_test_cases = {
         'Show.Name.2010.23.11.Source.Quality.Etc-Group': parser.ParseResult(None, 'Show Name', None, [], 'Source.Quality.Etc', 'Group', datetime.date(2010, 11, 23)),
         'Show Name - 2010-11-23 - Ep Name': parser.ParseResult(None, 'Show Name', extra_info='Ep Name', air_date=datetime.date(2010, 11, 23)),
         '2010-11-23 - Ep Name': parser.ParseResult(None, extra_info='Ep Name', air_date=datetime.date(2010, 11, 23)),
-              'Show.Name.2010.11.23.WEB-DL': parser.ParseResult(None, 'Show Name', None, [], 'WEB-DL', None, datetime.date(2010,11,23)),
+        'Show.Name.2010.11.23.WEB-DL': parser.ParseResult(None, 'Show Name', None, [], 'WEB-DL', None, datetime.date(2010, 11, 23))
     },
 }
 
@@ -148,11 +150,9 @@ combination_test_cases = [
 
 unicode_test_cases = [
     (u'The.Big.Bang.Theory.2x07.The.Panty.Pi\xf1ata.Polarization.720p.HDTV.x264.AC3-SHELDON.mkv',
-                       parser.ParseResult(None, 'The.Big.Bang.Theory', 2, [7], '720p.HDTV.x264.AC3', 'SHELDON')
-                       ),
+     parser.ParseResult(None, 'The.Big.Bang.Theory', 2, [7], u'The.Panty.Pi\xf1ata.Polarization.720p.HDTV.x264.AC3', 'SHELDON')),
     ('The.Big.Bang.Theory.2x07.The.Panty.Pi\xc3\xb1ata.Polarization.720p.HDTV.x264.AC3-SHELDON.mkv',
-                       parser.ParseResult(None, 'The.Big.Bang.Theory', 2, [7], '720p.HDTV.x264.AC3', 'SHELDON')
-                       ),
+     parser.ParseResult(None, 'The.Big.Bang.Theory', 2, [7], u'The.Panty.Pi\xf1ata.Polarization.720p.HDTV.x264.AC3', 'SHELDON'))
 ]
 
 failure_cases = ['7sins-jfcs01e09-720p-bluray-x264']
@@ -160,16 +160,19 @@ failure_cases = ['7sins-jfcs01e09-720p-bluray-x264']
 
 class UnicodeTests(test.SickbeardTestDBCase):
 
-    def _test_unicode(self, name, result):
-        np = parser.NameParser(True)
+    def __init__(self, something):
+        super(UnicodeTests, self).__init__(something)
+        super(UnicodeTests, self).setUp()
+        self.show = tv.TVShow(1, 1, 'en')
+        self.show.name = "The Big Bang Theory"
 
-        try:
+    def _test_unicode(self, name, result):
+        np = parser.NameParser(True, showObj=self.show)
         parse_result = np.parse(name)
-        except parser.InvalidShowException:
-            return False
 
         # this shouldn't raise an exception
-        a = repr(str(parse_result))
+        repr(str(parse_result))
+        self.assertEqual(parse_result.extra_info, result.extra_info)
 
     def test_unicode(self):
         for (name, result) in unicode_test_cases:
@@ -177,7 +180,8 @@ class UnicodeTests(test.SickbeardTestDBCase):
 
 class FailureCaseTests(test.SickbeardTestDBCase):
 
-    def _test_name(self, name):
+    @staticmethod
+    def _test_name(name):
         np = parser.NameParser(True)
         try:
             parse_result = np.parse(name)
@@ -226,6 +230,11 @@ class ComboTests(test.SickbeardTestDBCase):
 
 class BasicTests(test.SickbeardTestDBCase):
 
+    def __init__(self, something):
+        super(BasicTests, self).__init__(something)
+        super(BasicTests, self).setUp()
+        self.show = tv.TVShow(1, 1, 'en')
+
     def _test_names(self, np, section, transform=None, verbose=False):
 
         if VERBOSE or verbose:
@@ -234,16 +243,21 @@ class BasicTests(test.SickbeardTestDBCase):
         for cur_test_base in simple_test_cases[section]:
             if transform:
                 cur_test = transform(cur_test_base)
+                np.file_name = cur_test
             else:
                 cur_test = cur_test_base
             if VERBOSE or verbose:
                 print 'Testing', cur_test
 
             result = simple_test_cases[section][cur_test_base]
+
+            self.show.name = result.series_name if result else None
+            np.showObj = self.show
             if not result:
                 self.assertRaises(parser.InvalidNameException, np.parse, cur_test)
                 return
             else:
+                result.which_regex = [section]
                 test_result = np.parse(cur_test)
 
             if DEBUG or verbose:
@@ -252,92 +266,92 @@ class BasicTests(test.SickbeardTestDBCase):
                 print test_result
                 print result
             self.assertEqual(test_result.which_regex, [section])
-            self.assertEqual(test_result, result)
+            self.assertEqual(str(test_result), str(result))
+
+    def test_standard_names(self):
+        np = parser.NameParser(True)
+        self._test_names(np, 'standard')
+
+    def test_standard_repeat_names(self):
+        np = parser.NameParser(False)
+        self._test_names(np, 'standard_repeat')
+
+    def test_fov_names(self):
+        np = parser.NameParser(False)
+        self._test_names(np, 'fov')
+
+    def test_fov_repeat_names(self):
+        np = parser.NameParser(False)
+        self._test_names(np, 'fov_repeat')
 
-    #def test_standard_names(self):
-    #    np = parser.NameParser(False)
-    #    self._test_names(np, 'standard')
-    #
-    #def test_standard_repeat_names(self):
-    #    np = parser.NameParser(False)
-    #    self._test_names(np, 'standard_repeat')
-    #
-    #def test_fov_names(self):
-    #    np = parser.NameParser(False)
-    #    self._test_names(np, 'fov')
-    #
-    #def test_fov_repeat_names(self):
-    #    np = parser.NameParser(False)
-    #    self._test_names(np, 'fov_repeat')
-    #
     #def test_bare_names(self):
     #    np = parser.NameParser(False)
     #    self._test_names(np, 'bare')
-    #
-    #def test_stupid_names(self):
-    #    np = parser.NameParser(False)
-    #    self._test_names(np, 'stupid')
-    #
+
+    def test_stupid_names(self):
+        np = parser.NameParser(False)
+        self._test_names(np, 'stupid')
+
     #def test_no_season_names(self):
     #    np = parser.NameParser(False)
     #    self._test_names(np, 'no_season')
-    #
-    #def test_no_season_general_names(self):
-    #    np = parser.NameParser(False)
-    #    self._test_names(np, 'no_season_general')
-    #
-    #def test_no_season_multi_ep_names(self):
-    #    np = parser.NameParser(False)
-    #    self._test_names(np, 'no_season_multi_ep')
-    #
-    #def test_season_only_names(self):
-    #    np = parser.NameParser(False)
-    #    self._test_names(np, 'season_only')
-    #
+
+    def test_no_season_general_names(self):
+        np = parser.NameParser(False)
+        self._test_names(np, 'no_season_general')
+
+    def test_no_season_multi_ep_names(self):
+        np = parser.NameParser(False)
+        self._test_names(np, 'no_season_multi_ep')
+
+    def test_season_only_names(self):
+        np = parser.NameParser(False)
+        self._test_names(np, 'season_only')
+
     #def test_scene_date_format_names(self):
     #    np = parser.NameParser(False)
     #    self._test_names(np, 'scene_date_format')
-    #
-    #def test_standard_file_names(self):
-    #    np = parser.NameParser()
-    #    self._test_names(np, 'standard', lambda x: x + '.avi')
-    #
-    #def test_standard_repeat_file_names(self):
-    #    np = parser.NameParser()
-    #    self._test_names(np, 'standard_repeat', lambda x: x + '.avi')
-    #
-    #def test_fov_file_names(self):
-    #    np = parser.NameParser()
-    #    self._test_names(np, 'fov', lambda x: x + '.avi')
-    #
-    #def test_fov_repeat_file_names(self):
-    #    np = parser.NameParser()
-    #    self._test_names(np, 'fov_repeat', lambda x: x + '.avi')
-    #
+
+    def test_standard_file_names(self):
+        np = parser.NameParser()
+        self._test_names(np, 'standard', lambda x: x + '.avi')
+
+    def test_standard_repeat_file_names(self):
+        np = parser.NameParser()
+        self._test_names(np, 'standard_repeat', lambda x: x + '.avi')
+
+    def test_fov_file_names(self):
+        np = parser.NameParser()
+        self._test_names(np, 'fov', lambda x: x + '.avi')
+
+    def test_fov_repeat_file_names(self):
+        np = parser.NameParser()
+        self._test_names(np, 'fov_repeat', lambda x: x + '.avi')
+
     #def test_bare_file_names(self):
     #    np = parser.NameParser()
     #    self._test_names(np, 'bare', lambda x: x + '.avi')
-    #
-    #def test_stupid_file_names(self):
-    #    np = parser.NameParser()
-    #    self._test_names(np, 'stupid', lambda x: x + '.avi')
-    #
+
+    def test_stupid_file_names(self):
+        np = parser.NameParser()
+        self._test_names(np, 'stupid', lambda x: x + '.avi')
+
     #def test_no_season_file_names(self):
     #    np = parser.NameParser()
     #    self._test_names(np, 'no_season', lambda x: x + '.avi')
-    #
-    #def test_no_season_general_file_names(self):
-    #    np = parser.NameParser()
-    #    self._test_names(np, 'no_season_general', lambda x: x + '.avi')
-    #
-    #def test_no_season_multi_ep_file_names(self):
-    #    np = parser.NameParser()
-    #    self._test_names(np, 'no_season_multi_ep', lambda x: x + '.avi')
-    #
-    #def test_season_only_file_names(self):
-    #    np = parser.NameParser()
-    #    self._test_names(np, 'season_only', lambda x: x + '.avi')
-    #
+
+    def test_no_season_general_file_names(self):
+        np = parser.NameParser()
+        self._test_names(np, 'no_season_general', lambda x: x + '.avi')
+
+    def test_no_season_multi_ep_file_names(self):
+        np = parser.NameParser()
+        self._test_names(np, 'no_season_multi_ep', lambda x: x + '.avi')
+
+    def test_season_only_file_names(self):
+        np = parser.NameParser()
+        self._test_names(np, 'season_only', lambda x: x + '.avi')
+
     #def test_scene_date_format_file_names(self):
     #    np = parser.NameParser()
     #    self._test_names(np, 'scene_date_format', lambda x: x + '.avi')