From d3a152ec3e14abca1819aae3fb5dd8dc1a50f73b Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Wed, 31 Mar 2021 14:54:46 -0700 Subject: [PATCH] Rename ql:test project to ql:test-fixtures to avoid IntelliJ confusion (#71135) --- x-pack/plugin/eql/qa/common/build.gradle | 2 +- x-pack/plugin/eql/qa/correctness/build.gradle | 2 +- x-pack/plugin/eql/qa/mixed-node/build.gradle | 2 +- x-pack/plugin/ql/build.gradle | 4 ++-- x-pack/plugin/ql/{test => test-fixtures}/build.gradle | 0 .../src/main/java/org/elasticsearch/xpack/ql/TestNode.java | 0 .../src/main/java/org/elasticsearch/xpack/ql/TestNodes.java | 0 .../src/main/java/org/elasticsearch/xpack/ql/TestUtils.java | 0 x-pack/plugin/sql/qa/mixed-node/build.gradle | 2 +- x-pack/plugin/sql/qa/server/build.gradle | 4 ++-- 10 files changed, 8 insertions(+), 8 deletions(-) rename x-pack/plugin/ql/{test => test-fixtures}/build.gradle (100%) rename x-pack/plugin/ql/{test => test-fixtures}/src/main/java/org/elasticsearch/xpack/ql/TestNode.java (100%) rename x-pack/plugin/ql/{test => test-fixtures}/src/main/java/org/elasticsearch/xpack/ql/TestNodes.java (100%) rename x-pack/plugin/ql/{test => test-fixtures}/src/main/java/org/elasticsearch/xpack/ql/TestUtils.java (100%) diff --git a/x-pack/plugin/eql/qa/common/build.gradle b/x-pack/plugin/eql/qa/common/build.gradle index c2fde7efc861d..a6962d4fa3f75 100644 --- a/x-pack/plugin/eql/qa/common/build.gradle +++ b/x-pack/plugin/eql/qa/common/build.gradle @@ -5,7 +5,7 @@ dependencies { api project(':test:framework') api project(path: xpackModule('core')) api(testArtifact(project(xpackModule('core')))) - api project(xpackModule('ql:test')) + api project(xpackModule('ql:test-fixtures')) // TOML parser for EqlActionIT tests api 'io.ous:jtoml:2.0.0' diff --git a/x-pack/plugin/eql/qa/correctness/build.gradle b/x-pack/plugin/eql/qa/correctness/build.gradle index 37ef226933078..00078b324fba2 100644 --- a/x-pack/plugin/eql/qa/correctness/build.gradle +++ b/x-pack/plugin/eql/qa/correctness/build.gradle @@ -9,7 +9,7 @@ import org.elasticsearch.gradle.info.BuildParams dependencies { javaRestTestImplementation project(':test:framework') javaRestTestImplementation(testArtifact(project(xpackModule('core')))) - javaRestTestImplementation project(xpackModule('ql:test')) + javaRestTestImplementation project(xpackModule('ql:test-fixtures')) javaRestTestImplementation 'io.ous:jtoml:2.0.0' } diff --git a/x-pack/plugin/eql/qa/mixed-node/build.gradle b/x-pack/plugin/eql/qa/mixed-node/build.gradle index 5e041a2aa5f2d..56196d10af594 100644 --- a/x-pack/plugin/eql/qa/mixed-node/build.gradle +++ b/x-pack/plugin/eql/qa/mixed-node/build.gradle @@ -10,7 +10,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask dependencies { testImplementation project(':x-pack:qa') - testImplementation(project(xpackModule('ql:test'))) + testImplementation(project(xpackModule('ql:test-fixtures'))) testImplementation project(path: xpackModule('eql'), configuration: 'default') } diff --git a/x-pack/plugin/ql/build.gradle b/x-pack/plugin/ql/build.gradle index 39af2e8ecce31..820b13e1c7747 100644 --- a/x-pack/plugin/ql/build.gradle +++ b/x-pack/plugin/ql/build.gradle @@ -14,7 +14,7 @@ dependencies { compileOnly project(path: xpackModule('core')) testImplementation project(':test:framework') testImplementation(testArtifact(project(xpackModule('core')))) - testImplementation(project(xpackModule('ql:test'))) { + testImplementation(project(xpackModule('ql:test-fixtures'))) { exclude group: 'org.elasticsearch.plugin', module: 'ql' } -} \ No newline at end of file +} diff --git a/x-pack/plugin/ql/test/build.gradle b/x-pack/plugin/ql/test-fixtures/build.gradle similarity index 100% rename from x-pack/plugin/ql/test/build.gradle rename to x-pack/plugin/ql/test-fixtures/build.gradle diff --git a/x-pack/plugin/ql/test/src/main/java/org/elasticsearch/xpack/ql/TestNode.java b/x-pack/plugin/ql/test-fixtures/src/main/java/org/elasticsearch/xpack/ql/TestNode.java similarity index 100% rename from x-pack/plugin/ql/test/src/main/java/org/elasticsearch/xpack/ql/TestNode.java rename to x-pack/plugin/ql/test-fixtures/src/main/java/org/elasticsearch/xpack/ql/TestNode.java diff --git a/x-pack/plugin/ql/test/src/main/java/org/elasticsearch/xpack/ql/TestNodes.java b/x-pack/plugin/ql/test-fixtures/src/main/java/org/elasticsearch/xpack/ql/TestNodes.java similarity index 100% rename from x-pack/plugin/ql/test/src/main/java/org/elasticsearch/xpack/ql/TestNodes.java rename to x-pack/plugin/ql/test-fixtures/src/main/java/org/elasticsearch/xpack/ql/TestNodes.java diff --git a/x-pack/plugin/ql/test/src/main/java/org/elasticsearch/xpack/ql/TestUtils.java b/x-pack/plugin/ql/test-fixtures/src/main/java/org/elasticsearch/xpack/ql/TestUtils.java similarity index 100% rename from x-pack/plugin/ql/test/src/main/java/org/elasticsearch/xpack/ql/TestUtils.java rename to x-pack/plugin/ql/test-fixtures/src/main/java/org/elasticsearch/xpack/ql/TestUtils.java diff --git a/x-pack/plugin/sql/qa/mixed-node/build.gradle b/x-pack/plugin/sql/qa/mixed-node/build.gradle index 8a39ecc795848..ef0b27d7b351f 100644 --- a/x-pack/plugin/sql/qa/mixed-node/build.gradle +++ b/x-pack/plugin/sql/qa/mixed-node/build.gradle @@ -10,7 +10,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask dependencies { testImplementation project(':x-pack:qa') - testImplementation(project(xpackModule('ql:test'))) + testImplementation(project(xpackModule('ql:test-fixtures'))) testImplementation project(path: xpackModule('sql'), configuration: 'default') } diff --git a/x-pack/plugin/sql/qa/server/build.gradle b/x-pack/plugin/sql/qa/server/build.gradle index aed41298ce3b0..7ab0c22a54602 100644 --- a/x-pack/plugin/sql/qa/server/build.gradle +++ b/x-pack/plugin/sql/qa/server/build.gradle @@ -12,7 +12,7 @@ dependencies { // JDBC testing dependencies api project(path: xpackModule('sql:jdbc')) // Common utilities from QL - api project(xpackModule('ql:test')) + api project(xpackModule('ql:test-fixtures')) api "net.sourceforge.csvjdbc:csvjdbc:${csvjdbcVersion}" @@ -67,7 +67,7 @@ subprojects { transitive = false } testImplementation project(":test:framework") - testRuntimeOnly project(xpackModule('ql:test')) + testRuntimeOnly project(xpackModule('ql:test-fixtures')) // JDBC testing dependencies testRuntimeOnly "net.sourceforge.csvjdbc:csvjdbc:${csvjdbcVersion}"