[SESPRINGPYTHONPY-159] Rolled to version 1.2.1, and added test case for insert_and_return_id.

Greg Turnquist · Greg Turnquist · commit 603633b327f9 · 2011-02-15T14:10:42.000-06:00
diff --git a/springpython.properties b/springpython.properties
@@ -1,16 +1,16 @@
 # Collection of properties involved in managing Spring Python testing and packaging.
 
 # Don't forget to update docs/sphinx/source/conf.py's version properties.
-version=1.2.0
+version=1.2.1
 natural.name=se-springpython-py
 project.key=EXTPY
 
 # release, milestone or snapshot.  Trunk is always snapshot for CI build
-#release.type=snapshot
+release.type=snapshot
 
 # This property is only un-commented and set for official tagged releases.
-release.type=release
-build.stamp=FINAL
+#release.type=release
+#build.stamp=FINAL
 
 # This property is uncommented for milestone releases.
 #release.type=milestone
diff --git a/test/springpythontest/databaseCoreTestCases.py b/test/springpythontest/databaseCoreTestCases.py
@@ -132,11 +132,7 @@ def testQueryingOracleWithValidlyFormattedArguments(self):
         del(sys.modules["cx_Oracle"])
 
     def testInsertingIntoOracleWithInvalidlyFormattedArguments(self):
-        cursor = self.mock()
-        conn = self.mock()
-
         sys.modules["cx_Oracle"] = self.mock()
-        sys.modules["cx_Oracle"].expects(once()).method("connect").will(return_value(conn))
 
         connection_factory = factory.cxoraConnectionFactory(username="foo", password="bar", hostname="localhost", db="mock")
         dt = DatabaseTemplate(connection_factory)
@@ -148,11 +144,7 @@ def testInsertingIntoOracleWithInvalidlyFormattedArguments(self):
         del(sys.modules["cx_Oracle"])
 
     def testInsertingIntoOracleWithInvalidlyFormattedArgumentsWithUpdateApi(self):
-        cursor = self.mock()
-        conn = self.mock()
-
         sys.modules["cx_Oracle"] = self.mock()
-        sys.modules["cx_Oracle"].expects(once()).method("connect").will(return_value(conn))
 
         connection_factory = factory.cxoraConnectionFactory(username="foo", password="bar", hostname="localhost", db="mock")
         dt = DatabaseTemplate(connection_factory)
@@ -163,6 +155,18 @@ def testInsertingIntoOracleWithInvalidlyFormattedArgumentsWithUpdateApi(self):
 
         del(sys.modules["cx_Oracle"])
 
+    def testInsertingIntoOracleWithInvalidlyFormattedArgumentsWithInsertApi(self):
+        sys.modules["cx_Oracle"] = self.mock()
+
+        connection_factory = factory.cxoraConnectionFactory(username="foo", password="bar", hostname="localhost", db="mock")
+        dt = DatabaseTemplate(connection_factory)
+
+        self.assertRaises(InvalidArgumentType, dt.insert_and_return_id,
+            "INSERT INTO T_UNIT (F_UNIT_PK, F_UNIT_ID, F_NAME) VALUES (?, ?, ?)",
+            (1,1,1))
+
+        del(sys.modules["cx_Oracle"])
+
 class DatabaseTemplateMockTestCase(MockTestCase):
     """Testing the DatabaseTemplate utilizes stubbing and mocking, in order to isolate from different
     vendor implementations. This reduces the overhead in making changes to core functionality."""
