diff options
| author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2016-01-15 17:56:43 +0100 |
|---|---|---|
| committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2016-01-15 18:05:43 +0100 |
| commit | 0507b27dcd926506e09b41048a4714f601352245 (patch) | |
| tree | fad5e0018f3c4996b989d68a48e022fa6e444da0 | |
| parent | 2aeb5d7035dabbfef7aac0239c189e5561e3bd60 (diff) | |
| download | sonarqube-0507b27dcd926506e09b41048a4714f601352245.tar.gz sonarqube-0507b27dcd926506e09b41048a4714f601352245.zip | |
Move WS responses at the right place
6 files changed, 3 insertions, 3 deletions
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest/search_global_permissions-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json index 3a2a854cbf7..3a2a854cbf7 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest/search_global_permissions-example.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/search_project_permissions-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json index 43480d67f96..43480d67f96 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/search_project_permissions-example.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/search_templates-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example.json index 75d69f5b497..75d69f5b497 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/search_templates-example.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example.json diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java index 2102f5b9fcf..6f74c51cc38 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java @@ -94,7 +94,7 @@ public class SearchGlobalPermissionsActionTest { String result = ws.newRequest().execute().getInput(); - assertJson(result).isSimilarTo(getClass().getResource("SearchGlobalPermissionsActionTest/search_global_permissions-example.json")); + assertJson(result).isSimilarTo(getClass().getResource("search_global_permissions-example.json")); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java index 59f8498eb8a..6da5415d360 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java @@ -137,7 +137,7 @@ public class SearchProjectPermissionsActionTest { assertJson(result) .ignoreFields("permissions") - .isSimilarTo(getClass().getResource("SearchProjectPermissionsActionTest/search_project_permissions-example.json")); + .isSimilarTo(getClass().getResource("search_project_permissions-example.json")); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java index d82444c85ce..a7e464a533f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java @@ -137,7 +137,7 @@ public class SearchTemplatesActionTest { assertJson(result) .withStrictArrayOrder() .ignoreFields("permissions") - .isSimilarTo(getClass().getResource("SearchTemplatesActionTest/search_templates-example.json")); + .isSimilarTo(getClass().getResource("search_templates-example.json")); } @Test |