Merge pull request cloudbees-oss#396 from bratwurzt/issue_387

Fix dates format on PermissionGroup object

Author: PierreBtz

src/main/java/org/zendesk/client/v2/model/hc/PermissionGroup.java

@@ -1,6 +1,5 @@
 package org.zendesk.client.v2.model.hc;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.zendesk.client.v2.model.SearchResultEntity;
 
@@ -24,11 +23,9 @@ public class PermissionGroup implements SearchResultEntity {
     private List<Long> publish;
     /** When the permission group was created */
     @JsonProperty("created_at")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd hh:mm:ss Z")
     private Date createdAt;
     /** When the permission group was last updated */
     @JsonProperty("updated_at")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd hh:mm:ss Z")
     private Date updatedAt;
     /** Whether the permission group is built-in. Built-in permission groups cannot be modified */
     @JsonProperty("built_in")

src/test/java/org/zendesk/client/v2/RealSmokeTest.java

@@ -41,6 +41,7 @@
 import org.zendesk.client.v2.model.events.Event;
 import org.zendesk.client.v2.model.hc.Article;
 import org.zendesk.client.v2.model.hc.Category;
+import org.zendesk.client.v2.model.hc.PermissionGroup;
 import org.zendesk.client.v2.model.hc.Section;
 import org.zendesk.client.v2.model.hc.Subscription;
 import org.zendesk.client.v2.model.hc.Translation;
@@ -77,9 +78,10 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.lessThan;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
@@ -1245,6 +1247,49 @@ public void getGroups() throws Exception {
         }
     }
 
+    @Test
+    public void getPermissionGroups() throws Exception {
+        createClientWithTokenOrPassword();
+        int count = 0;
+        for (PermissionGroup pg : instance.getPermissionGroups()) {
+            assertThat(pg.getId(), notNullValue());
+            assertThat(pg.getName(), notNullValue());
+            assertThat(pg.getBuiltIn(), notNullValue());
+            assertThat(pg.getCreatedAt(), notNullValue());
+            assertThat(pg.getUpdatedAt(), notNullValue());
+            if (++count > 1) {
+                break;
+            }
+        }
+    }
+
+    @Test
+    public void permissionGroupCRUD() throws Exception {
+        createClientWithTokenOrPassword();
+        PermissionGroup pg = new PermissionGroup();
+        pg.setName("[zendesk-java-client] This is a creation test " + UUID.randomUUID());
+        pg = instance.createPermissionGroup(pg);
+        Long pgId = pg.getId();
+        try {
+            assertThat(pg.getId(), notNullValue());
+            assertThat(pg.getName(), containsString("[zendesk-java-client] This is a creation test"));
+            assertThat(pg.getCreatedAt(), notNullValue());
+            assertThat(pg.getUpdatedAt(), notNullValue());
+            assertThat(pg.getCreatedAt(), is(pg.getUpdatedAt()));
+            pg.setName("[zendesk-java-client] This is an update test" + UUID.randomUUID());
+            pg = instance.updatePermissionGroup(pg);
+            assertThat(pg.getId(), is(pgId));
+            assertThat(pg.getName(), containsString("[zendesk-java-client] This is an update test"));
+            assertThat(pg.getCreatedAt(), notNullValue());
+            assertThat(pg.getUpdatedAt(), notNullValue());
+            assertThat(pg.getCreatedAt(), lessThanOrEqualTo(pg.getUpdatedAt()));
+        } finally {
+            instance.deletePermissionGroup(pg);
+        }
+        PermissionGroup ghost = instance.getPermissionGroup(pgId);
+        assertThat(ghost, nullValue());
+    }
+
     @Test
     public void getArticles() throws Exception {
         createClientWithTokenOrPassword();

src/test/java/org/zendesk/client/v2/model/hc/PermissionGroupTest.java

@@ -35,8 +35,8 @@ public void testParsePermissionGroup() throws ParseException {
                 "    \"name\": \"ApiGroup\",\n" +
                 "    \"built_in\": false,\n" +
                 "    \"publish\": [360001413871],\n" +
-                "    \"created_at\": \"2019-06-10 12:39:23 +0000\",\n" +
-                "    \"updated_at\": \"2019-06-10 12:39:23 +0000\",\n" +
+                "    \"created_at\": \"2019-06-10T12:39:25Z\",\n" +
+                "    \"updated_at\": \"2020-11-04T11:30:42Z\",\n" +
                 "    \"edit\": [360001413871]\n" +
                 "}";
         PermissionGroup pg = parseJson(json.getBytes());
@@ -51,10 +51,11 @@ public void testParsePermissionGroup() throws ParseException {
         assertEquals(ids, pg.getPublish());
         assertEquals(ids, pg.getEdit());
 
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss Z");
-        Date date = simpleDateFormat.parse("2019-06-10 12:39:23 +0000");
-        assertEquals(date, pg.getCreatedAt());
-        assertEquals(date, pg.getUpdatedAt());
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+        Date created = simpleDateFormat.parse("2019-06-10 12:39:25 +0000");
+        assertEquals(created, pg.getCreatedAt());
+        Date updated = simpleDateFormat.parse("2020-11-04 11:30:42 +0000");
+        assertEquals(updated, pg.getUpdatedAt());
     }
 
 }