Skip to content

TST: refactored Excel reader tests #10964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

TST: refactored Excel reader tests #10964

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aca3e39
TST: add missing test Excel file formats, rename test to test1 for cl…
davidovitch Sep 1, 2015
8a74d50
TST: refactor Excel reader tests for easy integration of additional r…
davidovitch Sep 1, 2015
2e055d3
split get_data into a get_excel and get_csv_refdf methods
davidovitch Sep 5, 2015
b99be6c
helper method for read_excel, similar to ExcelFile and read_csv
davidovitch Sep 5, 2015
2dd3b44
remove redundant "import pandas as pd"
davidovitch Sep 5, 2015
97e523b
move reading blank df to ReadingTestsBase
davidovitch Sep 5, 2015
d6500c3
remove mistakenly added test, add missing blank tests for xlsm
davidovitch Sep 5, 2015
d39dc8a
forgotten method renames
davidovitch Sep 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
forgotten method renames
  • Loading branch information
@davidovitch
davidovitch committed Sep 5, 2015
commit d39dc8acd722157dfefc8563796668e519e98142
16 changes: 8 additions & 8 deletions pandas/io/tests/test_excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def setUp(self):
def test_parse_cols_int(self):

dfref = self.get_csv_refdf('test1')
excel = self.get_excel('test1')
excel = self.get_excelfile('test1')
dfref = dfref.reindex(columns=['A', 'B', 'C'])
df1 = excel.parse('Sheet1', index_col=0, parse_dates=True,
parse_cols=3)
Expand All @@ -169,7 +169,7 @@ def test_parse_cols_int(self):

def test_parse_cols_list(self):

excel = self.get_excel('test1')
excel = self.get_excelfile('test1')
dfref = self.get_csv_refdf('test1')
dfref = dfref.reindex(columns=['B', 'C'])
df1 = excel.parse('Sheet1', index_col=0, parse_dates=True,
Expand All @@ -183,7 +183,7 @@ def test_parse_cols_list(self):

def test_parse_cols_str(self):

excel = self.get_excel('test1')
excel = self.get_excelfile('test1')
dfref = self.get_csv_refdf('test1')

df1 = dfref.reindex(columns=['A', 'B', 'C'])
Expand Down Expand Up @@ -216,23 +216,23 @@ def test_parse_cols_str(self):

def test_excel_stop_iterator(self):

excel = self.get_excel('test2')
excel = self.get_excelfile('test2')

parsed = excel.parse('Sheet1')
expected = DataFrame([['aaaa', 'bbbbb']], columns=['Test', 'Test1'])
tm.assert_frame_equal(parsed, expected)

def test_excel_cell_error_na(self):

excel = self.get_excel('test3')
excel = self.get_excelfile('test3')

parsed = excel.parse('Sheet1')
expected = DataFrame([[np.nan]], columns=['Test'])
tm.assert_frame_equal(parsed, expected)

def test_excel_passes_na(self):

excel = self.get_excel('test4')
excel = self.get_excelfile('test4')

parsed = excel.parse('Sheet1', keep_default_na=False,
na_values=['apple'])
Expand All @@ -248,7 +248,7 @@ def test_excel_passes_na(self):

def test_excel_table_sheet_by_index(self):

excel = self.get_excel('test1')
excel = self.get_excelfile('test1')
dfref = self.get_csv_refdf('test1')

df1 = excel.parse(0, index_col=0, parse_dates=True)
Expand All @@ -266,7 +266,7 @@ def test_excel_table_sheet_by_index(self):

def test_excel_table(self):

excel = self.get_excel('test1')
excel = self.get_excelfile('test1')
dfref = self.get_csv_refdf('test1')

df1 = excel.parse('Sheet1', index_col=0, parse_dates=True)
Expand Down