remove sorting code; change test cases names

Sorting will be implemented in #19

Author: iluxonchik

rfc_bibtex/rfc_bibtex.py

@@ -76,16 +76,6 @@ def __init__(self, id_names=None, in_file_name=None, out_file_name=None):
         if in_file_name is not None:
             self._id_names += self._read_ids_from_file(in_file_name)
 
-    @staticmethod
-    def _rfc_key_function(name):
-        """Turn RFC32 into RFC00032 for sorting. This needs to be a staticmethod because it is called as a function from sorted()."""
-        try:
-            if name.upper().startswith('RFC'):
-                return "RFC{:05d}".format( int(name[3:]))
-        except (ValueError,TypeError) as e:
-            raise BadRFCNumberException(name)
-        return name
-        
     @property
     def bibtex_entries(self):
         # remove Nones (errors returned by urllib), so that they're not printed
@@ -96,19 +86,13 @@ def _read_ids_from_plain_file(self, filename):
             return [line.strip() for line in f ]
 
     def _read_ids_from_aux_file(self, filename):
-        sort_entries = False # TODO: not yet implemented
         with open(filename, 'r') as f:
             rfcs = list([m.group(1) for line in f for m in [self.AUX_CITATION_RE.search(line)] if m])
-            if sort_entries:
-                rfcs = sorted(rfcs, key=self._rfc_key_function)
         return rfcs
 
     def _read_ids_from_tex_file(self, filename):
-        sort_entries = False # TODO: not yet implemented
         with open(filename, 'r') as f:
             rfcs = list([m.group(1) for line in f for m in [self.TEX_CITATION_RE.search(line)] if m])
-            if sort_entries:
-                rfcs = sorted(rfcs, key=self._rfc_key_function)
         return rfcs
 
     def _read_ids_from_file(self, filename):

tests/integration/test_obtained_bibtex_from_raw_input.py

@@ -13,7 +13,7 @@
       tests were adapted to work in both of them. This is why some assertions might
       seem like incomplete. Later, the tests should and will be refactored.
 """
-class TestObtainedBibtexFromRawRFCInput(BaseRFCBibTexIntegrationTestCase):
+class ObtainedBibtexFromRawRFCInputTestCase(BaseRFCBibTexIntegrationTestCase):
     TLS_RFCS_FILE = BaseRFCBibTexIntegrationTestCase.TEST_RESOURCES_PATH + "tls_rfcs.txt"
     TLS_RFCS_INVALID_IDS_FILE = BaseRFCBibTexIntegrationTestCase.TEST_RESOURCES_PATH + "tls_rfcs_invalid_ids.txt"
     TLS_RFCS_NON_EXISTING_IDS_FILE = BaseRFCBibTexIntegrationTestCase.TEST_RESOURCES_PATH + "tls_rfcs_non_existing_ids.txt"

tests/integration/test_obtained_bibtex_from_tex_and_aux.py

@@ -13,7 +13,7 @@
       tests were adapted to work in both of them. This is why some assertions might
       seem like incomplete. Later, the tests should and will be refactored.
 """
-class TestObtainedBibtexFromTexAndAuxFiles(BaseRFCBibTexIntegrationTestCase):
+class ObtainedBibtexFromTexAndAuxFilesTestCase(BaseRFCBibTexIntegrationTestCase):
     TLS_RFCS_FILE_AUX = BaseRFCBibTexIntegrationTestCase.TEST_RESOURCES_PATH + "tls_rfcs.aux"
     TLS_RFCS_FILE_INVALID_IDS_AUX = BaseRFCBibTexIntegrationTestCase.TEST_RESOURCES_PATH + "tls_rfcs_invalid_ids.aux"
     TLS_RFCS_FILE_NON_EXISTING_IDS_AUX = BaseRFCBibTexIntegrationTestCase.TEST_RESOURCES_PATH + "tls_rfcs_non_existing_ids.aux"

tests/unit/test_regex.py

@@ -8,12 +8,3 @@ def test_re(self):
         self.assertTrue(RFCBibtex.AUX_CITATION_RE.search(r"\citation{RFC32}"))
         self.assertTrue(RFCBibtex.AUX_CITATION_RE.search(r"\citation{draft-tls-nothing}"))
         self.assertFalse(RFCBibtex.AUX_CITATION_RE.search(r"\citation{nothing}"))
-
-    def test_rfc_keyfunction(self):
-        self.assertEqual(RFCBibtex._rfc_key_function("RFC32"), "RFC00032")
-        self.assertEqual(RFCBibtex._rfc_key_function("draft-nothing"), "draft-nothing")
-        try:
-            self.assertEqual(RFCBibtex._rfc_key_function("RFC32a"), "RFC32a")
-        except BadRFCNumberException:
-            pass
-