Update tests to use the ignore fields feature of JsonAssert

server/sonar-server/src/main/resources/org/sonar/server/permission/ws/create_template-example.json

@@ -2,7 +2,7 @@
   "permissionTemplate": {
     "id": "af8cb8cc-1e78-4c4e-8c00-ee8e814009a5",
     "name": "Finance",
-    "description": "Permissions for financial related projects",
+    "description": "Permissions for financially related projects",
     "projectKeyPattern": ".*\\.finance\\..*",
     "createdAt": "2015-08-25T16:18:48+0200",
     "updatedAt": "2015-08-25T16:18:48+0200"

server/sonar-server/src/main/resources/org/sonar/server/permission/ws/update_template-example.json

@@ -2,9 +2,9 @@
   "permissionTemplate": {
     "id": "af8cb8cc-1e78-4c4e-8c00-ee8e814009a5",
     "name": "Finance",
-    "description": "Permissions for financial related projects",
+    "description": "Permissions for financially related projects",
     "projectKeyPattern": ".*\\.finance\\..*",
-    "createdAt": "2015-08-25T16:18:48+0200",
+    "createdAt": "2001-09-09T03:46:40+0200",
     "updatedAt": "2015-08-25T16:18:48+0200"
   }
 }

server/sonar-server/src/test/java/org/sonar/server/permission/ws/CreateTemplateActionTest.java

@@ -76,7 +76,9 @@ public class CreateTemplateActionTest {
   public void create_full_permission_template() {
     TestResponse result = newRequest("Finance", "Permissions for financially related projects", ".*\\.finance\\..*");
 
-    assertJson(result.getInput()).isSimilarTo(getClass().getResource("CreateTemplateActionTest/create_template.json"));
+    assertJson(result.getInput())
+      .ignoreFields("id")
+      .isSimilarTo(getClass().getResource("create_template-example.json"));
     PermissionTemplateDto finance = dbClient.permissionTemplateDao().selectByName(dbSession, "Finance");
     assertThat(finance.getName()).isEqualTo("Finance");
     assertThat(finance.getDescription()).isEqualTo("Permissions for financially related projects");

server/sonar-server/src/test/java/org/sonar/server/permission/ws/UpdateTemplateActionTest.java

@@ -92,7 +92,9 @@ public class UpdateTemplateActionTest {
   public void update_all_permission_template_fields() {
     TestResponse result = newRequest(templateDto.getKee(), "Finance", "Permissions for financially related projects", ".*\\.finance\\..*");
 
-    assertJson(result.getInput()).isSimilarTo(getClass().getResource("UpdateTemplateActionTest/update_template.json"));
+    assertJson(result.getInput())
+      .ignoreFields("id")
+      .isSimilarTo(getClass().getResource("update_template-example.json"));
     PermissionTemplateDto finance = dbClient.permissionTemplateDao().selectByName(dbSession, "Finance");
     assertThat(finance.getName()).isEqualTo("Finance");
     assertThat(finance.getDescription()).isEqualTo("Permissions for financially related projects");

server/sonar-server/src/test/resources/org/sonar/server/permission/ws/CreateTemplateActionTest/create_template.json

@@ -1,9 +0,0 @@
-{
-  "permissionTemplate": {
-    "name": "Finance",
-    "description": "Permissions for financially related projects",
-    "projectKeyPattern": ".*\\.finance\\..*",
-    "createdAt": "2015-08-25T16:18:48+0200",
-    "updatedAt": "2015-08-25T16:18:48+0200"
-  }
-}

server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UpdateTemplateActionTest/update_template.json

@@ -1,9 +0,0 @@
-{
-  "permissionTemplate": {
-    "name": "Finance",
-    "description": "Permissions for financially related projects",
-    "projectKeyPattern": ".*\\.finance\\..*",
-    "createdAt": "2001-09-09T03:46:40+0200",
-    "updatedAt": "2015-08-25T16:18:48+0200"
-  }
-}