better code

docs/modules/databases/jdbc.md

@@ -89,7 +89,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using Timeplus
 
-`jdbc:tc:timeplus:2.3.3:///databasename`
+`jdbc:tc:timeplus:2.3.21:///databasename`
 
 #### Using Trino
 

mkdocs.yml

@@ -72,6 +72,7 @@ nav:
  - modules/databases/presto.md
  - modules/databases/questdb.md
  - modules/databases/tidb.md
+ - modules/databases/timeplus.md
  - modules/databases/trino.md
  - modules/databases/yugabytedb.md
  - modules/activemq.md

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainerProvider.java

@@ -9,7 +9,7 @@
  */
 public class TimeplusContainerProvider extends JdbcDatabaseContainerProvider {
 
- private static final String DEFAULT_TAG = "2.3.3";
+ private static final String DEFAULT_TAG = "2.3.21";
 
  @Override
  public boolean supports(String databaseType) {

modules/timeplus/src/test/java/org/testcontainers/TimeplusImages.java

@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface TimeplusImages {
- DockerImageName TIMEPLUS_IMAGE = DockerImageName.parse("timeplus/timeplusd:2.3.3");
+ DockerImageName TIMEPLUS_IMAGE = DockerImageName.parse("timeplus/timeplusd:2.3.21");
 }

modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/SimpleTimeplusTest.java

@@ -2,9 +2,9 @@
 
 import org.junit.Test;
 import org.testcontainers.TimeplusImages;
+import org.testcontainers.containers.JdbcDatabaseContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
-import org.testcontainers.timeplus.TimeplusContainer;
-import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.timeplus.TimeplusContainerProvider;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -13,19 +13,13 @@
 
 public class SimpleTimeplusTest extends AbstractContainerDatabaseTest {
 
- private final DockerImageName imageName;
-
- public SimpleTimeplusTest(DockerImageName imageName) {
- this.imageName = imageName;
- }
-
  public static Object[][] data() {
  return new Object[][] { { TimeplusImages.TIMEPLUS_IMAGE } };
  }
 
  @Test
  public void testSimple() throws SQLException {
- try (TimeplusContainer timeplus = new TimeplusContainer(this.imageName)) {
+ try (JdbcDatabaseContainer timeplus = new TimeplusContainerProvider().newInstance()) {
  timeplus.start();
 
  ResultSet resultSet = performQuery(timeplus, "SELECT 1");

modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java

@@ -1,6 +1,7 @@
 package org.testcontainers.timeplus;
 
 import org.junit.Test;
+import org.testcontainers.containers.JdbcDatabaseContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
@@ -12,7 +13,7 @@ public class TimeplusContainerTest extends AbstractContainerDatabaseTest {
 
  @Test
  public void testSimple() throws SQLException {
- try (TimeplusContainer timeplus = new TimeplusContainer("timeplus/timeplusd:2.3.3")) {
+ try (JdbcDatabaseContainer timeplus = new TimeplusContainerProvider().newInstance()) {
  timeplus.start();
 
  ResultSet resultSet = performQuery(timeplus, "SELECT 1");
@@ -25,17 +26,18 @@ public void testSimple() throws SQLException {
  @Test
  public void customCredentialsWithUrlParams() throws SQLException {
  try (
- TimeplusContainer timeplus = new TimeplusContainer("timeplus/timeplusd:2.3.3")
+ JdbcDatabaseContainer timeplus = new TimeplusContainerProvider()
+ .newInstance()
  .withUsername("system")
  .withPassword("sys@t+")
  .withDatabaseName("system")
- .withUrlParam("max_result_rows", "5")
+ .withUrlParam("interactive_delay", "5")
  ) {
  timeplus.start();
 
  ResultSet resultSet = performQuery(
  timeplus,
- "SELECT value FROM system.settings where name='max_result_rows'"
+ "SELECT to_int(value) FROM system.settings where name='interactive_delay'"
  );
 
  int resultSetInt = resultSet.getInt(1);