Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.7] Oracle JPA test fix - ucp.jar classpath and boolean test for Oracle23C platform #2014

Merged
merged 1 commit into from
Nov 30, 2023
Merged

[2.7] Oracle JPA test fix - ucp.jar classpath and boolean test for Oracle23C platform #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...pa.test.jse/src/org/eclipse/persistence/jpa/test/property/TestConvertResultToBoolean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
1 change: 1 addition & 0 deletions jpa/eclipselink.jpa.test/antbuild.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions jpa/eclipselink.jpa.test/antbuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand Down
Loading