Fixed merge conflict.

ej2 · ej2 · commit 658fb7a027a0 · 2017-08-31T23:35:54.000-05:00
diff --git a/tests/integration/test_account.py b/tests/integration/test_account.py
@@ -46,5 +46,4 @@ def test_update(self):
         account.save(qb=self.qb_client)
 
         query_account = Account.get(account.Id, qb=self.qb_client)
-
         self.assertEquals(query_account.Name, "Updated Name {0}".format(self.account_number))
diff --git a/tests/unit/test_auth.py b/tests/unit/test_auth.py
@@ -1,5 +1,7 @@
 import unittest
 
+from quickbooks.exceptions import QuickbooksException
+
 from quickbooks.auth import Oauth1SessionManager
 
 try:
@@ -18,13 +20,106 @@ def test_init(self):
             consumer_secret='secret',
             access_token='token',
             access_token_secret='tokensecret',
-            callback_url='http://localhost',
             sandbox=True
         )
 
         self.assertEquals(session_manager.consumer_key, 'key')
         self.assertEquals(session_manager.consumer_secret, 'secret')
         self.assertEquals(session_manager.access_token, 'token')
         self.assertEquals(session_manager.access_token_secret, 'tokensecret')
-        self.assertEquals(session_manager.callback_url, 'http://localhost')
         self.assertEquals(session_manager.sandbox, True)
+
+    def test_start_session(self):
+        session_manager = Oauth1SessionManager(
+            consumer_key='key',
+            consumer_secret='secret',
+            access_token='token',
+            access_token_secret='tokensecret',
+            sandbox=True
+        )
+
+        session = session_manager.start_session()
+
+        self.assertEqual(session.access_token, 'token')
+        self.assertEqual(session.access_token_secret, 'tokensecret')
+        self.assertEqual(session_manager.started, True)
+
+    def test_start_session_no_consumer_key(self):
+        session_manager = Oauth1SessionManager(
+            consumer_key='',
+            consumer_secret='secret',
+            access_token='token',
+            access_token_secret='tokensecret',
+            sandbox=True
+        )
+
+        try:
+            with self.assertRaises(QuickbooksException) as error:
+                session_manager.start_session()
+
+            self.assertEqual(error.exception.message,
+                             "Consumer Key missing. Cannot create session.")
+        except:
+            self.failUnlessRaises(QuickbooksException, session_manager.start_session)
+
+        self.assertEqual(session_manager.started, False)
+
+    def test_start_session_no_consumer_secret(self):
+        session_manager = Oauth1SessionManager(
+            consumer_key='key',
+            consumer_secret='',
+            access_token='token',
+            access_token_secret='tokensecret',
+            sandbox=True
+        )
+
+        try:
+            with self.assertRaises(QuickbooksException) as error:
+                session_manager.start_session()
+
+            self.assertEqual(error.exception.message,
+                             "Consumer Secret missing. Cannot create session.")
+        except:
+            self.failUnlessRaises(QuickbooksException, session_manager.start_session)
+
+        self.assertEqual(session_manager.started, False)
+
+    def test_start_session_no_access_token(self):
+        session_manager = Oauth1SessionManager(
+            consumer_key='key',
+            consumer_secret='secret',
+            access_token='',
+            access_token_secret='tokensecret',
+            sandbox=True
+        )
+
+        try:
+            with self.assertRaises(QuickbooksException) as error:
+                session_manager.start_session()
+
+            self.assertEqual(error.exception.message,
+                             "Access Token missing. Cannot create session.")
+        except:
+            self.failUnlessRaises(QuickbooksException, session_manager.start_session)
+
+        self.assertEqual(session_manager.started, False)
+
+    def test_start_session_no_token_secret(self):
+        session_manager = Oauth1SessionManager(
+            consumer_key='key',
+            consumer_secret='secret',
+            access_token='token',
+            access_token_secret='',
+            sandbox=True
+        )
+
+        try:
+            with self.assertRaises(QuickbooksException) as error:
+                session_manager.start_session()
+
+            self.assertEqual(error.exception.message,
+                             "Access Token Secret missing. Cannot create session.")
+        except:
+            self.failUnlessRaises(QuickbooksException, session_manager.start_session)
+
+        self.assertEqual(session_manager.started, False)
diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py
@@ -1,4 +1,3 @@
-import httplib
 import unittest
 
 try:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import httplib`
`2`	`1`	`import unittest`
`3`	`2`
`4`	`3`	`try:`