fix tests

buxx · Jul 8, 2015 · df1ade5 · df1ade5
1 parent 44d7bc7
commit df1ade5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/tests/TestImplode.py b/tests/TestImplode.py
@@ -9,40 +9,40 @@ def test_wikipedia_text_implode(self):
         data_collection = self._get_data_collection(WikipediaTextArticleImplode.get_data_classes(), '*.txt')
         implode = WikipediaTextArticleImplode(data_collection.get_data_instances())
 
-        self.assertEquals(['Article name', 'Letter count', 'Word count', 'Source'], implode.get_header())
+        self.assertEquals(['Article name', 'Letter count', 'Source', 'Word count'], implode.get_header())
         self.assertDictEqual({
-            'Relativité restreinte': [71720, 3638, 'Wikipédia'],
-            'Évolution (biologie)': [55251, 3378, 'Wikipédia']
+            'Relativité restreinte': [71720, 'Wikipédia', 3638],
+            'Évolution (biologie)': [55251, 'Wikipédia', 3378]
         }, implode.get_data())
 
     def test_britannica_text_implode(self):
         data_collection = self._get_data_collection(BritannicaTextArticleImplode.get_data_classes(), '*.txt')
         implode = BritannicaTextArticleImplode(data_collection.get_data_instances())
 
-        self.assertEquals(['Article name', 'Letter count', 'Word count', 'Source'], implode.get_header())
+        self.assertEquals(['Article name', 'Letter count', 'Source', 'Word count'], implode.get_header())
         self.assertDictEqual({
-            ' Britannica Brush-ups: 12 Greek Gods and Goddesses': [6189, 573, 'Britannica'],
-            '7 of the World’s Most Poisonous Mushrooms': [4650, 413, 'Britannica']
+            ' Britannica Brush-ups: 12 Greek Gods and Goddesses': [6189, 'Britannica', 573],
+            '7 of the World’s Most Poisonous Mushrooms': [4650, 'Britannica', 413]
         }, implode.get_data())
 
     def test_wikipedia_html_implode(self):
         data_collection = self._get_data_collection(WikipediaHTMLArticleImplode.get_data_classes(), '*.html')
         implode = WikipediaHTMLArticleImplode(data_collection.get_data_instances())
 
-        self.assertEquals(['Article name', 'Letter count', 'Word count', 'Source'], implode.get_header())
+        self.assertEquals(['Article name', 'Letter count', 'Source', 'Word count'], implode.get_header())
         self.assertDictEqual({
-            'Relativité restreinte': [68678, 3181, 'Wikipédia'],
-            'Évolution (biologie)': [59883, 3460, 'Wikipédia']
+            'Relativité restreinte': [68678, 'Wikipédia', 3181],
+            'Évolution (biologie)': [59883, 'Wikipédia', 3460]
         }, implode.get_data())
 
     def test_britannica_html_implode(self):
         data_collection = self._get_data_collection(BritannicaHTMLArticleImplode.get_data_classes(), '*.html')
         implode = BritannicaHTMLArticleImplode(data_collection.get_data_instances())
 
-        self.assertEquals(['Article name', 'Letter count', 'Word count', 'Source'], implode.get_header())
+        self.assertEquals(['Article name', 'Letter count', 'Source', 'Word count'], implode.get_header())
         self.assertDictEqual({
-            'Britannica Brush-ups: 12 Greek Gods and Goddesses': [6724, 615, 'Britannica'],
-            '7 of the World’s Most Poisonous Mushrooms': [5172, 455, 'Britannica']
+            'Britannica Brush-ups: 12 Greek Gods and Goddesses': [6724, 'Britannica', 615],
+            '7 of the World’s Most Poisonous Mushrooms': [5172, 'Britannica', 455]
         }, implode.get_data())
 
     def test_wikipedia_and_britannica_text_implode(self):

diff --git a/tests/src/data.py b/tests/src/data.py
@@ -59,9 +59,7 @@ def _get_text_data_name(self, text):
         return self._extract_text(text, 'Catégorie: (\S+).')
 
     def _get_data_for_text(self, text):
-        if self._can_take_into_account_text(text):
-            return 1
-        return 0
+        return 1
 
     def _get_text_identifier(self, text):
         return self._extract_text(text, self._get_data_name_pattern())
@@ -103,9 +101,7 @@ def _get_text_data_name(self, text):
         return meta_category.attr('content')
 
     def _get_data_for_text(self, text):
-        if self._can_take_into_account_text(text):
-            return 1
-        return 0
+        return 1
 
     def _get_text_identifier(self, text):
         return self._extract_html_text(text, self._get_data_name_pattern())