diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2019-08-29 15:01:10 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2019-09-02 20:21:05 +0200 |
| commit | b9f3ad2e06030ff955a33d8e4638fa5d38d01732 (patch) | |
| tree | d2bc19cf9b5ed326d442c7a187b876db64515e44 | |
| parent | 3b52502005319ab1d8fd012e33be5db5b83e6b90 (diff) | |
| download | sonarqube-b9f3ad2e06030ff955a33d8e4638fa5d38d01732.tar.gz sonarqube-b9f3ad2e06030ff955a33d8e4638fa5d38d01732.zip | |
use testFixtures instead of test configuration of ce-task
| -rw-r--r-- | server/sonar-ce-task-projectanalysis/build.gradle | 2 | ||||
| -rw-r--r-- | server/sonar-ce-task/build.gradle | 17 | ||||
| -rw-r--r-- | server/sonar-ce-task/src/testFixtures/java/org/sonar/ce/task/ChangeLogLevel.java (renamed from server/sonar-ce-task/src/test/java/org/sonar/ce/task/ChangeLogLevel.java) | 0 | ||||
| -rw-r--r-- | server/sonar-ce-task/src/testFixtures/java/org/sonar/ce/task/step/TestComputationStepContext.java (renamed from server/sonar-ce-task/src/test/java/org/sonar/ce/task/step/TestComputationStepContext.java) | 0 |
4 files changed, 5 insertions, 14 deletions
diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle index e9eca578474..99971d84553 100644 --- a/server/sonar-ce-task-projectanalysis/build.gradle +++ b/server/sonar-ce-task-projectanalysis/build.gradle @@ -57,7 +57,7 @@ dependencies { testCompile 'org.mockito:mockito-core' testCompile 'org.reflections:reflections' testCompile project(':sonar-testing-harness') - testCompile project(path: ":server:sonar-ce-task", configuration: "tests") + testCompile testFixtures(project(':server:sonar-ce-task')) testCompile testFixtures(project(':server:sonar-server-common')) } diff --git a/server/sonar-ce-task/build.gradle b/server/sonar-ce-task/build.gradle index 7509cd5dbb5..6a18c0ce329 100644 --- a/server/sonar-ce-task/build.gradle +++ b/server/sonar-ce-task/build.gradle @@ -24,8 +24,8 @@ dependencies { compile project(':server:sonar-server-common') compile project(':sonar-core') - compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow') + compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow') compileOnly 'com.google.code.findbugs:jsr305' testCompile 'ch.qos.logback:logback-access' @@ -36,22 +36,13 @@ dependencies { testCompile 'junit:junit' testCompile 'org.apache.logging.log4j:log4j-api' testCompile 'org.apache.logging.log4j:log4j-core' - testCompile 'org.assertj:assertj-core' testCompile 'org.assertj:assertj-guava' testCompile 'org.mockito:mockito-core' testCompile 'org.reflections:reflections' testCompile testFixtures(project(':server:sonar-db-dao')) -} -task testJar(type: Jar) { - classifier = 'tests' - from sourceSets.test.output -} - -configurations { - tests -} + testFixturesApi 'org.assertj:assertj-core' + testFixturesApi project(path: ':sonar-plugin-api', configuration: 'shadow') -artifacts { - tests testJar + testFixturesCompileOnly 'com.google.code.findbugs:jsr305' } diff --git a/server/sonar-ce-task/src/test/java/org/sonar/ce/task/ChangeLogLevel.java b/server/sonar-ce-task/src/testFixtures/java/org/sonar/ce/task/ChangeLogLevel.java index e9135a09281..e9135a09281 100644 --- a/server/sonar-ce-task/src/test/java/org/sonar/ce/task/ChangeLogLevel.java +++ b/server/sonar-ce-task/src/testFixtures/java/org/sonar/ce/task/ChangeLogLevel.java diff --git a/server/sonar-ce-task/src/test/java/org/sonar/ce/task/step/TestComputationStepContext.java b/server/sonar-ce-task/src/testFixtures/java/org/sonar/ce/task/step/TestComputationStepContext.java index 8e984b09d48..8e984b09d48 100644 --- a/server/sonar-ce-task/src/test/java/org/sonar/ce/task/step/TestComputationStepContext.java +++ b/server/sonar-ce-task/src/testFixtures/java/org/sonar/ce/task/step/TestComputationStepContext.java |