Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename ql:test project to ql:test-fixtures to avoid IntelliJ confusion #71135

Merged
merged 1 commit into from
Mar 31, 2021
Merged

Rename ql:test project to ql:test-fixtures to avoid IntelliJ confusion #71135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/plugin/eql/qa/common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/eql/qa/correctness/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/eql/qa/mixed-node/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugin/ql/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
0 x-pack/plugin/ql/test/build.gradle → x-pack/plugin/ql/test-fixtures/build.gradle
View file
Open in desktop
File renamed without changes.
0 .../org/elasticsearch/xpack/ql/TestNode.java → .../org/elasticsearch/xpack/ql/TestNode.java
View file
Open in desktop
File renamed without changes.
0 ...org/elasticsearch/xpack/ql/TestNodes.java → ...org/elasticsearch/xpack/ql/TestNodes.java
View file
Open in desktop
File renamed without changes.
0 ...org/elasticsearch/xpack/ql/TestUtils.java → ...org/elasticsearch/xpack/ql/TestUtils.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion x-pack/plugin/sql/qa/mixed-node/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugin/sql/qa/server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down Expand Up @@ -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}"
Expand Down