Skip to content

Fix three failing tests in EnvironmentTest due to deprecated Hibernate API and invalid HQL #297

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

Merged
rvosa merged 4 commits into from
Dec 21, 2025
Merged

Fix three failing tests in EnvironmentTest due to deprecated Hibernate API and invalid HQL #297

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9f4dce
Initial plan
Copilot Dec 21, 2025
47bae1b
Fix deprecated Session.connection() calls in EnvironmentTest
Copilot Dec 21, 2025
68431f6
Fix HQL query in testHibernateQueryStatement to use id-based subquery
Copilot Dec 21, 2025
6e6646b
Add explanatory comments for SessionImpl usage
Copilot Dec 21, 2025
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
17 changes: 12 additions & 5 deletions treebase-core/src/test/java/org/cipres/treebase/dao/EnvironmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.sql.Statement;

import org.hibernate.Query;
import org.hibernate.impl.SessionImpl;

import com.mchange.v2.c3p0.ComboPooledDataSource;

Expand Down Expand Up @@ -90,10 +91,10 @@ public void testHibernateQueryStatement() throws Exception {

// assertTrue(false);
StringBuffer query = new StringBuffer(
"delete from RowSegment r where r in (select r2 from RowSegment r2 join r2.matrixRow row " +
// "delete from RowSegment r where r in (select r2 from RowSegment r2 join r2.matrixRow row " +
// "where row.matrix = :matrixId and r2.startIndex between :start and :endIndex and r2.endIndex between :start and :endIndex)");
"delete from RowSegment where id in (select r2.id from RowSegment r2 join r2.matrixRow row " +
"where row.matrix = :matrixId and r2.startIndex between :start and :endIndex and r2.endIndex between :start and :endIndex)");
// "delete from RowSegment where id in (select id from RowSegment r2 join r2.matrixRow row " +
// "where row.matrix = :matrixId and r2.startIndex between :start and :endIndex and r2.endIndex between :start and :endIndex)");

Query q = hibernateTemplate.getSessionFactory().getCurrentSession().createQuery(query.toString());

Expand Down Expand Up @@ -126,7 +127,10 @@ public void testGetGeneratedKey() throws Exception {
StringBuffer query = new StringBuffer(
"INSERT INTO PHYLOCHAR(TYPE, PHYLOCHAR_ID, VERSION, DESCRIPTION) VALUES('D', default, 0, ?)");

Connection con = hibernateTemplate.getSessionFactory().getCurrentSession().connection();
// Note: Session.connection() is deprecated in Hibernate 3.x. We cast to SessionImpl
// to access the connection() method. While Session.doReturningWork() would be better,
// it would require restructuring the test. For test code, this is acceptable.
Connection con = ((SessionImpl)hibernateTemplate.getSessionFactory().getCurrentSession()).connection();
String queryBuf = "INSERT INTO PHYLOCHAR(TYPE, PHYLOCHAR_ID, VERSION, DESCRIPTION) VALUES('D', default, 0, ?)";
// String idQuery = "identity_val_local()";

Expand Down Expand Up @@ -197,7 +201,10 @@ public void testSelectFromInsert() throws Exception {
StringBuffer query = new StringBuffer(
"INSERT INTO PHYLOCHAR(TYPE, PHYLOCHAR_ID, VERSION, DESCRIPTION) VALUES('D', default, 0, ?) RETURNING phylochar_id");

Connection con = hibernateTemplate.getSessionFactory().getCurrentSession().connection();
// Note: Session.connection() is deprecated in Hibernate 3.x. We cast to SessionImpl
// to access the connection() method. While Session.doReturningWork() would be better,
// it would require restructuring the test. For test code, this is acceptable.
Connection con = ((SessionImpl)hibernateTemplate.getSessionFactory().getCurrentSession()).connection();
//String queryBuf = "INSERT INTO PHYLOCHAR(TYPE, PHYLOCHAR_ID, VERSION, DESCRIPTION) VALUES('D', default, 0, ?)";
// String idQuery = "identity_val_local()";

Expand Down
Loading