diff options
Diffstat (limited to 'test_tablib.py')
| -rwxr-xr-x | test_tablib.py | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/test_tablib.py b/test_tablib.py index 5715eb0..252dde4 100755 --- a/test_tablib.py +++ b/test_tablib.py @@ -6,14 +6,9 @@ import unittest import sys -if sys.version_info[0] > 2: - from tablib.packages import markup3 as markup -else: - from tablib.packages import markup - - - import tablib +from tablib.compat import markup + @@ -72,17 +67,17 @@ class TablibTestCase(unittest.TestCase): new_col = ['reitz', 'monke'] - data.append(col=new_col) + data.append_col(new_col) - self.assertEquals(data[0], ('kenneth', 'reitz')) - self.assertEquals(data.width, 2) + self.assertEqual(data[0], ('kenneth', 'reitz')) + self.assertEqual(data.width, 2) # With Headers data.headers = ('fname', 'lname') new_col = [21, 22] - data.append(col=new_col, header='age') + data.append_col(new_col, header='age') - self.assertEquals(data['age'], new_col) + self.assertEqual(data['age'], new_col) def test_add_column_no_data_no_headers(self): @@ -90,30 +85,32 @@ class TablibTestCase(unittest.TestCase): new_col = ('reitz', 'monke') - data.append(col=new_col) + data.append_col(new_col) - self.assertEquals(data[0], tuple([new_col[0]])) - self.assertEquals(data.width, 1) - self.assertEquals(data.height, len(new_col)) + self.assertEqual(data[0], tuple([new_col[0]])) + self.assertEqual(data.width, 1) + self.assertEqual(data.height, len(new_col)) def test_add_callable_column(self): """Verify adding column with values specified as callable.""" + new_col = [lambda x: x[0]] - self.founders.append(col=new_col, header='first_again') -# -# self.assertTrue(map(lambda x: x[0] == x[-1], self.founders)) + + self.founders.append_col(new_col, header='first_again') def test_header_slicing(self): """Verify slicing by headers.""" self.assertEqual(self.founders['first_name'], - [self.john[0], self.george[0], self.tom[0]]) + [self.john[0], self.george[0], self.tom[0]]) + self.assertEqual(self.founders['last_name'], - [self.john[1], self.george[1], self.tom[1]]) + [self.john[1], self.george[1], self.tom[1]]) + self.assertEqual(self.founders['gpa'], - [self.john[2], self.george[2], self.tom[2]]) + [self.john[2], self.george[2], self.tom[2]]) def test_data_slicing(self): @@ -173,6 +170,7 @@ class TablibTestCase(unittest.TestCase): self.assertEqual(csv, self.founders.csv) + def test_tsv_export(self): """Verify exporting dataset object as CSV.""" @@ -190,8 +188,8 @@ class TablibTestCase(unittest.TestCase): self.assertEqual(tsv, self.founders.tsv) - def test_html_export(self): + def test_html_export(self): """HTML export""" html = markup.page() @@ -420,7 +418,6 @@ class TablibTestCase(unittest.TestCase): def test_row_stacking(self): - """Row stacking.""" to_join = tablib.Dataset(headers=self.founders.headers) @@ -428,7 +425,7 @@ class TablibTestCase(unittest.TestCase): for row in self.founders: to_join.append(row=row) - row_stacked = self.founders.stack_rows(to_join) + row_stacked = self.founders.stack(to_join) for column in row_stacked.headers: @@ -438,7 +435,6 @@ class TablibTestCase(unittest.TestCase): def test_column_stacking(self): - """Column stacking""" to_join = tablib.Dataset(headers=self.founders.headers) @@ -446,7 +442,7 @@ class TablibTestCase(unittest.TestCase): for row in self.founders: to_join.append(row=row) - column_stacked = self.founders.stack_columns(to_join) + column_stacked = self.founders.stack_cols(to_join) for index, row in enumerate(column_stacked): @@ -459,7 +455,6 @@ class TablibTestCase(unittest.TestCase): def test_sorting(self): - """Sort columns.""" sorted_data = self.founders.sort(col="first_name") |