From 217816b5c5fbfe2dc3cf0bb76889619f2e0cb8d3 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Thu, 27 Aug 2015 17:04:38 +0200 Subject: [PATCH] Update tests to use the ignore fields feature of JsonAssert --- .../server/permission/ws/create_template-example.json | 2 +- .../server/permission/ws/update_template-example.json | 4 ++-- .../server/permission/ws/CreateTemplateActionTest.java | 4 +++- .../server/permission/ws/UpdateTemplateActionTest.java | 4 +++- .../ws/CreateTemplateActionTest/create_template.json | 9 --------- .../ws/UpdateTemplateActionTest/update_template.json | 9 --------- 6 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/permission/ws/CreateTemplateActionTest/create_template.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UpdateTemplateActionTest/update_template.json diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/create_template-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/create_template-example.json index d27d52f9003..5a49450b905 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/create_template-example.json +++ b/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" diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/update_template-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/update_template-example.json index d27d52f9003..3ef72119a12 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/update_template-example.json +++ b/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" } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/CreateTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/CreateTemplateActionTest.java index e4208eabc48..230c615bb5c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/CreateTemplateActionTest.java +++ b/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"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UpdateTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UpdateTemplateActionTest.java index 7cb9d82e3f1..45acf036bfd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UpdateTemplateActionTest.java +++ b/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"); diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/CreateTemplateActionTest/create_template.json b/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/CreateTemplateActionTest/create_template.json deleted file mode 100644 index 0d4c7137db8..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/CreateTemplateActionTest/create_template.json +++ /dev/null @@ -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" - } -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UpdateTemplateActionTest/update_template.json b/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UpdateTemplateActionTest/update_template.json deleted file mode 100644 index 1d0f4eb39cc..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UpdateTemplateActionTest/update_template.json +++ /dev/null @@ -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" - } -} -- 2.39.5