test against pyexcel v0.3.0

Author: chfw

rnd_requirements.txt

@@ -1,4 +1 @@
 https://github.com/pyexcel/pyexcel/archive/master.zip
-https://github.com/pyexcel/pyexcel-io/archive/master.zip
-https://github.com/pyexcel/pyexcel-xls/archive/master.zip
-https://github.com/pyexcel/pyexcel/archive/master.zip

tests/base.py

@@ -1,5 +1,6 @@
-import pyexcel
 import os
+import pyexcel
+from nose.tools import eq_
 
 
 def create_sample_file1(file):
@@ -24,8 +25,7 @@ class PyexcelHatWriterBase:
     def test_series_table(self):
         pyexcel.save_as(adict=self.content, dest_file_name=self.testfile)
         r = pyexcel.get_sheet(file_name=self.testfile, name_columns_by_row=0)
-        actual = pyexcel.utils.to_dict(r)
-        assert actual == self.content
+        eq_(r.dict, self.content)
 
 
 class PyexcelWriterBase:
@@ -48,7 +48,7 @@ def _create_a_file(self, file):
     def test_write_array(self):
         self._create_a_file(self.testfile)
         r = pyexcel.get_sheet(file_name=self.testfile)
-        actual = pyexcel.utils.to_array(r.rows())
+        actual = list(r.rows())
         assert actual == self.content
 
 
@@ -72,36 +72,17 @@ def test_sheet_names(self):
 
     def test_reading_through_sheets(self):
         b = pyexcel.BookReader(self.testfile)
-        data = pyexcel.utils.to_array(b["Sheet1"].rows())
+        data = list(b["Sheet1"].rows())
         expected = [[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3]]
         assert data == expected
-        data = pyexcel.utils.to_array(b["Sheet2"].rows())
+        data = list(b["Sheet2"].rows())
         expected = [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]]
         assert data == expected
-        data = pyexcel.utils.to_array(b["Sheet3"].rows())
+        data = list(b["Sheet3"].rows())
         expected = [[u'X', u'Y', u'Z'], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
         assert data == expected
         sheet3 = b["Sheet3"]
         sheet3.name_columns_by_row(0)
-        data = pyexcel.utils.to_array(b["Sheet3"].rows())
+        data = list(b["Sheet3"].rows())
         expected = [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
         assert data == expected
-
-    def test_iterate_through_sheets(self):
-        b = pyexcel.BookReader(self.testfile)
-        for s in b:
-            data = pyexcel.utils.to_array(s)
-            assert self.content[s.name] == data
-        si = pyexcel.sheets.iterators.SheetIterator(b)
-        for s in si:
-            data = pyexcel.utils.to_array(s)
-            assert self.content[s.name] == data
-
-    def test_random_access_operator(self):
-        r = pyexcel.BookReader(self.testfile)
-        value = r["Sheet1"][0, 1]
-        assert value == 1
-        value = r["Sheet3"][0, 1]
-        assert value == 'Y'
-        r["Sheet3"].name_columns_by_row(0)
-        assert r["Sheet3"][0, 1] == 4

tests/test_bug_fixes.py

@@ -9,7 +9,7 @@
 from unittest import TestCase
 import pyexcel as pe
 from pyexcel_xlsx.xlsx import get_columns
-from pyexcel.sheets.matrix import _excel_column_index
+from pyexcel.sheets._shared import excel_column_index
 from nose.tools import eq_
 
 
@@ -46,7 +46,7 @@ def test_pyexcel_issue_4(self):
         ]
         for column_name in indices:
             print("Testing %s" % column_name)
-            column_index = _excel_column_index(column_name)
+            column_index = excel_column_index(column_name)
             new_column_name = get_columns(column_index)
             print(column_index)
             print(column_name)

tests/test_mutliple_sheets.py renamed to tests/test_multiple_sheets.py

@@ -1,9 +1,7 @@
 import os
 import sys
-from nose.tools import raises
-
 import pyexcel
-
+from nose.tools import raises
 from base import PyexcelMultipleSheetBase
 
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
@@ -44,7 +42,8 @@ def _write_test_file(self, file):
         3,3,3,3
         """
         self.rows = 3
-        pyexcel.save_book_as(bookdict=self.content, dest_file_name=file)
+        pyexcel.save_book_as(bookdict=self.content,
+                             dest_file_name=file)
 
     def setUp(self):
         self.testfile = "multiple3.xlsx"
@@ -68,7 +67,7 @@ def test_load_a_single_sheet2(self):
 
     @raises(IndexError)
     def test_load_a_single_sheet3(self):
-        pyexcel.load_book(self.testfile, sheet_index=10000)
+        pyexcel.get_book(file_name=self.testfile, sheet_index=10000)
 
     @raises(KeyError)
     def test_load_a_single_sheet4(self):
@@ -110,7 +109,7 @@ def test_add_book1(self):
         b1 = pyexcel.get_book(file_name=self.testfile)
         b2 = pyexcel.get_book(file_name=self.testfile2)
         b3 = b1 + b2
-        content = pyexcel.utils.to_dict(b3)
+        content = b3.dict
         sheet_names = content.keys()
         assert len(sheet_names) == 6
         for name in sheet_names:
@@ -123,12 +122,12 @@ def test_add_book1(self):
 
     def test_add_book1_in_place(self):
         """
-        test this scenario book1 +=  book2
+        test this scenario: book1 +=  book2
         """
         b1 = pyexcel.BookReader(self.testfile)
         b2 = pyexcel.BookReader(self.testfile2)
         b1 += b2
-        content = pyexcel.utils.to_dict(b1)
+        content = b1.dict
         sheet_names = content.keys()
         assert len(sheet_names) == 6
         for name in sheet_names:
@@ -141,12 +140,12 @@ def test_add_book1_in_place(self):
 
     def test_add_book2(self):
         """
-        test this scenario book3 = book1 + sheet3
+        test this scenario: book3 = book1 + sheet3
         """
         b1 = pyexcel.BookReader(self.testfile)
         b2 = pyexcel.BookReader(self.testfile2)
         b3 = b1 + b2["Sheet3"]
-        content = pyexcel.utils.to_dict(b3)
+        content = b3.dict
         sheet_names = content.keys()
         assert len(sheet_names) == 4
         for name in sheet_names:
@@ -159,12 +158,12 @@ def test_add_book2(self):
 
     def test_add_book2_in_place(self):
         """
-        test this scenario book3 = book1 + sheet3
+        test this scenario: book3 = book1 + sheet3
         """
         b1 = pyexcel.BookReader(self.testfile)
         b2 = pyexcel.BookReader(self.testfile2)
         b1 += b2["Sheet3"]
-        content = pyexcel.utils.to_dict(b1)
+        content = b1.dict
         sheet_names = content.keys()
         assert len(sheet_names) == 4
         for name in sheet_names:
@@ -177,25 +176,25 @@ def test_add_book2_in_place(self):
 
     def test_add_book3(self):
         """
-        test this scenario book3 = sheet1 + sheet2
+        test this scenario: book3 = sheet1 + sheet2
         """
         b1 = pyexcel.BookReader(self.testfile)
         b2 = pyexcel.BookReader(self.testfile2)
         b3 = b1["Sheet1"] + b2["Sheet3"]
-        content = pyexcel.utils.to_dict(b3)
+        content = b3.dict
         sheet_names = content.keys()
         assert len(sheet_names) == 2
         assert content["Sheet3"] == self.content["Sheet3"]
         assert content["Sheet1"] == self.content["Sheet1"]
 
     def test_add_book4(self):
         """
-        test this scenario book3 = sheet1 + book
+        test this scenario: book3 = sheet1 + book
         """
         b1 = pyexcel.BookReader(self.testfile)
         b2 = pyexcel.BookReader(self.testfile2)
         b3 = b1["Sheet1"] + b2
-        content = pyexcel.utils.to_dict(b3)
+        content = b3.dict
         sheet_names = content.keys()
         assert len(sheet_names) == 4
         for name in sheet_names:

tests/test_stringio.py

@@ -1,4 +1,5 @@
 import os
+from nose.tools import eq_
 import pyexcel
 from base import create_sample_file1
 
@@ -12,8 +13,8 @@ def test_ods_stringio(self):
             content = f.read()
             r = pyexcel.get_sheet(file_type="xlsx", file_content=content)
             result = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 1.1, 1]
-            actual = pyexcel.utils.to_array(r.enumerate())
-            assert result == actual
+            actual = list(r.enumerate())
+            eq_(result, actual)
         if os.path.exists(odsfile):
             os.unlink(odsfile)
 
@@ -25,5 +26,5 @@ def test_xls_output_stringio(self):
         io = pyexcel.save_as(dest_file_type='xlsx', array=data)
         r = pyexcel.get_sheet(file_type="xlsx", file_content=io.getvalue())
         result = [1, 2, 3, 4, 5, 6]
-        actual = pyexcel.utils.to_array(r.enumerate())
-        assert result == actual
+        actual = list(r.enumerate())
+        eq_(result, actual)