From a91af9a2d042ce21398df91a799fbd26f3afb945 Mon Sep 17 00:00:00 2001 From: T8y8 Date: Mon, 25 Jul 2016 22:40:58 -0700 Subject: [PATCH 1/2] Bump test coverage in fields, cover datatype and role --- test/test_datasource.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/test_datasource.py b/test/test_datasource.py index bf51746..7123f43 100644 --- a/test/test_datasource.py +++ b/test/test_datasource.py @@ -51,6 +51,11 @@ def test_datasource_field_is_quantitative(self): def test_datasource_field_is_ordinal(self): self.assertTrue(self.ds.fields['[x]'].is_ordinal) + def test_datasource_field_datatype(self): + self.assertEqual(self.ds.fields['[x]'].datatype, 'integer') + + def test_datasource_field_role(self): + self.assertEqual(self.ds.fields['[x]'].role, 'measure') class DataSourceFieldsTWB(unittest.TestCase): def setUp(self): From 9f9fff01a4ddc1fed83bba2e112489b6989311c5 Mon Sep 17 00:00:00 2001 From: T8y8 Date: Mon, 25 Jul 2016 22:44:51 -0700 Subject: [PATCH 2/2] Fix pep8 violation, and it fixed a few other things automatically as well --- test/test_datasource.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/test_datasource.py b/test/test_datasource.py index 7123f43..6ea03ea 100644 --- a/test/test_datasource.py +++ b/test/test_datasource.py @@ -19,6 +19,7 @@ class DataSourceFieldsTDS(unittest.TestCase): + def setUp(self): self.ds = Datasource.from_file(TEST_TDS_FILE) @@ -57,10 +58,13 @@ def test_datasource_field_datatype(self): def test_datasource_field_role(self): self.assertEqual(self.ds.fields['[x]'].role, 'measure') + class DataSourceFieldsTWB(unittest.TestCase): + def setUp(self): self.wb = Workbook(TEST_TWB_FILE) - self.ds = self.wb.datasources[0] # Assume the first datasource in the file + # Assume the first datasource in the file + self.ds = self.wb.datasources[0] def test_datasource_fields_loaded_in_workbook(self): self.assertIsNotNone(self.ds.fields) @@ -68,9 +72,11 @@ def test_datasource_fields_loaded_in_workbook(self): class DataSourceFieldsFoundIn(unittest.TestCase): + def setUp(self): self.wb = Workbook(TEST_TWB_FILE) - self.ds = self.wb.datasources[0] # Assume the first datasource in the file + # Assume the first datasource in the file + self.ds = self.wb.datasources[0] def test_datasource_fields_found_in_returns_fields(self): actual_values = self.ds.fields.used_by_sheet('Sheet 1')