From 0507b27dcd926506e09b41048a4714f601352245 Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Fri, 15 Jan 2016 17:56:43 +0100
Subject: [PATCH] Move WS responses at the right place

---
 .../permission/ws}/search_global_permissions-example.json       | 0
 .../permission/ws}/search_project_permissions-example.json      | 0
 .../permission/ws/template}/search_templates-example.json       | 0
 .../server/permission/ws/SearchGlobalPermissionsActionTest.java | 2 +-
 .../permission/ws/SearchProjectPermissionsActionTest.java       | 2 +-
 .../permission/ws/template/SearchTemplatesActionTest.java       | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename server/sonar-server/src/{test/resources/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest => main/resources/org/sonar/server/permission/ws}/search_global_permissions-example.json (100%)
 rename server/sonar-server/src/{test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest => main/resources/org/sonar/server/permission/ws}/search_project_permissions-example.json (100%)
 rename server/sonar-server/src/{test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest => main/resources/org/sonar/server/permission/ws/template}/search_templates-example.json (100%)

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
similarity index 100%
rename from server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest/search_global_permissions-example.json
rename to 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
similarity index 100%
rename from server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/search_project_permissions-example.json
rename to 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
similarity index 100%
rename from server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/search_templates-example.json
rename to 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
-- 
2.39.5