Issue helidon-io#6991 - Blocking DB Client: Transaction support tests.

Signed-off-by: Tomas Kraus <[email protected]>

dbclient/jdbc/src/main/java/io/helidon/dbclient/jdbc/TransactionContext.java

@@ -60,27 +60,27 @@ Connection connection() {
     // Move internal state to commit and close connection.
     void commit() throws SQLException {
         switch (state) {
-        // Commit with no statement being executed.
-        case INIT:
-            state = State.COMMIT;
-            LOGGER.log(Level.WARNING, "Transaction commit with no statement being executed.");
-            break;
-        // Commit active transaction.
-        case ACTIVE:
-            state = State.COMMIT;
-            try {
-                connection.commit();
-            } finally {
-                connection.close();
-            }
-            break;
-        // Illegal states for commit
-        case COMMIT:
-            throw new IllegalStateException("Transaction was already commit");
-        case ROLLBACK:
-            throw new IllegalStateException("Transaction was already rolled back");
-        default:
-            throw new IllegalStateException("Unknown transaction state");
+            // Commit with no statement being executed.
+            case INIT:
+                state = State.COMMIT;
+                LOGGER.log(Level.WARNING, "Transaction commit with no statement being executed.");
+                break;
+            // Commit active transaction.
+            case ACTIVE:
+                state = State.COMMIT;
+                try {
+                    connection.commit();
+                } finally {
+                    connection.close();
+                }
+                break;
+            // Illegal states for commit
+            case COMMIT:
+                throw new IllegalStateException("Transaction was already commit");
+            case ROLLBACK:
+                throw new IllegalStateException("Transaction was already rolled back");
+            default:
+                throw new IllegalStateException("Unknown transaction state");
         }
     }
 

tests/integration/db-client/common/src/main/java/io/helidon/tests/integration/dbclient/common/tests/simple/SimpleUpdateIT.java

@@ -59,14 +59,9 @@ private static Map<Integer, Pokemon> initPokemons() {
     @BeforeAll
     public static void setup() {
         try {
-            int curId = BASE_ID;
-            addPokemon(new Pokemon(++curId, "Spearow", TYPES.get(1), TYPES.get(3))); // BASE_ID+1
-            addPokemon(new Pokemon(++curId, "Fearow", TYPES.get(1), TYPES.get(3)));  // BASE_ID+2
-            addPokemon(new Pokemon(++curId, "Ekans", TYPES.get(4)));                 // BASE_ID+3
-            addPokemon(new Pokemon(++curId, "Arbok", TYPES.get(4)));                 // BASE_ID+4
-            addPokemon(new Pokemon(++curId, "Sandshrew", TYPES.get(5)));             // BASE_ID+5
-            addPokemon(new Pokemon(++curId, "Sandslash", TYPES.get(5)));             // BASE_ID+6
-            addPokemon(new Pokemon(++curId, "Diglett", TYPES.get(5)));               // BASE_ID+7
+            for (Pokemon pokemon : POKEMONS.values()) {
+                addPokemon(pokemon);
+            }
         } catch (Exception ex) {
             LOGGER.log(System.Logger.Level.WARNING, String.format("Exception in setup: %s", ex));
             throw ex;

tests/integration/db-client/common/src/main/java/io/helidon/tests/integration/dbclient/common/tests/transaction/TransactionDeleteIT.java

@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2023 Oracle and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.helidon.tests.integration.dbclient.common.tests.transaction;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.helidon.tests.integration.dbclient.common.AbstractIT;
+import io.helidon.tests.integration.dbclient.common.utils.Utils;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static io.helidon.tests.integration.dbclient.common.utils.Utils.verifyDeletePokemon;
+
+/**
+ * Test set of basic JDBC delete calls in transaction.
+ */
+public class TransactionDeleteIT extends AbstractIT {
+
+    /** Local logger instance. */
+    private static final System.Logger LOGGER = System.getLogger(TransactionDeleteIT.class.getName());
+
+    /** Maximum Pokemon ID. */
+    private static final int BASE_ID = LAST_POKEMON_ID + 230;
+
+    /** Map of pokemons for update tests. */
+    private static final Map<Integer, Pokemon> POKEMONS = initPokemons();
+
+    private static Map<Integer, Pokemon> initPokemons() {
+        Map<Integer, Pokemon> pokemons = new HashMap<>(8);
+        int curId = BASE_ID;
+        pokemons.put(++curId, new Pokemon(curId, "Omanyte", TYPES.get(6), TYPES.get(11)));  // BASE_ID+1
+        pokemons.put(++curId, new Pokemon(curId, "Omastar", TYPES.get(6), TYPES.get(11)));  // BASE_ID+2
+        pokemons.put(++curId, new Pokemon(curId, "Kabuto", TYPES.get(6), TYPES.get(11)));   // BASE_ID+3
+        pokemons.put(++curId, new Pokemon(curId, "Kabutops", TYPES.get(6), TYPES.get(11))); // BASE_ID+4
+        pokemons.put(++curId, new Pokemon(curId, "Chikorita", TYPES.get(12)));              // BASE_ID+5
+        pokemons.put(++curId, new Pokemon(curId, "Bayleef", TYPES.get(12)));                // BASE_ID+6
+        pokemons.put(++curId, new Pokemon(curId, "Meganium", TYPES.get(12)));               // BASE_ID+7
+        return pokemons;
+    }
+
+    /**
+     * Initialize tests of basic JDBC deletes.
+     */
+    @BeforeAll
+    public static void setup() {
+        try {
+            for (Pokemon pokemon : POKEMONS.values()) {
+                addPokemon(pokemon);
+            }
+        } catch (Exception ex) {
+            LOGGER.log(System.Logger.Level.WARNING, String.format("Exception in setup: %s", ex));
+            throw ex;
+        }
+    }
+
+    /**
+     * Verify {@code createNamedDelete(String, String)} API method with ordered parameters.
+     */
+    @Test
+    public void testCreateNamedDeleteStrStrOrderArgs() {
+        Long result = Utils.transaction(tx -> tx
+                .createNamedDelete("delete-rayquaza", DELETE_POKEMON_ORDER_ARG)
+                .addParam(POKEMONS.get(BASE_ID+1).getId()).execute()
+        );
+        verifyDeletePokemon(result, POKEMONS.get(BASE_ID+1));
+    }
+
+    /**
+     * Verify {@code createNamedDelete(String)} API method with named parameters.
+     */
+    @Test
+    public void testCreateNamedDeleteStrNamedArgs() {
+        Long result = Utils.transaction(tx -> tx
+                .createNamedDelete("delete-pokemon-named-arg")
+                .addParam("id", POKEMONS.get(BASE_ID+2).getId()).execute()
+        );
+        verifyDeletePokemon(result, POKEMONS.get(BASE_ID+2));
+    }
+
+    /**
+     * Verify {@code createNamedDelete(String)} API method with ordered parameters.
+     */
+    @Test
+    public void testCreateNamedDeleteStrOrderArgs() {
+        Long result = Utils.transaction(tx -> tx
+                .createNamedDelete("delete-pokemon-order-arg")
+                .addParam(POKEMONS.get(BASE_ID+3).getId()).execute()
+        );
+        verifyDeletePokemon(result, POKEMONS.get(BASE_ID+3));
+    }
+
+    /**
+     * Verify {@code createDelete(String)} API method with named parameters.
+     */
+    @Test
+    public void testCreateDeleteNamedArgs() {
+        Long result = Utils.transaction(exec -> exec
+                .createDelete(DELETE_POKEMON_NAMED_ARG)
+                .addParam("id", POKEMONS.get(BASE_ID+4).getId()).execute()
+        );
+        verifyDeletePokemon(result, POKEMONS.get(BASE_ID+4));
+    }
+
+    /**
+     * Verify {@code createDelete(String)} API method with ordered parameters.
+     */
+    @Test
+    public void testCreateDeleteOrderArgs() {
+        Long result = Utils.transaction(tx -> tx
+                .createDelete(DELETE_POKEMON_ORDER_ARG)
+                .addParam(POKEMONS.get(BASE_ID+5).getId()).execute()
+        );
+        verifyDeletePokemon(result, POKEMONS.get(BASE_ID+5));
+    }
+
+    /**
+     * Verify {@code namedDelete(String)} API method with ordered parameters.
+     */
+    @Test
+    public void testNamedDeleteOrderArgs() {
+        Long result = Utils.transaction(tx -> tx
+                .namedDelete("delete-pokemon-order-arg", POKEMONS.get(BASE_ID+6).getId())
+        );
+        verifyDeletePokemon(result, POKEMONS.get(BASE_ID+6));
+    }
+
+    /**
+     * Verify {@code delete(String)} API method with ordered parameters.
+     */
+    @Test
+    public void testDeleteOrderArgs() {
+        Long result = Utils.transaction(tx -> tx
+                .delete(DELETE_POKEMON_ORDER_ARG, POKEMONS.get(BASE_ID+7).getId())
+        );
+        verifyDeletePokemon(result, POKEMONS.get(BASE_ID+7));
+    }
+
+}

tests/integration/db-client/common/src/main/java/io/helidon/tests/integration/dbclient/common/tests/transaction/TransactionGetIT.java

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2023 Oracle and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.helidon.tests.integration.dbclient.common.tests.transaction;
+
+import java.util.Optional;
+
+import io.helidon.dbclient.DbRow;
+import io.helidon.tests.integration.dbclient.common.AbstractIT;
+import io.helidon.tests.integration.dbclient.common.utils.Utils;
+
+import org.junit.jupiter.api.Test;
+
+import static io.helidon.tests.integration.dbclient.common.utils.Utils.verifyPokemon;
+
+/**
+ * Test set of basic JDBC get calls in transaction.
+ */
+public class TransactionGetIT extends AbstractIT {
+
+    /**
+     * Verify {@code createNamedGet(String, String)} API method with named parameters.
+     */
+    @Test
+    public void testCreateNamedGetStrStrNamedArgs() {
+        Optional<DbRow> maybeRow = Utils.transaction(tx -> tx
+                .createNamedGet("select-pikachu", SELECT_POKEMON_NAMED_ARG)
+                .addParam("name", POKEMONS.get(1).getName()).execute()
+        );
+        verifyPokemon(maybeRow, POKEMONS.get(1));
+    }
+
+    /**
+     * Verify {@code createNamedGet(String)} API method with named parameters.
+     */
+    @Test
+    public void testCreateNamedGetStrNamedArgs() {
+        Optional<DbRow> maybeRow = Utils.transaction(tx -> tx
+                        .createNamedGet("select-pokemon-named-arg")
+                        .addParam("name", POKEMONS.get(2).getName())
+                        .execute());
+        verifyPokemon(maybeRow, POKEMONS.get(2));
+    }
+
+    /**
+     * Verify {@code createNamedGet(String)} API method with ordered parameters.
+     */
+    @Test
+    public void testCreateNamedGetStrOrderArgs() {
+        Optional<DbRow> maybeRow = Utils.transaction(tx -> tx
+                        .createNamedGet("select-pokemon-order-arg")
+                        .addParam(POKEMONS.get(3).getName())
+                        .execute());
+        verifyPokemon(maybeRow, POKEMONS.get(3));
+    }
+
+    /**
+     * Verify {@code createGet(String)} API method with named parameters.
+     */
+    @Test
+    public void testCreateGetNamedArgs() {
+        Optional<DbRow> maybeRow = Utils.transaction(tx -> tx
+                        .createGet(SELECT_POKEMON_NAMED_ARG)
+                        .addParam("name", POKEMONS.get(4).getName())
+                        .execute());
+        verifyPokemon(maybeRow, POKEMONS.get(4));
+    }
+
+    /**
+     * Verify {@code createGet(String)} API method with ordered parameters.
+     */
+    @Test
+    public void testCreateGetOrderArgs() {
+        Optional<DbRow> maybeRow = Utils.transaction(tx -> tx
+                        .createGet(SELECT_POKEMON_ORDER_ARG)
+                        .addParam(POKEMONS.get(5).getName())
+                        .execute());
+
+        verifyPokemon(maybeRow, POKEMONS.get(5));
+    }
+
+    /**
+     * Verify {@code namedGet(String)} API method with ordered parameters passed directly to the {@code query} method.
+     */
+    @Test
+    public void testNamedGetStrOrderArgs() {
+        Optional<DbRow> maybeRow = Utils.transaction(tx -> tx
+                        .namedGet("select-pokemon-order-arg", POKEMONS.get(6).getName()));
+        verifyPokemon(maybeRow, POKEMONS.get(6));
+    }
+
+    /**
+     * Verify {@code get(String)} API method with ordered parameters passed directly to the {@code query} method.
+     */
+    @Test
+    public void testGetStrOrderArgs() {
+        Optional<DbRow> maybeRow = Utils.transaction(tx -> tx
+                        .get(SELECT_POKEMON_ORDER_ARG, POKEMONS.get(7).getName()));
+        verifyPokemon(maybeRow, POKEMONS.get(7));
+    }
+
+}