Skip to content

Commit 05ea936

Browse files
committed
Fixed tests
1 parent ffbc743 commit 05ea936

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/test/java/org/javawebstack/orm/test/querybuilding/FromClauseTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.javawebstack.orm.Model;
44
import org.javawebstack.orm.ORM;
55
import org.javawebstack.orm.Repo;
6+
import org.javawebstack.orm.connection.pool.PooledSQL;
67
import org.javawebstack.orm.exception.ORMConfigurationException;
78
import org.javawebstack.orm.test.ORMTestCase;
89
import org.javawebstack.orm.test.shared.models.tablenames.*;
@@ -68,6 +69,8 @@ void testOverwrittenTableName() throws ORMConfigurationException {
6869
*/
6970
private String getBaseQuery(Class<? extends Model> clazz) throws ORMConfigurationException {
7071
ORM.register(clazz, sql());
71-
return Repo.get(clazz).getConnection().builder().buildQuery(Repo.get(clazz).query()).getQuery();
72+
try(PooledSQL sql = Repo.get(clazz).getPool().get()) {
73+
return sql.builder().buildQuery(Repo.get(clazz).query()).getQuery();
74+
}
7275
}
7376
}

src/test/java/org/javawebstack/orm/test/shared/verification/QueryVerification.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.javawebstack.orm.test.shared.verification;
22

3+
import org.javawebstack.orm.connection.pool.PooledSQL;
34
import org.javawebstack.orm.query.Query;
45
import org.javawebstack.orm.test.exception.SectionIndexOutOfBoundException;
56
import org.javawebstack.orm.test.shared.util.QueryStringUtil;
@@ -145,8 +146,10 @@ public String getSection(String topLevelKeyword, int sectionIndex) throws Sectio
145146
* @return The order sensitive string list of inner sections.
146147
*/
147148
public List<String> getSectionList(String topLevelKeyword) {
148-
return new QueryStringUtil(this.query.getRepo().getConnection().builder().buildQuery(this.query).getQuery())
149-
.getTopLevelSectionsByKeyword(topLevelKeyword);
149+
try(PooledSQL sql = this.query.getRepo().getPool().get()) {
150+
return new QueryStringUtil(sql.builder().buildQuery(this.query).getQuery())
151+
.getTopLevelSectionsByKeyword(topLevelKeyword);
152+
}
150153
}
151154

152155
private void failDueToSectionIndexOutOfBounds(SectionIndexOutOfBoundException exception) {

0 commit comments

Comments
 (0)