Skip to content

Commit

Permalink
Rename ql:test project to ql:test-fixtures to avoid IntelliJ confusion (
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-vieira authored Mar 31, 2021
1 parent f413206 commit d3a152e
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion x-pack/plugin/eql/qa/common/build.gradle
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
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
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
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'
}
}
}
File renamed without changes.
2 changes: 1 addition & 1 deletion x-pack/plugin/sql/qa/mixed-node/build.gradle
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
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

0 comments on commit d3a152e

Please sign in to comment.