Author: tv
Date: Mon Jul 27 08:58:48 2026
New Revision: 1936618
Log:
Organize imports in test classes
Added:
db/torque/trunk/torque-test/src/main/resources/
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsJoinTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ViewTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/BaseOptimisticLockingTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoUpdateTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ExecuteStatementsTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GroupByTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/QualifiedTableNameTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerCallbackMySQLExtension.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerCallbackPostgreSQLExtension.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerDatabaseAbstractExtension.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerPostGresCallback.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,10 @@ package org.apache.torque;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.List;
import org.apache.commons.logging.Log;
@@ -35,13 +39,6 @@ import org.apache.torque.util.BasePeerIm
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-
/**
* Runtime tests to make sure that the code which is supplied
* in the documentation actually works ;-)
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,11 @@ package org.apache.torque;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -33,13 +38,6 @@ import org.apache.torque.test.manager.Bo
import org.apache.torque.test.manager.TestInterfaceManager;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-
/**
* Runtime tests for managers and caching.
*
@@ -102,9 +100,9 @@ public class ManagerTestConditional exte
author2.setName("author2");
author2.save();
- List<ObjectKey<?>> authorKeys =
+ List<ObjectKey<?>> authorKeys =
Stream.of(author1.getPrimaryKey(), author2.getPrimaryKey())
- .collect(Collectors.toList());
+ .collect(Collectors.toList());
List<Author> authors = AuthorManager.getInstances(authorKeys);
assertSame(author1, authors.get(0));
assertSame(author2, authors.get(1));
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,10 @@ package org.apache.torque.datatypes;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.apache.commons.logging.Log;
@@ -38,12 +42,6 @@ import org.apache.torque.test.peer.BitTy
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Tests the data types BIT.
* @version $Id$
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,9 @@ package org.apache.torque.datatypes;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -48,14 +51,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-
-
/**
* Tests the enum data types.
* @version $Id: BooleanIntCharTest.java 1439295 2013-01-28 08:21:41Z tfischer
$
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsJoinTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsJoinTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsJoinTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,10 @@ package org.apache.torque.generated.data
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
import java.util.List;
import org.apache.torque.BaseDatabaseTestCase;
@@ -36,15 +40,6 @@ import org.apache.torque.test.peer.PInte
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertNull;
-
/**
* Tests the fjoin getter methods for related objects in the generated
* data object classes.
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,11 @@ package org.apache.torque.generated.data
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.sql.Connection;
import java.util.List;
@@ -35,13 +40,6 @@ import org.apache.torque.util.Transactio
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-
/**
* Tests whether the getRelatedObjects methods works
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,10 @@ package org.apache.torque.generated.data
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
import java.util.List;
import org.apache.commons.logging.Log;
@@ -41,12 +45,6 @@ import org.apache.torque.util.CountHelpe
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Tests whether the save methods work in the db object classes.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ViewTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ViewTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ViewTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,8 @@ package org.apache.torque.generated.data
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+
import java.util.List;
import org.apache.torque.BaseDatabaseTestCase;
@@ -28,15 +30,6 @@ import org.apache.torque.test.dbobject.B
import org.apache.torque.test.peer.BookAuthorsPeer;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertNull;
-
/**
* Tests whether the save methods work in the db object classes.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/BaseOptimisticLockingTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/BaseOptimisticLockingTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/BaseOptimisticLockingTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,10 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
@@ -32,11 +36,6 @@ import org.apache.torque.TorqueException
import org.apache.torque.criteria.Criteria;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
/**
* Tests whether optimistic locking works.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,11 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -39,12 +44,6 @@ import org.apache.torque.test.peer.NopkP
import org.apache.torque.test.peer.NullableOIntegerFkPeer;
import org.apache.torque.test.peer.OIntegerPkPeer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests the delete methods in the generated Peer classes.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,10 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
import java.math.BigDecimal;
import java.sql.Types;
import java.util.List;
@@ -46,12 +50,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Tests the doInsert Methods in the Peer classes.
*
@@ -66,7 +64,7 @@ public class DoInsertTest extends BaseDa
@BeforeEach
public void setUp() throws Exception
{
-
+
cleanBookstore();
authorList = insertBookstoreData();
}
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoUpdateTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoUpdateTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoUpdateTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -1,7 +1,5 @@
package org.apache.torque.generated.peer;
-import static org.junit.Assert.assertEquals;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import static org.junit.Assert.assertEqu
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+
import java.sql.Types;
import java.util.List;
@@ -35,14 +35,6 @@ import org.apache.torque.util.ColumnValu
import org.apache.torque.util.JdbcTypedValue;
import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertNull;
/**
* Tests the doUpdate Methods in the Peer classes.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ExecuteStatementsTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ExecuteStatementsTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ExecuteStatementsTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,8 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+
import java.sql.Types;
import java.util.HashMap;
import java.util.List;
@@ -37,12 +39,6 @@ import org.junit.jupiter.api.parallel.Ex
import org.junit.jupiter.api.parallel.ExecutionMode;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests executeStatement calls.
*
@@ -72,17 +68,17 @@ public class ExecuteStatementsTest exten
Map<String, JdbcTypedValue> replacements = new HashMap<>();
replacements.put("name", new JdbcTypedValue("Author 1",
Types.VARCHAR));
replacements.put("newname", new JdbcTypedValue("Author 1 changed",
Types.VARCHAR));
-
+
boolean unqualifiedSetColumn = false;
if (adapter instanceof PostgresAdapter) {
// needs unqualified column in set
unqualifiedSetColumn = true;
}
-
+
int updateCount = AuthorPeer.executeStatement(
"update " + AuthorPeer.TABLE_NAME + " set " +
((unqualifiedSetColumn)? AuthorPeer.NAME.getColumnName():AuthorPeer.NAME) +
"=:newname where " + AuthorPeer.NAME + "=:name",
replacements);
-
+
assertEquals(1,updateCount);
authorList.get(0).setName("Author 1 changed");
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GroupByTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GroupByTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GroupByTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,8 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -34,13 +36,6 @@ import org.apache.torque.util.functions.
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-
/**
* Tests Group by statements.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,18 +19,15 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.test.peer.AuthorPeer;
import org.apache.torque.test.peer.AuthorPeerImpl;
import org.apache.torque.test.recordmapper.AuthorRecordMapper;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests the peerImpl initialisation.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,10 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.List;
import org.apache.commons.logging.Log;
@@ -45,12 +49,6 @@ import org.apache.torque.test.peer.OInte
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests joins.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,18 +19,15 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.apache.torque.NoRowsException;
import org.apache.torque.OptimisticLockingFailedException;
import org.apache.torque.TorqueException;
import org.apache.torque.test.dbobject.OptimisticLocking;
import org.apache.torque.test.peer.OptimisticLockingPeerImpl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests whether optimistic locking with select for update works.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,17 +19,14 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.apache.torque.OptimisticLockingFailedException;
import org.apache.torque.TorqueException;
import org.apache.torque.test.dbobject.OptimisticLockingSimple;
import org.apache.torque.test.peer.OptimisticLockingSimplePeerImpl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests whether optimistic locking with select for update works.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/QualifiedTableNameTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/QualifiedTableNameTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/QualifiedTableNameTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,9 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
import java.util.List;
import org.apache.torque.BaseDatabaseTestCase;
@@ -29,12 +32,6 @@ import org.apache.torque.test.peer.Quali
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests that accessing the database also works if the table name is qualified
* by a schema name.
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,9 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.List;
import org.apache.torque.BaseDatabaseTestCase;
@@ -31,12 +34,6 @@ import org.apache.torque.test.peer.SaveM
import org.apache.torque.test.peer.SaveMethodInPeerPeer;
import org.apache.torque.util.CountHelper;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Tests whether the save methods work in the peer classes.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,8 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.mapper.IntegerMapper;
@@ -32,12 +34,6 @@ import org.apache.torque.util.functions.
import org.apache.torque.util.functions.Sum;
import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Tests selects using functions.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,8 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
@@ -31,12 +33,6 @@ import org.apache.torque.test.peer.BookP
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Tests selects using the IN operator.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,9 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -45,12 +48,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Tests simple selects.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,9 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.sql.Connection;
import java.util.List;
import java.util.stream.Collectors;
@@ -27,7 +30,6 @@ import org.apache.torque.BaseDatabaseTes
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
import org.apache.torque.criteria.Criteria;
-import org.apache.torque.junit5.extension.HostCallback;
import org.apache.torque.om.SimpleKey;
import org.apache.torque.om.mapper.CompositeMapper;
import org.apache.torque.test.dbobject.Author;
@@ -39,12 +41,6 @@ import org.apache.torque.test.recordmapp
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests simple selects.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,9 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
@@ -36,12 +39,6 @@ import org.apache.torque.test.peer.CompI
import org.apache.torque.test.peer.OIntegerPkPeer;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests the setAndSave method for different constellations.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,8 @@ package org.apache.torque.generated.peer
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
@@ -40,12 +42,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests subselects in the where clause.
*
@@ -339,7 +335,7 @@ public class WhereClauseSubselectTest ex
*
* @throws TorqueException If an error occurs.
*/
-
+
private boolean supportsSubselects(Adapter adapter) throws TorqueException
{
if (!(adapter instanceof MysqlAdapter))
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,9 @@ package org.apache.torque.oid;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.math.BigDecimal;
import java.sql.Connection;
@@ -34,12 +37,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Tests methods in the adapters
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,18 +19,14 @@ package org.apache.torque.sql;
* under the License.
*/
+import static org.junit.Assert.assertFalse;
+
import java.sql.Connection;
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.Torque;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Checks whether the SkipSql flag works on a table.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerCallbackMySQLExtension.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerCallbackMySQLExtension.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerCallbackMySQLExtension.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -21,7 +21,7 @@ package org.apache.torque.testcontainer.
import static
org.junit.jupiter.api.extension.ConditionEvaluationResult.enabled;
-import java.io.File;
+import java.nio.file.Path;
import java.time.ZoneId;
import org.apache.logging.log4j.LogManager;
@@ -40,9 +40,9 @@ import org.testcontainers.junit.jupiter.
/**
* Testcontainer configuration for database Mysql
- *
+ *
* Requires some configuration data found for example in {@link
DockerMySQLCallback}.
- *
+ *
* @author gk
*
*/
@@ -50,21 +50,21 @@ import org.testcontainers.junit.jupiter.
public class DockerCallbackMySQLExtension extends
DockerDatabaseAbstractExtension implements BeforeAllCallback,
BeforeTestExecutionCallback, ExecutionCondition {
static Logger log = LogManager.getLogger();
-
+
private static int SERVICE_PORT = 3306;
@Container
- public static GenericContainer DATABASE_CONTAINER = new GenericContainer<>(
- new ImageFromDockerfile().withDockerfile(new
File(DOCKERFILE).toPath())).withExposedPorts(SERVICE_PORT)
+ public static GenericContainer<?> DATABASE_CONTAINER = new
GenericContainer<>(
+ new
ImageFromDockerfile().withDockerfile(Path.of(DOCKERFILE))).withExposedPorts(SERVICE_PORT)
.withEnv("MYSQL_DATABASE",
DATABASE_NAME).withEnv("MYSQL_USER", "torque")
.withEnv("MYSQL_PASSWORD",
"torque").withEnv("MYSQL_ROOT_PASSWORD", "torque");
-
+
public DockerCallbackMySQLExtension() {
setDbContainer(DATABASE_CONTAINER);
setServicePort(SERVICE_PORT);
}
-
+
protected static final ConditionEvaluationResult ENABLED_BY_DEFAULT =
enabled(
"DockerCallbackExtension is enabled by default - checking internal
state only");
@@ -78,14 +78,14 @@ public class DockerCallbackMySQLExtensio
}
return ENABLED_BY_DEFAULT;
}
-
+
@Override
public void beforeTestExecution(ExtensionContext context) throws Exception
{
// log.info("starting call test context "+ context);
}
-
+
/**
- * Should be called first
+ * Should be called first
* @see BeforeAll
*/
@Override
@@ -102,7 +102,7 @@ public class DockerCallbackMySQLExtensio
} else {
super.beforeAll(context);
}
-
+
try {
dbInit(context);
} catch (Exception e) {
@@ -114,7 +114,7 @@ public class DockerCallbackMySQLExtensio
context.getStore(Namespace.GLOBAL).put("jdbcConnectionString",
jdbcConnectionString);
context.getStore(Namespace.GLOBAL).put("container", getDbContainer());
context.getStore(Namespace.GLOBAL).put("annotatedClass",
dockerCallback);
-
+
torqueInit(context);
}
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerCallbackPostgreSQLExtension.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerCallbackPostgreSQLExtension.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerCallbackPostgreSQLExtension.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -21,7 +21,7 @@ package org.apache.torque.testcontainer.
import static
org.junit.jupiter.api.extension.ConditionEvaluationResult.enabled;
-import java.io.File;
+import java.nio.file.Path;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
@@ -39,9 +39,9 @@ import org.testcontainers.utility.Docker
/**
* Testcontainer configuration for database Postgres
- *
+ *
* Requires some configuration data found for example in {@link
DockerPostGresCallback}.
- *
+ *
* @author gk
*
*/
@@ -61,8 +61,8 @@ public class DockerCallbackPostgreSQLExt
* podman issue:
https://github.com/testcontainers/testcontainers-java/issues/5998
*/
@Container
- public static GenericContainer DATABASE_CONTAINER = new GenericContainer<>(
- new ImageFromDockerfile().withDockerfile(new
File(DOCKERFILE).toPath())).withExposedPorts(SERVICE_PORT)
+ public static GenericContainer<?> DATABASE_CONTAINER = new
GenericContainer<>(
+ new
ImageFromDockerfile().withDockerfile(Path.of(DOCKERFILE))).withExposedPorts(SERVICE_PORT)
.withEnv("POSTGRES_DB",
DATABASE_NAME).withEnv("POSTGRES_USER", "torque")
.withEnv("POSTGRES_PASSWORD",
"torque").withLogConsumer(new Slf4jLogConsumer(log));
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerDatabaseAbstractExtension.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerDatabaseAbstractExtension.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerDatabaseAbstractExtension.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -30,8 +30,8 @@ import org.testcontainers.containers.wai
/**
* {@link #dbContainer} and {@link #servicePort} has to be set by
implementing class.
- *
- *
+ *
+ *
* @author gk
* @version $Id$
*
@@ -39,18 +39,18 @@ import org.testcontainers.containers.wai
public abstract class DockerDatabaseAbstractExtension extends
DockerCallbackExtension {
static Logger log = LogManager.getLogger();
-
+
protected static String DATABASE_NAME = "bookstore";
protected static final String DOCKERFILE = "./target/Dockerfile";
-
- GenericContainer dbContainer;
-
+
+ GenericContainer<?> dbContainer;
+
private int servicePort;
-
+
public DockerDatabaseAbstractExtension() {
super();
}
-
+
/**
* If database {@link #dbContainer} is not running, start it after port is
bound.
@@ -69,14 +69,14 @@ public abstract class DockerDatabaseAbst
}
/**
- * Builds and returns database specific JDBC string
<code>jdbc:%s://%s:%d/%s%s</code> with parameters as configured in
+ * Builds and returns database specific JDBC string
<code>jdbc:%s://%s:%d/%s%s</code> with parameters as configured in
* <ul>
* @see #getAdapterProfileFallback(),
* {@link #getDbContainer} container ip address,
* {@link #getDbContainer()} mapped port,
* {@value #DATABASE_NAME} and param queryContext.
- *
- *
+ *
+ *
* @param queryContext Optional query string including question mark
* @return the database specific JDBC string with mapped port binding
*/
@@ -90,7 +90,7 @@ public abstract class DockerDatabaseAbst
Integer mappedPort =
getDbContainer().getMappedPort(getServicePort());// e.g. 32811
log.info("generate jdbc url from {}, mapped Port: {}, bounded port:
{}", serviceHost, mappedPort,
getDbContainer().getBoundPortNumbers());
-
+
if (queryContext == null) {
queryContext = "";
}
@@ -117,11 +117,11 @@ public abstract class DockerDatabaseAbst
super(adapterProfileFallback);
}
- public GenericContainer getDbContainer() {
+ public GenericContainer<?> getDbContainer() {
return dbContainer;
}
- public void setDbContainer(GenericContainer dbContainer) {
+ public void setDbContainer(GenericContainer<?> dbContainer) {
this.dbContainer = dbContainer;
}
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerPostGresCallback.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerPostGresCallback.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerPostGresCallback.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -29,16 +29,15 @@ import java.lang.annotation.Target;
import org.apache.torque.junit5.extension.AdapterParameterResolver;
import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.testcontainers.junit.jupiter.Testcontainers;
/**
* {@link DockerPostGresCallback} is used to signal that the annotated test
class or
* test method is using Docker {@link Testcontainers} with database Postgres
and Torque initialized accordingly.
- *
+ *
* It is currently enabled by overriding the default
- *
+ *
* @author gk
* @version $Id$
*
@@ -52,17 +51,17 @@ import org.testcontainers.junit.jupiter.
@ExtendWith(DockerCallbackPostgreSQLExtension.class)
@Documented
public @interface DockerPostGresCallback {
-
+
String value() default "";
-
+
String adapterProfileFallback() default "postgresql";
-
+
String customUrlKey() default "torque.dsfactory.bookstore.connection.url";
-
+
String targetConfigName() default "torqueuser";
-
+
String targetFileName() default "torque.usersettings.properties";
-
+
boolean skipConfigurationCheck() default false;
-
+
}
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,8 @@ package org.apache.torque.util;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+
import java.sql.Types;
import java.util.ArrayList;
import java.util.List;
@@ -28,12 +30,6 @@ import org.apache.torque.criteria.Criter
import org.apache.torque.test.dbobject.Author;
import org.apache.torque.test.peer.BookPeer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNull;
-
/**
* Tests the methods in BasePeer directly, without any generated classes.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -41,9 +41,6 @@ import org.apache.torque.test.dbobject.B
import org.apache.torque.test.dbobject.SingleNamedUnique;
import org.apache.torque.test.peer.SingleNamedUniquePeer;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
public class ExceptionMapperTest extends BaseDatabaseTestCase
{
@@ -174,7 +171,7 @@ public class ExceptionMapperTest extends
= Torque.getDatabase(Torque.getDefaultDB()).getAdapter();
if (adapter instanceof HsqldbAdapter)
{
- log.warn("hsqldb (2.2.6- 2.5.0) fails to detect the deadlock in
this test, "
+ log.warn("hsqldb (2.2.6- 2.5.0) fails to detect the deadlock in
this test, "
+ "v 2.5.1 already has a timeout or Database lock
acquisition failure, probably already in insertBookstore"
+ " therefore this test is skipped");
return;
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,11 @@ package org.apache.torque.util;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.apache.torque.BaseDatabaseTestCase;
@@ -30,13 +35,6 @@ import org.apache.torque.test.peer.Autho
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-
/**
* Test code for LargeSelect.
*
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,9 @@ package org.apache.torque.util;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
@@ -36,12 +39,6 @@ import org.apache.torque.util.functions.
import org.apache.torque.util.functions.Sum;
import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Test code for SummaryHelper.
*
@@ -138,38 +135,24 @@ public class SummaryHelperTest extends B
logger.debug("\n" + out.toString());
assertTrue("No results returned", results.size() > 0 );
- assertTrue("Invalid number of records returned. Expected 4 but got " +
- results.size(), results.size() == 4 );
+ assertEquals("Invalid number of records returned", 4, results.size());
ListOrderedMapCI<Object> rec = results.get(0);
- assertTrue( "GROUP_BY1 valued not correct",
- "A1".equals(rec.get("GROUP_BY1").toString()) );
- assertTrue("COUNT_RECS not correct value",
- ((Integer) rec.get("COUNT_RECS")).intValue() == 4 );
- assertTrue("AVG_INT1 not correct value",
- ((Integer) rec.get("AVG_INT1")).intValue() == 2 );
- assertTrue("MIN_INT1 not correct value",
- ((Integer) rec.get("MIN_INT1")).intValue() == 1 );
- assertTrue("MAX_INT1 not correct value",
- ((Integer) rec.get("MAX_INT1")).intValue() == 4 );
- assertTrue("SUM_INT1 not correct value",
- ((Integer) rec.get("SUM_INT1")).intValue() == 10 );
+ assertEquals("GROUP_BY1 valued not correct", "A1",
rec.get("GROUP_BY1"));
+ assertEquals("COUNT_RECS not correct value", 4, ((Integer)
rec.get("COUNT_RECS")).intValue());
+ assertEquals("AVG_INT1 not correct value", 2, ((Integer)
rec.get("AVG_INT1")).intValue());
+ assertEquals("MIN_INT1 not correct value", 1, ((Integer)
rec.get("MIN_INT1")).intValue());
+ assertEquals("MAX_INT1 not correct value", 4, ((Integer)
rec.get("MAX_INT1")).intValue());
+ assertEquals("SUM_INT1 not correct value", 10, ((Integer)
rec.get("SUM_INT1")).intValue());
rec = results.get(3);
- assertTrue( "GROUP_BY1 valued not correct",
- "D1".equals(rec.get("GROUP_BY1")));
- assertTrue("COUNT_RECS not correct value",
- ((Integer) rec.get("COUNT_RECS")).intValue() == 4 );
- assertTrue("AVG_FLOAT1 not correct value",
- ((Float) rec.get("AVG_FLOAT1")).floatValue() == 11.0f );
- assertTrue("MIN_FLOAT1 not correct value",
- ((Float) rec.get("MIN_FLOAT1")).floatValue() == 8.0f );
- assertTrue("MAX_FLOAT1 not correct value",
- ((Float) rec.get("MAX_FLOAT1")).floatValue() == 14.0f );
- assertTrue("SUM_FLOAT1 not correct value",
- ((Float) rec.get("SUM_FLOAT1")).floatValue() == 44.0f );
-
+ assertEquals("GROUP_BY1 valued not correct", "D1",
rec.get("GROUP_BY1"));
+ assertEquals("COUNT_RECS not correct value", 4, ((Integer)
rec.get("COUNT_RECS")).intValue());
+ assertEquals("AVG_FLOAT1 not correct value", 11.0f, ((Float)
rec.get("AVG_FLOAT1")).floatValue(), 0.01);
+ assertEquals("MIN_FLOAT1 not correct value", 8.0f, ((Float)
rec.get("MIN_FLOAT1")).floatValue(), 0.01);
+ assertEquals("MAX_FLOAT1 not correct value", 14.0f, ((Float)
rec.get("MAX_FLOAT1")).floatValue(), 0.01);
+ assertEquals("SUM_FLOAT1 not correct value", 44.0f, ((Float)
rec.get("SUM_FLOAT1")).floatValue(), 0.01);
}
/*
@@ -218,32 +201,21 @@ public class SummaryHelperTest extends B
logger.debug("\n"+out.toString());
assertTrue("No results returned", results.size() > 0 );
- assertTrue("Invalid number of records returned. Expected 1 but got " +
- results.size(), results.size() == 1 );
+ assertEquals("Invalid number of records returned", 1, results.size());
ListOrderedMapCI<Object> rec = results.get(0);
- assertTrue( "Number of columns incorrect! Did ExcludeExpColumns work?
" +
- "Expected 9 but got " + rec.size(), rec.size() == 9 );
- assertTrue("COUNT_RECS not correct value",
- ((Integer) rec.get("COUNT_RECS")).intValue() == 16 );
- assertTrue("AVG_INT1 not correct value",
- ((Integer) rec.get("AVG_INT1")).intValue() == 4 );
- assertTrue("MIN_INT1 not correct value",
- ((Integer) rec.get("MIN_INT1")).intValue() == 1 );
- assertTrue("MAX_INT1 not correct value",
- ((Integer) rec.get("MAX_INT1")).intValue() == 7 );
- assertTrue("SUM_INT1 not correct value",
- ((Integer) rec.get("SUM_INT1")).intValue() == 64 );
-
- assertTrue("AVG_FLOAT1 not correct value",
- ((Float) rec.get("AVG_FLOAT1")).floatValue() == 8.0f );
- assertTrue("MIN_FLOAT1 not correct value",
- ((Float) rec.get("MIN_FLOAT1")).floatValue() == 2.0f );
- assertTrue("MAX_FLOAT1 not correct value",
- ((Float) rec.get("MAX_FLOAT1")).floatValue() == 14.0f );
- assertTrue("SUM_FLOAT1 not correct value",
- ((Float) rec.get("SUM_FLOAT1")).floatValue() == 128.0f );
+ assertEquals("Number of columns incorrect! Did ExcludeExpColumns
work?", 9, rec.size());
+ assertEquals("COUNT_RECS not correct value", 16, ((Integer)
rec.get("COUNT_RECS")).intValue());
+ assertEquals("AVG_INT1 not correct value", 4, ((Integer)
rec.get("AVG_INT1")).intValue());
+ assertEquals("MIN_INT1 not correct value", 1, ((Integer)
rec.get("MIN_INT1")).intValue());
+ assertEquals("MAX_INT1 not correct value", 7, ((Integer)
rec.get("MAX_INT1")).intValue());
+ assertEquals("SUM_INT1 not correct value", 64, ((Integer)
rec.get("SUM_INT1")).intValue());
+
+ assertEquals("AVG_FLOAT1 not correct value", 8.0f, ((Float)
rec.get("AVG_FLOAT1")).floatValue(), 0.01);
+ assertEquals("MIN_FLOAT1 not correct value", 2.0f, ((Float)
rec.get("MIN_FLOAT1")).floatValue(), 0.01);
+ assertEquals("MAX_FLOAT1 not correct value", 14.0f, ((Float)
rec.get("MAX_FLOAT1")).floatValue(), 0.01);
+ assertEquals("SUM_FLOAT1 not correct value", 128.0f, ((Float)
rec.get("SUM_FLOAT1")).floatValue(), 0.01);
}
/*
@@ -293,21 +265,14 @@ public class SummaryHelperTest extends B
logger.debug("\n"+out.toString());
assertTrue("No results returned", results.size() > 0 );
- assertTrue("Invalid number of records returned. Expected 1 but got " +
- results.size(), results.size() == 1 );
+ assertEquals("Invalid number of records returned", 1, results.size());
ListOrderedMapCI<Object> rec = results.get(0);
- assertTrue("COUNT_RECS not correct value",
- ((Integer) rec.get("COUNT_RECS")).intValue() == 4 );
- assertTrue("AVG_INT1 not correct value",
- ((Integer) rec.get("AVG_INT1")).intValue() == 2 );
- assertTrue("MIN_INT1 not correct value",
- ((Integer) rec.get("MIN_INT1")).intValue() == 1 );
- assertTrue("MAX_INT1 not correct value",
- ((Integer) rec.get("MAX_INT1")).intValue() == 4 );
- assertTrue("SUM_INT1 not correct value",
- ((Integer) rec.get("SUM_INT1")).intValue() == 10 );
+ assertEquals("COUNT_RECS not correct value", 4, ((Integer)
rec.get("COUNT_RECS")).intValue());
+ assertEquals("AVG_INT1 not correct value", 2, ((Integer)
rec.get("AVG_INT1")).intValue());
+ assertEquals("MIN_INT1 not correct value", 1, ((Integer)
rec.get("MIN_INT1")).intValue());
+ assertEquals("MAX_INT1 not correct value", 4, ((Integer)
rec.get("MAX_INT1")).intValue());
+ assertEquals("SUM_INT1 not correct value", 10,((Integer)
rec.get("SUM_INT1")).intValue());
}
-
}
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java
Mon Jul 27 08:37:06 2026 (r1936617)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java
Mon Jul 27 08:58:48 2026 (r1936618)
@@ -19,6 +19,9 @@ package org.apache.torque.util;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.apache.torque.BaseDatabaseTestCase;
@@ -28,12 +31,6 @@ import org.apache.torque.test.dbobject.A
import org.apache.torque.test.peer.AuthorPeer;
import org.apache.torque.test.peer.BookPeer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
/**
* Test correct behavior if Transaction is used with the try-with-resources
pattern
*
@@ -41,7 +38,7 @@ import static org.junit.Assert.assertNot
*/
public class TorqueConnectionImplTest extends BaseDatabaseTestCase
{
-
+
public void testTryWithResources() throws TorqueException
{
// prepare
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
