From 286cf4e0c74dc78b050bad64e854e0dc3787ccd7 Mon Sep 17 00:00:00 2001 From: tomohiro-okuyama <58939083+tomohiro-okuyama@users.noreply.github.com> Date: Tue, 2 Jul 2024 18:30:47 +0900 Subject: [PATCH 1/2] chore: refactor tests of deserializing TimeFieldProperty --- .../client/FieldPropertyDeserializerTest.java | 19 ------- .../app/field/TimeFieldPropertyTest.java | 50 +++++++++++++++++++ ...st_deserialize_TIME_defaultValueEmpty.json | 11 ---- .../TimeFieldPropertyTest_deserialize.json | 9 ++++ ...rtyTest_deserialize_defaultValueEmpty.json | 9 ++++ 5 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 src/test/java/com/kintone/client/model/app/field/TimeFieldPropertyTest.java delete mode 100644 src/test/resources/com/kintone/client/FieldPropertyDeserializerTest_deserialize_TIME_defaultValueEmpty.json create mode 100644 src/test/resources/com/kintone/client/model/app/field/TimeFieldPropertyTest_deserialize.json create mode 100644 src/test/resources/com/kintone/client/model/app/field/TimeFieldPropertyTest_deserialize_defaultValueEmpty.json diff --git a/src/test/java/com/kintone/client/FieldPropertyDeserializerTest.java b/src/test/java/com/kintone/client/FieldPropertyDeserializerTest.java index 97eb101..15e22c3 100644 --- a/src/test/java/com/kintone/client/FieldPropertyDeserializerTest.java +++ b/src/test/java/com/kintone/client/FieldPropertyDeserializerTest.java @@ -597,25 +597,6 @@ public void deserialize_TIME() throws IOException { assertThat(obj.getDefaultNowValue()).isFalse(); } - @Test - public void deserialize_TIME_defaultValueEmpty() throws IOException { - URL url = - getClass() - .getResource("FieldPropertyDeserializerTest_deserialize_TIME_defaultValueEmpty.json"); - - TestObject result = mapper.readValue(url, TestObject.class); - assertThat(result.getProperty()).isInstanceOf(TimeFieldProperty.class); - - TimeFieldProperty obj = (TimeFieldProperty) result.getProperty(); - assertThat(obj.getType()).isEqualTo(FieldType.TIME); - assertThat(obj.getCode()).isEqualTo("time"); - assertThat(obj.getLabel()).isEqualTo("Time field"); - assertThat(obj.getNoLabel()).isFalse(); - assertThat(obj.getRequired()).isFalse(); - assertThat(obj.getDefaultValue()).isNull(); - assertThat(obj.getDefaultNowValue()).isTrue(); - } - @Test public void deserialize_UPDATED_TIME() throws IOException { URL url = getClass().getResource("FieldPropertyDeserializerTest_deserialize_UPDATED_TIME.json"); diff --git a/src/test/java/com/kintone/client/model/app/field/TimeFieldPropertyTest.java b/src/test/java/com/kintone/client/model/app/field/TimeFieldPropertyTest.java new file mode 100644 index 0000000..0be30d9 --- /dev/null +++ b/src/test/java/com/kintone/client/model/app/field/TimeFieldPropertyTest.java @@ -0,0 +1,50 @@ +package com.kintone.client.model.app.field; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.kintone.client.model.record.FieldType; +import java.io.IOException; +import java.net.URL; +import java.time.LocalTime; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class TimeFieldPropertyTest { + private ObjectMapper mapper; + + @BeforeEach + public void setup() { + mapper = new ObjectMapper(); + mapper.registerModule(new JavaTimeModule()); + } + + @Test + public void deserialize() throws IOException { + URL url = getClass().getResource("TimeFieldPropertyTest_deserialize.json"); + + TimeFieldProperty result = mapper.readValue(url, TimeFieldProperty.class); + assertThat(result.getType()).isEqualTo(FieldType.TIME); + assertThat(result.getCode()).isEqualTo("time"); + assertThat(result.getLabel()).isEqualTo("Time field"); + assertThat(result.getNoLabel()).isTrue(); + assertThat(result.getRequired()).isTrue(); + assertThat(result.getDefaultValue()).isEqualTo(LocalTime.of(5, 0)); + assertThat(result.getDefaultNowValue()).isFalse(); + } + + @Test + public void deserialize_defaultValueEmpty() throws IOException { + URL url = getClass().getResource("TimeFieldPropertyTest_deserialize_defaultValueEmpty.json"); + + TimeFieldProperty result = mapper.readValue(url, TimeFieldProperty.class); + assertThat(result.getType()).isEqualTo(FieldType.TIME); + assertThat(result.getCode()).isEqualTo("time"); + assertThat(result.getLabel()).isEqualTo("Time field"); + assertThat(result.getNoLabel()).isFalse(); + assertThat(result.getRequired()).isFalse(); + assertThat(result.getDefaultValue()).isNull(); + assertThat(result.getDefaultNowValue()).isTrue(); + } +} diff --git a/src/test/resources/com/kintone/client/FieldPropertyDeserializerTest_deserialize_TIME_defaultValueEmpty.json b/src/test/resources/com/kintone/client/FieldPropertyDeserializerTest_deserialize_TIME_defaultValueEmpty.json deleted file mode 100644 index 237ac4c..0000000 --- a/src/test/resources/com/kintone/client/FieldPropertyDeserializerTest_deserialize_TIME_defaultValueEmpty.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "property": { - "type": "TIME", - "code": "time", - "label": "Time field", - "noLabel": false, - "required": false, - "defaultValue": "", - "defaultNowValue": true - } -} diff --git a/src/test/resources/com/kintone/client/model/app/field/TimeFieldPropertyTest_deserialize.json b/src/test/resources/com/kintone/client/model/app/field/TimeFieldPropertyTest_deserialize.json new file mode 100644 index 0000000..f8c35ce --- /dev/null +++ b/src/test/resources/com/kintone/client/model/app/field/TimeFieldPropertyTest_deserialize.json @@ -0,0 +1,9 @@ +{ + "type": "TIME", + "code": "time", + "label": "Time field", + "noLabel": true, + "required": true, + "defaultValue": "05:00:00.000", + "defaultNowValue": false +} diff --git a/src/test/resources/com/kintone/client/model/app/field/TimeFieldPropertyTest_deserialize_defaultValueEmpty.json b/src/test/resources/com/kintone/client/model/app/field/TimeFieldPropertyTest_deserialize_defaultValueEmpty.json new file mode 100644 index 0000000..cbe6447 --- /dev/null +++ b/src/test/resources/com/kintone/client/model/app/field/TimeFieldPropertyTest_deserialize_defaultValueEmpty.json @@ -0,0 +1,9 @@ +{ + "type": "TIME", + "code": "time", + "label": "Time field", + "noLabel": false, + "required": false, + "defaultValue": "", + "defaultNowValue": true +} From feac98e389e674130f2d6e1b33c285a8c12478e7 Mon Sep 17 00:00:00 2001 From: tomohiro-okuyama <58939083+tomohiro-okuyama@users.noreply.github.com> Date: Tue, 2 Jul 2024 18:32:19 +0900 Subject: [PATCH 2/2] chore: add @chikamura to the list of contributors --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dc4828c..6468274 100644 --- a/README.md +++ b/README.md @@ -111,3 +111,4 @@ Cybozu, Inc. ## Contributors - AaronJRubin [@AaronJRubin](https://github.com/AaronJRubin) +- chikamura [@chikamura](https://github.com/chikamura)