From 169177da56d770a2cf12d61517848dd0b848eb3f Mon Sep 17 00:00:00 2001 From: Marios Trivyzas Date: Thu, 20 Apr 2023 14:58:47 +0300 Subject: [PATCH] Move init.sql to test/resources, don't check result for DDL --- .../io/crate/example/testing/TestSqlInitialization.java | 3 +-- .../io/crate/example/testing/utils/TestingHelpers.java | 8 +------- .../java/src/{main => test}/resources/init.sql | 0 3 files changed, 2 insertions(+), 9 deletions(-) rename testing/testcontainers/java/src/{main => test}/resources/init.sql (100%) diff --git a/testing/testcontainers/java/src/test/java/io/crate/example/testing/TestSqlInitialization.java b/testing/testcontainers/java/src/test/java/io/crate/example/testing/TestSqlInitialization.java index 4f5d96c9..3fe9f03d 100644 --- a/testing/testcontainers/java/src/test/java/io/crate/example/testing/TestSqlInitialization.java +++ b/testing/testcontainers/java/src/test/java/io/crate/example/testing/TestSqlInitialization.java @@ -39,7 +39,7 @@ public void testTcInitClasspathFile() throws SQLException, IOException { */ @Test public void testTcInitArbitraryFile() throws SQLException, IOException { - String connectionUrl = "jdbc:tc:cratedb:5.2://localhost/doc?user=crate&TC_REUSABLE=true&TC_INITSCRIPT=file:src/main/resources/init.sql"; + String connectionUrl = "jdbc:tc:cratedb:5.2://localhost/doc?user=crate&TC_REUSABLE=true&TC_INITSCRIPT=file:src/test/resources/init.sql"; System.out.printf("Connecting to %s%n", connectionUrl); // Invoke `SHOW CREATE TABLE ...` query. @@ -64,5 +64,4 @@ public void testTcInitFunction() throws SQLException, IOException { assertThat(results.metaData().getColumnCount()).isEqualTo(1); assertThat(results.rows()).hasSize(1); } - } diff --git a/testing/testcontainers/java/src/test/java/io/crate/example/testing/utils/TestingHelpers.java b/testing/testcontainers/java/src/test/java/io/crate/example/testing/utils/TestingHelpers.java index 1a3e8aa2..77fc7419 100644 --- a/testing/testcontainers/java/src/test/java/io/crate/example/testing/utils/TestingHelpers.java +++ b/testing/testcontainers/java/src/test/java/io/crate/example/testing/utils/TestingHelpers.java @@ -47,13 +47,7 @@ public static void assertResults(Application.Results results) throws SQLExceptio */ public static void sqlInitFunction(Connection connection) throws SQLException, IOException, InterruptedException { try (Statement stmt = connection.createStatement()) { - boolean checkResults = stmt.execute("CREATE TABLE IF NOT EXISTS foobar_init (id INTEGER)"); - if (checkResults) { - System.out.println("Success."); - } else { - throw new SQLException("ERROR: SQL initialization failed"); - } + stmt.execute("CREATE TABLE IF NOT EXISTS foobar_init (id INTEGER)"); } } - } diff --git a/testing/testcontainers/java/src/main/resources/init.sql b/testing/testcontainers/java/src/test/resources/init.sql similarity index 100% rename from testing/testcontainers/java/src/main/resources/init.sql rename to testing/testcontainers/java/src/test/resources/init.sql