Skip to content

Commit bcc9eea

Browse files
anthony-tuiningaanthony-tuininga
committed
Test improvements.
1 parent 0495841 commit bcc9eea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+629
-1164
lines changed

‎tests/test_1100_connection.py‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -161,29 +161,12 @@ def test_1105(self):
161161
with self.assertRaisesFullCode(
162162
"DPY-4000", "DPY-4026", "DPY-4027", "ORA-12154"
163163
):
164-
oracledb.connect(test_env.get_main_user())
164+
oracledb.connect("not a valid connect string!!")
165165
with self.assertRaisesFullCode("DPY-4000", "DPY-4001"):
166166
dsn = (
167167
test_env.get_main_user() + "@" + test_env.get_connect_string()
168168
)
169169
oracledb.connect(dsn)
170-
errors = (
171-
"DPY-4000",
172-
"DPY-4001",
173-
"DPY-4017",
174-
"ORA-12154",
175-
"ORA-12521",
176-
"ORA-12262",
177-
)
178-
with self.assertRaisesFullCode(*errors):
179-
dsn = (
180-
test_env.get_main_user()
181-
+ "@"
182-
+ test_env.get_connect_string()
183-
+ "/"
184-
+ test_env.get_main_password()
185-
)
186-
oracledb.connect(dsn)
187170

188171
def test_1106(self):
189172
"1106 - connection to database with bad password"

‎tests/test_1300_cursor_var.py‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,8 @@ def test_1302(self):
8787
open :pcursor for
8888
select 1 from dual;
8989
end;"""
90-
self.assertRaisesRegex(
91-
oracledb.NotSupportedError,
92-
"^DPY-3009:",
93-
cursor.execute,
94-
sql,
95-
pcursor=cursor,
96-
)
90+
with self.assertRaisesFullCode("DPY-3009"):
91+
cursor.execute(sql, pcursor=cursor)
9792

9893
def test_1303(self):
9994
"1303 - test returning a ref cursor after closing it"
@@ -253,9 +248,8 @@ def test_1310(self):
253248
)
254249
ref_cursor = ref_cursor_var.getvalue()
255250
if ref_cursor is not None:
256-
self.assertRaisesRegex(
257-
oracledb.DatabaseError, "^DPY-4025:", ref_cursor.fetchall
258-
)
251+
with self.assertRaisesFullCode("DPY-4025"):
252+
ref_cursor.fetchall()
259253

260254
def test_1311(self):
261255
"1311 - test fetching a cursor with a custom class"

‎tests/test_1600_dml_returning.py‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,15 @@ def test_1602(self):
8484
parameters = dict(
8585
int_val=int_val, str_val=str_val, int_var=int_var, str_var=str_var
8686
)
87-
self.assertRaisesRegex(
88-
oracledb.DatabaseError,
89-
"^DPY-4002:|^DPI-1037:",
90-
self.cursor.execute,
91-
"""
92-
insert into TestTempTable (IntCol, StringCol1)
93-
values (:int_val, :str_val)
94-
returning IntCol, StringCol1 into :int_var, :str_var
95-
""",
96-
parameters,
97-
)
87+
with self.assertRaisesFullCode("DPY-4002", "DPI-1037"):
88+
self.cursor.execute(
89+
"""
90+
insert into TestTempTable (IntCol, StringCol1)
91+
values (:int_val, :str_val)
92+
returning IntCol, StringCol1 into :int_var, :str_var
93+
""",
94+
parameters,
95+
)
9896

9997
def test_1603(self):
10098
"1603 - test update single row with DML returning"
@@ -371,13 +369,8 @@ def test_1612(self):
371369
parameters = dict(
372370
int_val=int_val, str_val=str_val, int_var=int_var, str_var=str_var
373371
)
374-
self.assertRaisesRegex(
375-
oracledb.DatabaseError,
376-
"^ORA-12899:",
377-
self.cursor.execute,
378-
sql,
379-
parameters,
380-
)
372+
with self.assertRaisesFullCode("ORA-12899"):
373+
self.cursor.execute(sql, parameters)
381374

382375
def test_1613(self):
383376
"1613 - test DML returning with no input variables, multiple iters"
@@ -408,9 +401,8 @@ def test_1615(self):
408401
insert into TestTempTable (IntCol)
409402
values (:int_val)
410403
returning IntCol, StringCol1 into :ROWID"""
411-
self.assertRaisesRegex(
412-
oracledb.DatabaseError, "^ORA-01745:", self.cursor.parse, sql
413-
)
404+
with self.assertRaisesFullCode("ORA-01745"):
405+
self.cursor.parse(sql)
414406

415407
def test_1616(self):
416408
"1616 - test DML returning with a non-ascii bind name"

‎tests/test_1800_interval_var.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,8 @@ def test_1811(self):
220220
def test_1812(self):
221221
"1812 - test year to month interval not supported"
222222
statement = "select INTERVAL '10-2' YEAR TO MONTH from dual"
223-
self.assertRaisesRegex(
224-
oracledb.NotSupportedError,
225-
"^DPY-3007:",
226-
self.cursor.execute,
227-
statement,
228-
)
223+
with self.assertRaisesFullCode("DPY-3007"):
224+
self.cursor.execute(statement)
229225

230226

231227
if __name__ == "__main__":

‎tests/test_1900_lob_var.py‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -164,24 +164,22 @@ def __test_lob_operations(self, lob_type):
164164
(lob,) = self.cursor.fetchone()
165165
self.assertFalse(lob.isopen())
166166
lob.open()
167-
self.assertRaisesRegex(oracledb.DatabaseError, "^ORA-22293:", lob.open)
167+
with self.assertRaisesFullCode("ORA-22293"):
168+
lob.open()
168169
self.assertTrue(lob.isopen())
169170
lob.close()
170-
self.assertRaisesRegex(
171-
oracledb.DatabaseError, "^ORA-22289:", lob.close
172-
)
171+
with self.assertRaisesFullCode("ORA-22289"):
172+
lob.close()
173173
self.assertFalse(lob.isopen())
174174
self.assertEqual(lob.size(), 75000)
175175
lob.write(write_value, 75001)
176176
self.assertRaises(TypeError, lob.write, 1000, 1)
177177
self.assertRaises(TypeError, lob.write, "data", "1")
178178
self.assertEqual(lob.size(), 75000 + len(write_value))
179-
self.assertRaisesRegex(
180-
oracledb.DatabaseError, "^DPY-2030:", lob.read, 0
181-
)
182-
self.assertRaisesRegex(
183-
oracledb.DatabaseError, "^DPY-2030:", lob.read, -25
184-
)
179+
with self.assertRaisesFullCode("DPY-2030"):
180+
lob.read(0)
181+
with self.assertRaisesFullCode("DPY-2030"):
182+
lob.read(-25)
185183
self.assertEqual(lob.read(), long_string + write_value)
186184
lob.write(write_value, 1)
187185
self.assertEqual(
@@ -191,13 +189,8 @@ def __test_lob_operations(self, lob_type):
191189
self.assertEqual(lob.size(), 25000)
192190
lob.trim(newSize=10000)
193191
self.assertEqual(lob.size(), 10000)
194-
self.assertRaisesRegex(
195-
oracledb.DatabaseError,
196-
"^DPY-2014:",
197-
lob.trim,
198-
new_size=50,
199-
newSize=60,
200-
)
192+
with self.assertRaisesFullCode("DPY-2014"):
193+
lob.trim(new_size=50, newSize=60)
201194
self.assertRaises(TypeError, lob.trim, new_size="10000")
202195
self.assertRaises(TypeError, lob.trim, newSize="10000")
203196
lob.trim(new_size=40)
@@ -564,12 +557,10 @@ def test_1935(self):
564557
conn = test_env.get_connection()
565558
lob = conn.createlob(typ, "Temp LOB")
566559
conn.close()
567-
self.assertRaisesRegex(
568-
oracledb.InterfaceError, "^DPY-1001:", lob.read
569-
)
570-
self.assertRaisesRegex(
571-
oracledb.InterfaceError, "^DPY-1001:", lob.write, "x"
572-
)
560+
with self.assertRaisesFullCode("DPY-1001"):
561+
lob.read()
562+
with self.assertRaisesFullCode("DPY-1001"):
563+
lob.write("x")
573564

574565

575566
if __name__ == "__main__":

‎tests/test_2000_long_var.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,8 @@ def test_2004(self):
125125
def test_2005(self):
126126
"2005 - test array size too large generates an exception"
127127
self.cursor.arraysize = 268435456
128-
self.assertRaisesRegex(
129-
oracledb.DatabaseError,
130-
"^DPI-1015:",
131-
self.cursor.execute,
132-
"select * from TestLongRaws",
133-
)
128+
with self.assertRaisesFullCode("DPI-1015"):
129+
self.cursor.execute("select * from TestLongRaws")
134130

135131

136132
if __name__ == "__main__":

‎tests/test_2200_number_var.py‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -440,40 +440,21 @@ def test_2227(self):
440440

441441
def test_2228(self):
442442
"2228 - test that unacceptable boundary numbers are rejected"
443-
in_values = [
444-
1e126,
445-
-1e126,
446-
float("inf"),
447-
float("-inf"),
448-
float("NaN"),
449-
decimal.Decimal("1e126"),
450-
decimal.Decimal("-1e126"),
451-
decimal.Decimal("inf"),
452-
decimal.Decimal("-inf"),
453-
decimal.Decimal("NaN"),
454-
]
455-
no_rep_err = "^DPY-4003:"
456-
invalid_err = "^DPY-4004:"
457-
expected_errors = [
458-
no_rep_err,
459-
no_rep_err,
460-
invalid_err,
461-
invalid_err,
462-
invalid_err,
463-
no_rep_err,
464-
no_rep_err,
465-
invalid_err,
466-
invalid_err,
467-
invalid_err,
443+
test_values = [
444+
(1e126, "DPY-4003"),
445+
(-1e126, "DPY-4003"),
446+
(float("inf"), "DPY-4004"),
447+
(float("-inf"), "DPY-4004"),
448+
(float("NaN"), "DPY-4004"),
449+
(decimal.Decimal("1e126"), "DPY-4003"),
450+
(decimal.Decimal("-1e126"), "DPY-4003"),
451+
(decimal.Decimal("inf"), "DPY-4004"),
452+
(decimal.Decimal("-inf"), "DPY-4004"),
453+
(decimal.Decimal("NaN"), "DPY-4004"),
468454
]
469-
for in_value, error in zip(in_values, expected_errors):
470-
self.assertRaisesRegex(
471-
oracledb.DatabaseError,
472-
error,
473-
self.cursor.execute,
474-
"select :1 from dual",
475-
[in_value],
476-
)
455+
for value, error in test_values:
456+
with self.assertRaisesFullCode(error):
457+
self.cursor.execute("select :1 from dual", [value])
477458

478459
def test_2229(self):
479460
"2229 - test that fetching the result of division returns a float"

0 commit comments

Comments
 (0)