Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Oracle seems to have changed their error handling. 

They now (tested with Oracle 18) behave more like other databases,
so we should validate whether one of the described error situations got
catched.
This commit is contained in:
Mark Struberg 2021-04-10 11:11:21 +02:00
parent c89a94abd8
commit d6a19dd56a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/TestBatchLimitException.java
View File

@ -355,6 +355,9 @@ public class TestBatchLimitException extends AbstractPersistenceTestCase {
assertNotNull("Failed object was null.", failedObject); assertNotNull("Failed object was null.", failedObject);
if (!isOracle && !isPostgres) { if (!isOracle && !isPostgres) {
assertEquals(expectedFailedObject, failedObject); assertEquals(expectedFailedObject, failedObject);
} else if (isOracle) {
// since Oracle 18 we see a different behaviour, so test both ways
assertTrue(failedObject.equals(expectedFailedObject) || failedObject.equals(expectedFailedObjectOracle) );
} else { } else {
// special case, as Oracle returns all statements in the batch // special case, as Oracle returns all statements in the batch
assertEquals(expectedFailedObjectOracle, failedObject); assertEquals(expectedFailedObjectOracle, failedObject);
@ -370,6 +373,9 @@ public class TestBatchLimitException extends AbstractPersistenceTestCase {
if (!isOracle && !isPostgres) { if (!isOracle && !isPostgres) {
assertTrue("Did not see expected text in message. Expected <" + expectedFailureMsg + "> but was " + assertTrue("Did not see expected text in message. Expected <" + expectedFailureMsg + "> but was " +
msg, msg.contains(expectedFailureMsg)); msg, msg.contains(expectedFailureMsg));
} else if (isOracle) {
// since Oracle 18 we see a different behaviour, so test both ways
assertTrue(msg.contains(expectedFailureMsg) || msg.contains(expectedFailureMsgOracle));
} else { } else {
// special case, as Oracle returns all statements in the batch // special case, as Oracle returns all statements in the batch
assertTrue("Did not see expected text in message. Expected <" + expectedFailureMsgOracle + "> but was " + assertTrue("Did not see expected text in message. Expected <" + expectedFailureMsgOracle + "> but was " +