Fixed issues and updated tests.

ej2 · ej2 · commit d843007ac10f · 2015-09-21T13:54:20.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,4 +7,5 @@ python:
   - 3.5
 install:
   - pip install -e .
+  - pip install coverage
 script: nosetests . --with-coverage --cover-package=quickbooks
diff --git a/quickbooks/batch.py b/quickbooks/batch.py
@@ -43,7 +43,7 @@ def list_to_batch_request(self, obj_list):
 
         for obj in obj_list:
             batch_item = BatchItemRequest()
-            batch_item.bId = str(uuid.uuid1())
+            batch_item.bId = str(uuid.uuid4())
             batch_item.operation = self._operation
             batch_item.set_object(obj)
 
diff --git a/quickbooks/mixins.py b/quickbooks/mixins.py
@@ -99,12 +99,12 @@ def where(cls, where_clause="", start_position="", max_results=""):
             where_clause = "WHERE " + where_clause
 
         if start_position:
-            start_position = " STARTPOSITION " + start_position
+            start_position = " STARTPOSITION " + str(start_position)
 
         if max_results:
-            max_results = " MAXRESULTS " + max_results
+            max_results = " MAXRESULTS " + str(max_results)
 
-        select = "select * from {0} {1}{2}{3}".format(cls.qbo_object_name, where_clause, start_position, max_results)
+        select = "SELECT * FROM {0} {1}{2}{3}".format(cls.qbo_object_name, where_clause, start_position, max_results)
 
         return cls.query(select)
 
diff --git a/quickbooks/objects/deposit.py b/quickbooks/objects/deposit.py
@@ -48,6 +48,11 @@ def __init__(self):
         self.CheckNum = ""
         self.TxnType = ""
 
+        self.Entity = None
+        self.ClassRef = None
+        self.AccountRef = None
+        self.PaymentMethodRef = None
+
 
 @python_2_unicode_compatible
 class DepositLine(QuickbooksBaseObject):
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@ def read(*parts):
         return fp.read()
 
 
-VERSION = (0, 3, 0)
+VERSION = (0, 3, 1)
 version = '.'.join(map(str, VERSION))
 
 setup(
diff --git a/tests/unit/objects/test_base.py b/tests/unit/objects/test_base.py
@@ -1,7 +1,9 @@
 import unittest
 
 from quickbooks.objects.base import CustomerMemo, CustomField, Ref, WebAddress, EmailAddress, PhoneNumber, \
-    Address, LinkedTxn, MetaData, MarkupInfo, AttachableRef
+    Address, LinkedTxn, MetaData, MarkupInfo, AttachableRef, LinkedTxnMixin
+
+from quickbooks.objects.deposit import Deposit
 
 
 class AddressTests(unittest.TestCase):
@@ -100,4 +102,17 @@ def test_init(self):
         self.assertEquals(attachable.IncludeOnSend, False)
         self.assertEquals(attachable.Inactive, False)
         self.assertEquals(attachable.NoRefOnly, False)
-        self.assertEquals(attachable.EntityRef, None)
+        self.assertEquals(attachable.EntityRef, None)
+
+
+class LinkedTxnMixinTests(unittest.TestCase):
+    def test_to_linked_txn(self):
+
+        deposit = Deposit()
+        deposit.Id = 100
+
+        linked_txn = deposit.to_linked_txn()
+
+        self.assertEquals(linked_txn.TxnId, 100)
+        self.assertEquals(linked_txn.TxnType, "Deposit")
+        self.assertEquals(linked_txn.TxnLineId, 1)
diff --git a/tests/unit/objects/test_bill.py b/tests/unit/objects/test_bill.py
@@ -1,6 +1,6 @@
 import unittest
 
-from quickbooks.objects.bill import Bill, BillLine, AccountBasedExpenseLineDetail
+from quickbooks.objects.bill import Bill, BillLine, AccountBasedExpenseLineDetail, ItemBasedExpenseLineDetail
 
 
 class AccountBasedExpenseLineDetailTests(unittest.TestCase):
@@ -25,3 +25,19 @@ def test_unicode(self):
         bill_line.Amount = 1000
 
         self.assertEquals(str(bill_line), "1000")
+
+
+class ItemBasedExpenseLineDetailTest(unittest.TestCase):
+    def test_init(self):
+        detail = ItemBasedExpenseLineDetail()
+
+        self.assertEquals(detail.BillableStatus, "")
+        self.assertEquals(detail.UnitPrice, 0)
+        self.assertEquals(detail.TaxInclusiveAmt, 0)
+        self.assertEquals(detail.Qty, 0)
+        self.assertEquals(detail.ItemRef, None)
+        self.assertEquals(detail.ClassRef, None)
+        self.assertEquals(detail.PriceLevelRef, None)
+        self.assertEquals(detail.TaxCodeRef, None)
+        self.assertEquals(detail.MarkupInfo, None)
+        self.assertEquals(detail.CustomerRef, None)
diff --git a/tests/unit/objects/test_creditmemo.py b/tests/unit/objects/test_creditmemo.py
@@ -1,6 +1,7 @@
 import unittest
 
-from quickbooks.objects.creditmemo import SalesItemLineDetail, CreditMemoLine, CreditMemo, DiscountLineDetail
+from quickbooks.objects.creditmemo import SalesItemLineDetail, CreditMemoLine, CreditMemo, \
+    DiscountLineDetail, SubtotalLineDetail, DiscountOverride, DescriptionLineDetail
 
 
 class SalesItemLineDetailTests(unittest.TestCase):
@@ -36,3 +37,28 @@ def test_init(self):
         self.assertEquals(discount_detail.ClassRef, None)
         self.assertEquals(discount_detail.TaxCodeRef, None)
         self.assertEquals(discount_detail.Discount, None)
+
+
+class SubtotalLineDetailTests(unittest.TestCase):
+    def test_init(self):
+        detail = SubtotalLineDetail()
+
+        self.assertEquals(detail.ItemRef, None)
+
+
+class DiscountOverrideTests(unittest.TestCase):
+    def test_init(self):
+        discount_detail = DiscountOverride()
+
+        self.assertEquals(discount_detail.PercentBased, False)
+        self.assertEquals(discount_detail.DiscountPercent, 0)
+        self.assertEquals(discount_detail.DiscountAccountRef, None)
+        self.assertEquals(discount_detail.DiscountRef, None)
+
+
+class DescriptionLineDetailTests(unittest.TestCase):
+    def test_init(self):
+        detail = DescriptionLineDetail()
+
+        self.assertEquals(detail.ServiceDate, "")
+        self.assertEquals(detail.TaxCodeRef, None)
diff --git a/tests/unit/objects/test_deposit.py b/tests/unit/objects/test_deposit.py
@@ -1,6 +1,6 @@
 import unittest
 
-from quickbooks.objects.deposit import Deposit, DepositLine, AttachableRef, CashBackInfo
+from quickbooks.objects.deposit import Deposit, DepositLine, AttachableRef, CashBackInfo, DepositLineDetail
 
 
 class DepositTests(unittest.TestCase):
@@ -37,3 +37,15 @@ def test_init(self):
         self.assertEquals(cash_back_info.Amount, 0)
         self.assertEquals(cash_back_info.Memo, "")
         self.assertEquals(cash_back_info.AccountRef, None)
+
+
+class DepositLineDetailTests(unittest.TestCase):
+    def test_init(self):
+        detail = DepositLineDetail()
+
+        self.assertEquals(detail.Entity, None)
+        self.assertEquals(detail.ClassRef, None)
+        self.assertEquals(detail.AccountRef, None)
+        self.assertEquals(detail.PaymentMethodRef, None)
+        self.assertEquals(detail.CheckNum, "")
+        self.assertEquals(detail.TxnType, "")
diff --git a/tests/unit/objects/test_journalentry.py b/tests/unit/objects/test_journalentry.py
@@ -1,6 +1,8 @@
 import unittest
 
-from quickbooks.objects.journalentry import JournalEntry, JournalEntryLine, JournalEntryLineDetail
+from quickbooks.objects.journalentry import JournalEntry, JournalEntryLine, JournalEntryLineDetail, Entity, \
+    DescriptionLineDetail, DescriptionOnlyLine
+
 
 
 class JournalentryTests(unittest.TestCase):
@@ -32,3 +34,25 @@ def test_init(self):
         self.assertEquals(journalentry.ClassRef, None)
         self.assertEquals(journalentry.DepartmentRef, None)
         self.assertEquals(journalentry.TaxCodeRef, None)
+
+
+class EntityTests(unittest.TestCase):
+    def test_init(self):
+        entity = Entity()
+
+        self.assertEquals(entity.Type, "")
+        self.assertEquals(entity.EntityRef, None)
+
+
+class DescriptionLineDetailTests(unittest.TestCase):
+    def test_init(self):
+        detail = DescriptionLineDetail()
+
+        self.assertEquals(detail.ServiceDate, "")
+
+
+class DescriptionOnlyLineTests(unittest.TestCase):
+    def test_init(self):
+        line = DescriptionOnlyLine()
+
+        self.assertEquals(line.DetailType, "DescriptionOnly")
diff --git a/tests/unit/objects/test_purchaseorder.py b/tests/unit/objects/test_purchaseorder.py
@@ -1,6 +1,6 @@
 import unittest
 
-from quickbooks.objects.purchaseorder import PurchaseOrderLine, PurchaseOrder
+from quickbooks.objects.purchaseorder import PurchaseOrderLine, PurchaseOrder, ItemBasedExpenseLineDetail
 
 
 class PurchaseOrderLineTests(unittest.TestCase):
@@ -17,3 +17,18 @@ def test_unicode(self):
         purchase_order.TotalAmt = 1000
 
         self.assertEquals(str(purchase_order), '1000')
+
+
+class ItemBasedExpenseLineDetailTests(unittest.TestCase):
+    def test_init(self):
+        detail = ItemBasedExpenseLineDetail()
+
+        self.assertEquals(detail.UnitPrice, 0)
+        self.assertEquals(detail.Qty, 0)
+        self.assertEquals(detail.BillableStatus, "")
+        self.assertEquals(detail.TaxInclusiveAmt, 0)
+        self.assertEquals(detail.PriceLevelRef, None)
+        self.assertEquals(detail.CustomerRef, None)
+        self.assertEquals(detail.ClassRef, None)
+        self.assertEquals(detail.TaxCodeRef, None)
+        self.assertEquals(detail.MarkupInfo, None)
diff --git a/tests/unit/objects/test_vendor.py b/tests/unit/objects/test_vendor.py
@@ -1,6 +1,6 @@
 import unittest
 
-from quickbooks.objects.vendor import Vendor
+from quickbooks.objects.vendor import Vendor, ContactInfo
 
 
 class VendorTests(unittest.TestCase):
@@ -20,3 +20,11 @@ def test_to_ref(self):
         self.assertEquals(ref.name, "test")
         self.assertEquals(ref.type, "Vendor")
         self.assertEquals(ref.value, 100)
+
+
+class ContactInfoTests(unittest.TestCase):
+    def test_init(self):
+        contact_info = ContactInfo()
+
+        self.assertEquals(contact_info.Type, "")
+        self.assertEquals(contact_info.Telephone, None)
diff --git a/tests/unit/test_batch.py b/tests/unit/test_batch.py
@@ -2,6 +2,7 @@
 from mock import patch
 from quickbooks import batch, client
 from quickbooks.objects.customer import Customer
+from quickbooks.exceptions import QuickbooksException
 
 
 class BatchTests(unittest.TestCase):
@@ -21,6 +22,9 @@ def setUp(self):
         self.object2 = Customer()
         self.obj_list = [self.object1, self.object2]
 
+    def test_invalid_operation(self):
+        self.assertRaises(QuickbooksException, batch.BatchManager, "invalid")
+
     @patch('quickbooks.batch.BatchManager.process_batch')
     def test_batch_create(self, process_batch):
         results = batch.batch_create(self.obj_list)
@@ -46,6 +50,7 @@ def test_list_to_batch_request(self):
 
         batch_item = batch_request.BatchItemRequest[0]
         self.assertTrue(batch_item.bId)
+        self.assertLess(len(batch_item.bId), 50)
         self.assertEquals(batch_item.operation, "create")
         self.assertEquals(batch_item.get_object(), self.object1)
 
@@ -65,4 +70,4 @@ def test_batch_results_to_list(self):
         results = batch_mgr.batch_results_to_list(json_data, batch_request, self.obj_list)
 
         self.assertEquals(len(results.faults), 1)
-        self.assertEquals(len(results.successes), 1)
+        self.assertEquals(len(results.successes), 1)
diff --git a/tests/unit/test_mixins.py b/tests/unit/test_mixins.py
@@ -28,12 +28,12 @@ def test_filter(self, where):
 
     @patch('quickbooks.mixins.ListMixin.query')
     def test_where(self, query):
-        Department.where("Active=True")
-        query.assert_called_once_with("select * from Department WHERE Active=True")
+        Department.where("Active=True", 1, 10)
+        query.assert_called_once_with("SELECT * FROM Department WHERE Active=True STARTPOSITION 1 MAXRESULTS 10")
 
     @patch('quickbooks.mixins.QuickBooks.query')
     def test_query(self, query):
-        select = "select * from Department WHERE Active=True"
+        select = "SELECT * FROM Department WHERE Active=True"
         Department.query(select)
         query.assert_called_once_with(select)
 
@@ -51,3 +51,12 @@ def test_save_create(self, create_object):
         department = Department()
         department.save()
         create_object.assert_called_once_with("Department", department.to_json())
+
+    @patch('quickbooks.mixins.QuickBooks.update_object')
+    def test_save_update(self, update_object):
+        department = Department()
+        department.Id = 1
+        json = department.to_json()
+
+        department.save()
+        update_object.assert_called_once_with("Department", json)
