From c5312bd4a23d35d54844e851e6271ed450b85190 Mon Sep 17 00:00:00 2001
From: Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Date: Wed, 14 Aug 2019 16:21:32 +0200
Subject: sanitize dependencies on testjar of modules sonar-webserver*

---
 server/sonar-webserver-api/build.gradle                               | 1 -
 server/sonar-webserver-auth/build.gradle                              | 1 -
 .../src/test/java/org/sonar/server/user/SystemPasscodeImplTest.java   | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/sonar-webserver-api/build.gradle b/server/sonar-webserver-api/build.gradle
index 9c89a4b7de4..53fe4368afa 100644
--- a/server/sonar-webserver-api/build.gradle
+++ b/server/sonar-webserver-api/build.gradle
@@ -44,7 +44,6 @@ dependencies {
   testCompile 'org.mockito:mockito-core'
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
-  testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
   testCompile project(':sonar-testing-harness')
 }
 
diff --git a/server/sonar-webserver-auth/build.gradle b/server/sonar-webserver-auth/build.gradle
index 3d50a54a0ec..44ae241588c 100644
--- a/server/sonar-webserver-auth/build.gradle
+++ b/server/sonar-webserver-auth/build.gradle
@@ -38,7 +38,6 @@ dependencies {
   testCompile 'org.mockito:mockito-core'
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
-  testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
   testCompile project(':sonar-testing-harness')
 
   runtime 'io.jsonwebtoken:jjwt-jackson'
diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/SystemPasscodeImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/SystemPasscodeImplTest.java
index 352070eacf3..b86d6de5fd1 100644
--- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/SystemPasscodeImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/SystemPasscodeImplTest.java
@@ -23,9 +23,9 @@ import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.config.internal.MapSettings;
+import org.sonar.api.impl.ws.SimpleGetRequest;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.server.ws.TestRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -93,7 +93,7 @@ public class SystemPasscodeImplTest {
   private void verifyIsValid(boolean expectedResult, String configuredPasscode, String header) {
     configurePasscode(configuredPasscode);
 
-    TestRequest request = new TestRequest();
+    SimpleGetRequest request = new SimpleGetRequest();
     request.setHeader("X-Sonar-Passcode", header);
 
     assertThat(underTest.isValid(request)).isEqualTo(expectedResult);
-- 
cgit v1.2.3