diff options
author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2019-08-28 16:52:53 +0200 |
---|---|---|
committer | SonarTech <sonartech@sonarsource.com> | 2019-09-02 20:21:04 +0200 |
commit | f0f55945b8c05cfb3feda3d06ceea4173467c31a (patch) | |
tree | b8f40b8d24265c52779bf68aee5f9ef6ab43ee36 /server/sonar-webserver-ws | |
parent | 65c7e3f5b11910bdad8beb2bd74e45e030b032a1 (diff) | |
download | sonarqube-f0f55945b8c05cfb3feda3d06ceea4173467c31a.tar.gz sonarqube-f0f55945b8c05cfb3feda3d06ceea4173467c31a.zip |
use testFixtures instead of test configuration of webserver-ws
Diffstat (limited to 'server/sonar-webserver-ws')
-rw-r--r-- | server/sonar-webserver-ws/build.gradle | 16 | ||||
-rw-r--r-- | server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/DumbResponse.java (renamed from server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/DumbResponse.java) | 0 | ||||
-rw-r--r-- | server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestRequest.java (renamed from server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/TestRequest.java) | 0 | ||||
-rw-r--r-- | server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestResponse.java (renamed from server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/TestResponse.java) | 0 | ||||
-rw-r--r-- | server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/WsActionTester.java (renamed from server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/WsActionTester.java) | 0 |
5 files changed, 2 insertions, 14 deletions
diff --git a/server/sonar-webserver-ws/build.gradle b/server/sonar-webserver-ws/build.gradle index 7fa56ae5c0b..33d0249b7f1 100644 --- a/server/sonar-webserver-ws/build.gradle +++ b/server/sonar-webserver-ws/build.gradle @@ -6,12 +6,6 @@ sonarqube { } } -configurations { - tests - - testCompile.extendsFrom tests -} - dependencies { // please keep the list grouped by configuration and ordered by name @@ -30,14 +24,8 @@ dependencies { testCompile 'javax.servlet:javax.servlet-api' testCompile 'org.apache.tomcat.embed:tomcat-embed-core' testCompile 'org.mockito:mockito-core' - testCompile project(':sonar-testing-harness') -} -task testJar(type: Jar) { - classifier = 'tests' - from sourceSets.test.output -} + testFixturesApi project(':sonar-testing-harness') -artifacts { - tests testJar + testFixturesCompileOnly 'com.google.code.findbugs:jsr305' } diff --git a/server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/DumbResponse.java b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/DumbResponse.java index f7d2aeedd80..f7d2aeedd80 100644 --- a/server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/DumbResponse.java +++ b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/DumbResponse.java diff --git a/server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/TestRequest.java b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestRequest.java index aea0e0d69bd..aea0e0d69bd 100644 --- a/server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/TestRequest.java +++ b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestRequest.java diff --git a/server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/TestResponse.java b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestResponse.java index 352d0bb135d..352d0bb135d 100644 --- a/server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/TestResponse.java +++ b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestResponse.java diff --git a/server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/WsActionTester.java b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/WsActionTester.java index fede932156e..fede932156e 100644 --- a/server/sonar-webserver-ws/src/test/java/org/sonar/server/ws/WsActionTester.java +++ b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/WsActionTester.java |