Align test expectations with dependencies update

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

tests/formattedcode/test_output_templated.py

@@ -109,7 +109,10 @@ def test_custom_format_with_custom_filename_fails_for_directory():
     result_file = test_env.get_temp_file('html')
     args = ['--info', '--custom-template', test_dir, '--custom-output', result_file, test_dir]
     result = run_scan_click(args, expected_rc=2)
-    assert 'Invalid value for "--custom-template": Path' in result.output
+    assert 'Invalid value for "--custom-template":' in normalize_quotes(result.output)
+
+def normalize_quotes(s):
+    return s.replace("'", '"')
 
 
 @pytest.mark.scanslow

tests/licensedcode/test_query.py

@@ -774,7 +774,6 @@ def test_query_run_for_text_with_long_lines(self):
         assert len(Query(location1, idx=idx).query_runs) == 17
         assert len(Query(location2, idx=idx).query_runs) == 15
 
-    @expectedFailure
     def test_Query_tokens_by_line_behaves_the_same_on_various_python_2(self):
         location = self.get_test_loc('query/query_lines/yahoo-eula.txt')
         idx = cache.get_index()

tests/textcode/test_pdf.py

@@ -79,15 +79,11 @@ def test_get_text_lines_can_parse_faulty_broadcom_doc(self):
 
     def test_pdfminer_can_parse_apache_fop_test_pdf(self):
         test_file = self.get_test_loc('pdf/fop_test_pdf_1.5_test.pdf')
-        from pdfminer.pdfparser import PDFParser
-        from pdfminer.pdfdocument import PDFDocument
-        with open(test_file, 'rb') as inputfile:
-            parser = PDFParser(inputfile)
-            PDFDocument(parser)
-
         result = pdf.get_text_lines(test_file)
-        expected = apache_fop_expected
-        assert result == expected
+        try:
+            assert result == apache_fop_expected
+        except AssertionError:
+            assert result == apache_fop_expected_2020
 
     def test_numbered_text_lines_does_not_fail_on_autocad_test_pdf(self):
         test_file = self.get_test_loc('pdf/AutoCad_Diagram.pdf')
@@ -221,3 +217,140 @@ def test_numbered_text_lines_does_not_fail_on_autocad_test_pdf(self):
     b'\n',
     b'\x0c'
 ]
+
+apache_fop_expected_2020 = [
+    b'This is the page header\n',
+    b'\n',
+    b'(There\xe2\x80\x99s another page se-\n',
+    b'quence below.)\n',
+    b'\n',
+    b'About Apache FOP\n',
+    b'It  is  a  print  formatter  driv-\n',
+    b'en  by  XSL  formatting  ob-\n',
+    b'jects (XSL-FO) and an out-\n',
+    b'format-\n',
+    b'put \n',
+    b'\n',
+    b'independent \n',
+    b'\n',
+    b'Page 1\n',
+    b'ter1. FOP has a nice logo:\n',
+    b'\n',
+    b'Header 1.1 Header 1.2\n',
+    b'\n',
+    b'Cell 1.1\n',
+    b'\n',
+    b'Cell 1.2\n',
+    b'\n',
+    b'See the FOP website for more information\n',
+    b'\n',
+    b'\x0cThis is the page header\n',
+    b'\n',
+    b'Page 2\n',
+    b'\n',
+    b'Cell 2.2\n',
+    b'\n',
+    b'Cell 2.1\n',
+    b'\n',
+    b'Header 1.1 Header 1.2\n',
+    b'\n',
+    b'(XSL-FO) and an output in-\n',
+    b'dependent formatter. It is a\n',
+    b'Java application that reads\n',
+    b'a  formatting  object  (FO)\n',
+    b'tree  and  renders  the  res-\n',
+    b'ulting pages to a specified\n',
+    b'output.\n',
+    b'\n',
+    b'Apache  FOP  (Formatting\n',
+    b'Objects  Processor)  is  a\n',
+    b'print  formatter  driven  by\n',
+    b'XSL \n',
+    b'formatting  objects\n',
+    b'This fo:block element spans all the columns of the docu-\n',
+    b'ment. This is intended to test the abilities of the text-to-\n',
+    b'speech program.\n',
+    b'And  now  we  are  back  to\n',
+    b'normal  content  flowing  in\n',
+    b'\n',
+    b'\x0cPage 3\n',
+    b'\n',
+    b'This is the page header\n',
+    b'\n',
+    b'two  columns.  Let\xe2\x80\x99s  start  a\n',
+    b'numbered list:\n',
+    b'1. Line 1 of item 1\n',
+    b'Line 2 of item 1\n',
+    b'Line 3 of item 1\n',
+    b'2. Line 1 of item 2\n',
+    b'Line 2 of item 2\n',
+    b'Line 3 of item 2\n',
+    b'\n',
+    b'And  now  we  are  going  to\n',
+    b'see  how  a  second  page\n',
+    b'sequence is handled.\n',
+    b'\n',
+    b'\x0cThis is the page header\n',
+    b'\n',
+    b'Apache  FOP  (Formatting\n',
+    b'Objects  Processor)  is  a\n',
+    b'print  formatter  driven  by\n',
+    b'XSL \n',
+    b'formatting  objects\n',
+    b'(XSL-FO)  and  an  output\n',
+    b'independent  formatter1.  It\n',
+    b'is  a  Java  application  that\n',
+    b'reads  a  formatting  object\n',
+    b'(FO)  tree  and  renders  the\n',
+    b'\n',
+    b'Page 4\n',
+    b'\n',
+    b'resulting  pages  to  a  spe-\n',
+    b'cified output.\n',
+    b'\n',
+    b'Header 1.1 Header 1.2\n',
+    b'\n',
+    b'Cell 1.1\n',
+    b'Cell 2.1\n',
+    b'\n',
+    b'Cell 1.2\n',
+    b'Cell 2.2\n',
+    b'\n',
+    b'Apache  FOP  (Formatting\n',
+    b'Objects  Processor)  est\n',
+    b'une application de mise en\n',
+    b'page  de  documents  res-\n',
+    b'pectant  le  standard  XSL-\n',
+    b'\n',
+    b'See the FOP website for more information\n',
+    b'\n',
+    b'\x0cThis is the page header\n',
+    b'\n',
+    b'Page 5\n',
+    b'\n',
+    b'FO. \xc3\x80 partir d\xe2\x80\x99un document\n',
+    b'va  effectue  une  mise  en\n',
+    b'au  format  XSL-FO,  cette\n',
+    b'page  et  renvoie  un  docu-\n',
+    b'ment pr\xc3\xaat pour impression.\n',
+    b'application  \xc3\xa9crite  en  Ja-\n',
+    b'This fo:block element spans all the columns of the docu-\n',
+    b'ment. This is intended to test the abilities of the text-to-\n',
+    b'speech program.\n',
+    b'And  now  we  are  back  to\n',
+    b'normal  content  flowing  in\n',
+    b'two  columns.  Let\xe2\x80\x99s  start  a\n',
+    b'numbered list:\n',
+    b'1. Line 1 of item 1\n',
+    b'Line 2 of item 1\n',
+    b'\n',
+    b'Line 3 of item 1\n',
+    b'2. Line 1 of item 2\n',
+    b'Line 2 of item 2\n',
+    b'Line 3 of item 2\n',
+    b'\n',
+    b'The  end  of  the  document\n',
+    b'has now been reached.\n',
+    b'\n',
+    b'\x0c',
+]