aboutsummaryrefslogtreecommitdiffstats
path: root/it
diff options
context:
space:
mode:
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2015-09-28 14:14:35 +0200
committerDuarte Meneses <duarte.meneses@sonarsource.com>2015-09-30 16:28:08 +0200
commita23a7ec4f48244c193b48aec84127701618a31cc (patch)
tree60c76cbb7f6fc709c9ff98375f6f2c8c2d27928f /it
parent80b9f52b80c5ae3fcc81b8b8cc3209000a886b7f (diff)
downloadsonarqube-a23a7ec4f48244c193b48aec84127701618a31cc.tar.gz
sonarqube-a23a7ec4f48244c193b48aec84127701618a31cc.zip
Revert "SONAR-6864 Rename WS batch/* to scanner/*"
This reverts commit a515be7cbe641e21805d9fa945bf13afc66c810c.
Diffstat (limited to 'it')
-rw-r--r--it/it-tests/src/test/java/server/suite/ServerTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/it/it-tests/src/test/java/server/suite/ServerTest.java b/it/it-tests/src/test/java/server/suite/ServerTest.java
index 7e6a4ae7049..57ab6c3b33f 100644
--- a/it/it-tests/src/test/java/server/suite/ServerTest.java
+++ b/it/it-tests/src/test/java/server/suite/ServerTest.java
@@ -72,7 +72,7 @@ public class ServerTest {
orchestrator.getServer().getAdminWsClient().update(new PropertyUpdateQuery("sonar.forceAuthentication", "true"));
// /batch/index should never need authentication
- String batchIndex = orchestrator.getServer().wsClient().get("/scanner/index");
+ String batchIndex = orchestrator.getServer().wsClient().get("/batch/index");
assertThat(batchIndex).isNotEmpty();
String jar = batchIndex.split("\\|")[0];
@@ -80,13 +80,13 @@ public class ServerTest {
// /batch/file should never need authentication
HttpClient httpclient = new DefaultHttpClient();
try {
- HttpGet get = new HttpGet(orchestrator.getServer().getUrl() + "/scanner/file?name=" + jar);
+ HttpGet get = new HttpGet(orchestrator.getServer().getUrl() + "/batch/file?name=" + jar);
HttpResponse response = httpclient.execute(get);
assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
EntityUtils.consume(response.getEntity());
// As Sonar runner is still using /batch/key, we have to also verify it
- get = new HttpGet(orchestrator.getServer().getUrl() + "/scanner/" + jar);
+ get = new HttpGet(orchestrator.getServer().getUrl() + "/batch/" + jar);
response = httpclient.execute(get);
assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
EntityUtils.consume(response.getEntity());