Merge pull request #5117 from janezd/fix-xls-tests

Fix tests for xls reader

Author: markotoplak

Orange/data/io.py

@@ -270,27 +270,6 @@ def read(self):
             raise IOError("Couldn't load spreadsheet from " + self.filename)
         return table
 
-    @classmethod
-    def write_file(cls, filename, data):
-        vars = list(chain((ContinuousVariable('_w'),) if data.has_weights() else (),
-                          data.domain.attributes,
-                          data.domain.class_vars,
-                          data.domain.metas))
-        formatters = [cls.formatter(v) for v in vars]
-        zipped_list_data = zip(data.W if data.W.ndim > 1 else data.W[:, np.newaxis],
-                               data.X,
-                               data.Y if data.Y.ndim > 1 else data.Y[:, np.newaxis],
-                               data.metas)
-        headers = cls.header_names(data)
-        workbook = xlsxwriter.Workbook(filename)
-        sheet = workbook.add_worksheet()
-        for c, header in enumerate(headers):
-            sheet.write(0, c, header)
-        for i, row in enumerate(zipped_list_data, 1):
-            for j, (fmt, v) in enumerate(zip(formatters, flatten(row))):
-                sheet.write(i, j, fmt(v))
-        workbook.close()
-
 
 class ExcelReader(_BaseExcelReader):
     """Reader for .xlsx files"""
@@ -332,6 +311,27 @@ def _get_active_sheet(self) -> openpyxl.worksheet.worksheet.Worksheet:
         else:
             return self.workbook.active
 
+    @classmethod
+    def write_file(cls, filename, data):
+        vars = list(chain((ContinuousVariable('_w'),) if data.has_weights() else (),
+                          data.domain.attributes,
+                          data.domain.class_vars,
+                          data.domain.metas))
+        formatters = [cls.formatter(v) for v in vars]
+        zipped_list_data = zip(data.W if data.W.ndim > 1 else data.W[:, np.newaxis],
+                               data.X,
+                               data.Y if data.Y.ndim > 1 else data.Y[:, np.newaxis],
+                               data.metas)
+        headers = cls.header_names(data)
+        workbook = xlsxwriter.Workbook(filename)
+        sheet = workbook.add_worksheet()
+        for c, header in enumerate(headers):
+            sheet.write(0, c, header)
+        for i, row in enumerate(zipped_list_data, 1):
+            for j, (fmt, v) in enumerate(zip(formatters, flatten(row))):
+                sheet.write(i, j, fmt(v))
+        workbook.close()
+
 
 class XlsReader(_BaseExcelReader):
     """Reader for .xls files"""

Orange/tests/test_xlsx_reader.py

@@ -16,11 +16,11 @@ def get_dataset(name):
 
 
 def get_xlsx_reader(name: str) -> io.ExcelReader:
-    return io.ExcelReader(get_dataset(name))
+    return io.ExcelReader(get_dataset(name + ".xlsx"))
 
 
 def get_xls_reader(name: str) -> io.XlsReader:
-    return io.XlsReader(get_dataset(name))
+    return io.XlsReader(get_dataset(name + ".xls"))
 
 
 def read_file(reader: Callable, name: str) -> Table:
@@ -37,7 +37,7 @@ def wrapper(self):
 
 class TestExcelReader(unittest.TestCase):
     def test_read_round_floats(self):
-        table = read_file(get_xlsx_reader, "round_floats.xlsx")
+        table = read_file(get_xlsx_reader, "round_floats")
         domain = table.domain
         self.assertIsNone(domain.class_var)
         self.assertEqual(len(domain.metas), 0)
@@ -50,7 +50,7 @@ def test_read_round_floats(self):
 class TestExcelHeader0(unittest.TestCase):
     @test_xlsx_xls
     def test_read(self, reader: Callable[[str], io.FileFormat]):
-        table = read_file(reader, "header_0.xlsx")
+        table = read_file(reader, "header_0")
         domain = table.domain
         self.assertIsNone(domain.class_var)
         self.assertEqual(len(domain.metas), 0)
@@ -68,13 +68,13 @@ def test_read(self, reader: Callable[[str], io.FileFormat]):
 class TextExcelSheets(unittest.TestCase):
     @test_xlsx_xls
     def test_sheets(self, reader: Callable[[str], io.FileFormat]):
-        reader = reader("header_0_sheet.xlsx")
+        reader = reader("header_0_sheet")
         self.assertSequenceEqual(reader.sheets,
                                  ["Sheet1", "my_sheet", "Sheet3"])
 
     @test_xlsx_xls
     def test_named_sheet(self, reader: Callable[[str], io.FileFormat]):
-        reader = reader("header_0_sheet.xlsx")
+        reader = reader("header_0_sheet")
         reader.select_sheet("my_sheet")
         table = reader.read()
         self.assertEqual(len(table.domain.attributes), 4)
@@ -96,7 +96,7 @@ def test_named_sheet_table_xls(self):
 class TestExcelHeader1(unittest.TestCase):
     @test_xlsx_xls
     def test_no_flags(self, reader: Callable[[str], io.FileFormat]):
-        table = read_file(reader, "header_1_no_flags.xlsx")
+        table = read_file(reader, "header_1_no_flags")
         domain = table.domain
         self.assertEqual(len(domain.metas), 0)
         self.assertEqual(len(domain.attributes), 4)
@@ -115,7 +115,7 @@ def test_no_flags(self, reader: Callable[[str], io.FileFormat]):
 
     @test_xlsx_xls
     def test_flags(self, reader: Callable[[str], io.FileFormat]):
-        table = read_file(reader, "header_1_flags.xlsx")
+        table = read_file(reader, "header_1_flags")
         domain = table.domain
 
         self.assertEqual(len(domain.attributes), 1)
@@ -146,7 +146,7 @@ def test_flags(self, reader: Callable[[str], io.FileFormat]):
 class TestExcelHeader3(unittest.TestCase):
     @test_xlsx_xls
     def test_read(self, reader: Callable[[str], io.FileFormat]):
-        table = read_file(reader, "header_3.xlsx")
+        table = read_file(reader, "header_3")
         domain = table.domain
 
         self.assertEqual(len(domain.attributes), 2)