Browse Source

use testFixtures instead of test configuration of webserver-es

tags/8.0
Sébastien Lesaint 4 years ago
parent
commit
3b52502005

+ 1
- 1
server/sonar-webserver-core/build.gradle View File

@@ -72,7 +72,7 @@ dependencies {
testCompile 'org.subethamail:subethasmtp'
testCompile testFixtures(project(':server:sonar-server-common'))
testCompile testFixtures(project(':server:sonar-webserver-auth'))
testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
testCompile testFixtures(project(':server:sonar-webserver-es'))
testCompile testFixtures(project(':server:sonar-webserver-ws'))
testCompile project(':sonar-testing-harness')


+ 2
- 16
server/sonar-webserver-es/build.gradle View File

@@ -4,12 +4,6 @@ sonarqube {
}
}

configurations {
tests

testCompile.extendsFrom tests
}

dependencies {
// please keep the list grouped by configuration and ordered by name

@@ -28,15 +22,7 @@ dependencies {
testCompile 'com.tngtech.java:junit-dataprovider'
testCompile 'org.mockito:mockito-core'
testCompile testFixtures(project(':server:sonar-webserver-auth'))
testCompile testFixtures(project(':server:sonar-server-common'))
testCompile project(':sonar-testing-harness')
}

task testJar(type: Jar) {
classifier = 'tests'
from sourceSets.test.output
}

artifacts {
tests testJar
testFixturesApi testFixtures(project(':server:sonar-server-common'))
}

server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/FooIndexDefinition.java → server/sonar-webserver-es/src/testFixtures/java/org/sonar/server/permission/index/FooIndexDefinition.java View File


server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/PermissionIndexerTester.java → server/sonar-webserver-es/src/testFixtures/java/org/sonar/server/permission/index/PermissionIndexerTester.java View File


+ 1
- 1
server/sonar-webserver-webapi/build.gradle View File

@@ -29,7 +29,7 @@ dependencies {
testCompile 'org.mockito:mockito-core'
testCompile testFixtures(project(':server:sonar-server-common'))
testCompile testFixtures(project(':server:sonar-webserver-auth'))
testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
testCompile testFixtures(project(':server:sonar-webserver-es'))
testCompile testFixtures(project(':server:sonar-webserver-ws'))
testCompile project(':sonar-testing-harness')
}

+ 1
- 1
server/sonar-webserver/build.gradle View File

@@ -28,6 +28,6 @@ dependencies {
testCompile 'org.eclipse.jetty:jetty-servlet'
testCompile testFixtures(project(':server:sonar-server-common'))
testCompile testFixtures(project(':server:sonar-webserver-auth'))
testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
testCompile testFixtures(project(':server:sonar-webserver-es'))
testCompile project(':sonar-testing-harness')
}

Loading…
Cancel
Save