Skip to content

Commit f46c018

Browse files
committed
update tests with latest pyexcel api
1 parent d5959fe commit f46c018

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

tests/test_database_io.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ def test_single_sheet_file(self):
2626
data={"file": (io, file_name)},
2727
content_type="multipart/form-data")
2828
ret = pe.get_array(file_type="xls", file_content=response.data)
29-
print(ret)
3029
assert array == ret
3130

3231

@@ -60,7 +59,6 @@ def test_book_file(self):
6059
data={"file": (io, file_name)},
6160
content_type="multipart/form-data")
6261
ret = pe.get_book_dict(file_type="xls", file_content=response.data)
63-
print(ret)
6462
assert data['Category'] == ret['category']
6563
sheet = pe.Sheet(data['Post'], name_columns_by_row=0)
6664
sheet.column.format("pub_date", lambda d: d.isoformat())

tests/test_make_responses.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from testapp import app
22
import pyexcel as pe
3-
from _compact import OrderedDict, BytesIO
3+
from _compact import OrderedDict
44

55

66
class TestSheet:
@@ -16,16 +16,14 @@ def setUp(self):
1616
def test_array(self):
1717
for struct_type in ["array", "dict", "records"]:
1818
print("Testing %s" % struct_type)
19-
io = BytesIO()
20-
sheet = pe.Sheet(self.data)
21-
sheet.save_to_memory('xls', io)
19+
io = pe.save_as(dest_file_type="xls", array=self.data)
2220
io.seek(0)
2321
response = self.app.post('/exchange/%s' % struct_type,
2422
buffered=True,
2523
data={"file": (io, "test.xls")},
2624
content_type="multipart/form-data")
2725
assert response.content_type == "application/vnd.ms-excel"
28-
sheet = pe.load_from_memory('xls', response.data)
26+
sheet = pe.get_sheet(file_type='xls', file_content=response.data)
2927
assert sheet.to_array() == self.data
3028

3129

@@ -41,14 +39,11 @@ def setUp(self):
4139

4240
def test_book(self):
4341
for struct_type in ["book", "book_dict"]:
44-
io = BytesIO()
45-
book = pe.Book(self.content)
46-
book.save_to_memory('xls', io)
47-
io.seek(0)
42+
io = pe.save_book_as(bookdict=self.content, dest_file_type="xls")
4843
response = self.app.post('/exchange/%s' % struct_type,
4944
buffered=True,
5045
data={"file": (io, "test.xls")},
5146
content_type="multipart/form-data")
5247
assert response.content_type == "application/vnd.ms-excel"
53-
book2 = pe.load_book_from_memory('xls', response.data)
48+
book2 = pe.get_book(file_type='xls', file_content=response.data)
5449
assert book2.to_dict() == self.content

tests/test_upload_n_download_excel.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ def test_download(self):
2929
file_name = 'test.%s' % upload_file_type
3030
for download_file_type in FILE_TYPE_MIME_TABLE.keys():
3131
print("Uploading %s Downloading %s" % (upload_file_type, download_file_type))
32-
io = pe.get_io(upload_file_type)
33-
sheet = pe.Sheet(self.data)
34-
sheet.save_to_memory(upload_file_type, io)
35-
io.seek(0)
32+
io = pe.save_as(dest_file_type=upload_file_type, array=self.data)
3633
if not PY2:
3734
if not isinstance(io, BytesIO):
3835
io = BytesIO(io.getvalue().encode('utf-8'))
@@ -41,7 +38,8 @@ def test_download(self):
4138
data={"file": (io, file_name)},
4239
content_type="multipart/form-data")
4340
assert response.content_type == FILE_TYPE_MIME_TABLE[download_file_type]
44-
sheet = pe.load_from_memory(download_file_type, response.data)
41+
sheet = pe.get_sheet(file_type=download_file_type,
42+
file_content=response.data)
4543
sheet.format(int)
4644
array = sheet.to_array()
4745
assert array == self.data

0 commit comments

Comments
 (0)