Oracle JPA test fix - ucp.jar and boolean test for Oracle23C platform (…

…eclipse-ee4j#2014) Signed-off-by: Radek Felcman <[email protected]>
rfelcman · Nov 30, 2023 · e2dde6b · e2dde6b
1 parent a3e496e
commit e2dde6b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/...pa.test.jse/src/org/eclipse/persistence/jpa/test/property/TestConvertResultToBoolean.java b/...pa.test.jse/src/org/eclipse/persistence/jpa/test/property/TestConvertResultToBoolean.java
@@ -21,6 +21,7 @@
 import javax.persistence.Query;
 
 import org.eclipse.persistence.config.PersistenceUnitProperties;
+import org.eclipse.persistence.internal.helper.Helper;
 import org.eclipse.persistence.internal.jpa.EntityManagerFactoryImpl;
 import org.eclipse.persistence.jpa.test.framework.DDLGen;
 import org.eclipse.persistence.jpa.test.framework.Emf;
@@ -74,9 +75,13 @@ public void testCASE_DisableConvertResultToBoolean() {
             if(platform.isDB2() || platform.isDerby()) {
                 assertEquals(Integer.valueOf(1), intList.get(0));
                 assertEquals(Integer.valueOf(0), intList.get(1));
-            } else if(platform.isOracle()) {
+            } else if(platform.isOracle() && !platform.isOracle23()) {
                 assertEquals(new java.math.BigDecimal(1), intList.get(0));
                 assertEquals(new java.math.BigDecimal(0), intList.get(1));
+            } else if(platform.isOracle() && platform.isOracle23()) {
+                //No conversion happens on Oracle23C platform
+                assertEquals(Boolean.TRUE, intList.get(0));
+                assertEquals(Boolean.FALSE, intList.get(1));
             } else {
                 assertEquals(Long.valueOf(1), intList.get(0));
                 assertEquals(Long.valueOf(0), intList.get(1));

diff --git a/jpa/eclipselink.jpa.test/antbuild.properties b/jpa/eclipselink.jpa.test/antbuild.properties
@@ -158,6 +158,7 @@ eclipselink.proxyauthentication.model=eclipselink-proxyauthentication-model
 #---------------------------------------
 eclipselink.jpa.oracle=eclipselink-jpa-oracle
 oracle.sdoapi.jar=sdoapi.jar
+oracle.ucp.jar=ucp.jar
 oracle.xdb.jar=xdb.jar
 oracle.xmlparser.jar=xmlparserv2.jar
 oracle.orai18n-mapping.jar=orai18n-mapping.jar

diff --git a/jpa/eclipselink.jpa.test/antbuild.xml b/jpa/eclipselink.jpa.test/antbuild.xml
@@ -1739,6 +1739,7 @@
             <!-- Currently the Oracle extensions are included to allow running Oracle extensions tests from here. -->
             <pathelement path="${jpatest.2.oracletest.dir}/${classes.dir}"/>
             <pathelement path="${eclipselink.extension.oracle}/${classes.dir}"/>
+            <pathelement path="${oracle.extensions.depend.dir}/${oracle.ucp.jar}"/>
             <pathelement path="${oracle.extensions.depend.dir}/${oracle.xdb.jar}"/>
             <pathelement path="${oracle.extensions.depend.dir}/${oracle.xmlparser.jar}"/>
             <pathelement path="${oracle.extensions.depend.dir}/${oracle.orai18n-mapping.jar}"/>