(ignite-3) branch main updated: IGNITE-23800 Fix SqlLogicTest gradle configuration (#4805)

[korlov]

This is an automated email from the ASF dual-hosted git repository.

korlov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 3bdaeaed31 IGNITE-23800 Fix SqlLogicTest gradle configuration (#4805)
3bdaeaed31 is described below

commit 3bdaeaed311a740aab7d07824182fc1c4ae59d9a
Author: korlov42 <kor...@apache.org>
AuthorDate: Thu Nov 28 16:47:40 2024 +0200

    IGNITE-23800 Fix SqlLogicTest gradle configuration (#4805)
---
 modules/sql-engine/build.gradle                        | 18 +++---------------
 .../ignite/internal/sql/sqllogic/ItSqlLogic2Test.java  |  3 ---
 .../ignite/internal/sql/sqllogic/ItSqlLogic3Test.java  |  3 ---
 .../ignite/internal/sql/sqllogic/ItSqlLogicTest.java   |  2 +-
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/modules/sql-engine/build.gradle b/modules/sql-engine/build.gradle
index c0bf148a80..cdedaf6f76 100644
--- a/modules/sql-engine/build.gradle
+++ b/modules/sql-engine/build.gradle
@@ -152,22 +152,10 @@ dependencies {
 
 integrationTest {
     useJUnitPlatform {
-        if (System.getProperty("sqlTest1") != null) {
-            it.includeTags "sqllogic1"
+        if (System.getProperty("sqlTest") != null) {
+            it.includeTags "sqllogic"
         } else {
-            it.excludeTags "sqllogic1"
-        }
-
-        if (System.getProperty("sqlTest2") != null) {
-            it.includeTags "sqllogic2"
-        } else {
-            it.excludeTags "sqllogic2"
-        }
-
-        if (System.getProperty("sqlTest3") != null) {
-            it.includeTags "sqllogic3"
-        } else {
-            it.excludeTags "sqllogic3"
+            it.excludeTags "sqllogic"
         }
     }
 }
diff --git 
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogic2Test.java
 
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogic2Test.java
index 381d936562..4fd5d0a6e5 100644
--- 
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogic2Test.java
+++ 
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogic2Test.java
@@ -17,14 +17,11 @@
 
 package org.apache.ignite.internal.sql.sqllogic;
 
-import org.junit.jupiter.api.Tag;
-
 /**
  * Test suite to run SQL test scripts.
  *
  * @see ItSqlLogicTest
  */
-@Tag("sqllogic2")
 @SqlLogicTestEnvironment(scriptsRoot = "src/integrationTest/sql/group2")
 public class ItSqlLogic2Test extends ItSqlLogicTest {
 
diff --git 
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogic3Test.java
 
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogic3Test.java
index a8a6187fc1..3a5f82afa0 100644
--- 
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogic3Test.java
+++ 
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogic3Test.java
@@ -17,14 +17,11 @@
 
 package org.apache.ignite.internal.sql.sqllogic;
 
-import org.junit.jupiter.api.Tag;
-
 /**
  * Test suite to run SQL test scripts.
  *
  * @see ItSqlLogicTest
  */
-@Tag("sqllogic3")
 @SqlLogicTestEnvironment(scriptsRoot = "src/integrationTest/sql/group3")
 public class ItSqlLogic3Test extends ItSqlLogicTest {
 
diff --git 
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java
 
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java
index d2e85dbde6..0aa757cb7b 100644
--- 
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java
+++ 
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java
@@ -139,7 +139,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
  *
  * @see <a 
href="https://www.sqlite.org/sqllogictest/doc/trunk/about.wiki";>Extended format 
documentation.</a>
  */
-@Tag("sqllogic1")
+@Tag("sqllogic")
 @ExtendWith({SystemPropertiesExtension.class, WorkDirectoryExtension.class})
 @WithSystemProperty(key = "IMPLICIT_PK_ENABLED", value = "true")
 @SqlLogicTestEnvironment(scriptsRoot = "src/integrationTest/sql/group1")