Improved tests.

donbeave · donbeave · commit 30e4a809f1e9 · 2022-12-02T15:54:18.000+08:00
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/CoercingUtil.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/CoercingUtil.java
@@ -0,0 +1,15 @@
+package com.tailrocks.graphql.datetime;
+
+import graphql.Internal;
+
+@Internal
+final class CoercingUtil {
+
+    private CoercingUtil() {
+    }
+
+    static String typeName(Object input) {
+        return input == null ? "null" : input.getClass().getSimpleName();
+    }
+
+}
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/DateScalar.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/DateScalar.java
@@ -30,7 +30,7 @@ private DateScalar() {
     public static GraphQLScalarType create(String name) {
         return GraphQLScalarType.newScalar()
                 .name(name != null ? name : "Date")
-                .description("Date type")
+                .description("A Java Date type")
                 .coercing(new GraphqlDateCoercing())
                 .build();
     }
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/DateTimeHelper.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/DateTimeHelper.java
@@ -15,6 +15,8 @@
  */
 package com.tailrocks.graphql.datetime;
 
+import graphql.Internal;
+
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneOffset;
@@ -27,6 +29,7 @@
 /**
  * @author Alexey Zhokhov
  */
+@Internal
 final class DateTimeHelper {
 
     private DateTimeHelper() {
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/DurationScalar.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/DurationScalar.java
@@ -30,7 +30,7 @@ private DurationScalar() {
     public static GraphQLScalarType create(String name) {
         return GraphQLScalarType.newScalar()
                 .name(name != null ? name : "Duration")
-                .description("A Java 8 ISO 8601 Duration")
+                .description("A Java Duration type")
                 .coercing(new GraphqlDurationCoercing())
                 .build();
     }
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlDateCoercing.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlDateCoercing.java
@@ -58,22 +58,22 @@ private void initBasicFormatters() {
     }
 
     private Date convertImpl(Object input) {
-        if (input instanceof String) {
-            LocalDateTime localDateTime = parseDate((String) input);
+        if (input instanceof String string) {
+            LocalDateTime localDateTime = parseDate(string);
 
             if (localDateTime != null) {
                 return DateTimeHelper.toDate(localDateTime);
             }
-        } else if (input instanceof Date) {
-            return (Date) input;
+        } else if (input instanceof Date date) {
+            return date;
         }
         return null;
     }
 
     @Override
     public String serialize(Object input) {
-        if (input instanceof Date) {
-            return DateTimeHelper.toISOString((Date) input);
+        if (input instanceof Date date) {
+            return DateTimeHelper.toISOString(date);
         } else {
             Date result = convertImpl(input);
             if (result == null) {
@@ -94,6 +94,10 @@ public Date parseValue(Object input) {
 
     @Override
     public Date parseLiteral(Object input) {
+        if (!(input instanceof StringValue)) {
+            throw new CoercingParseLiteralException("Expected AST type 'StringValue' but was '" + CoercingUtil.typeName(input) + "'.");
+        }
+
         String value = ((StringValue) input).getValue();
         Date result = convertImpl(value);
         if (result == null) {
@@ -123,4 +127,8 @@ private LocalDateTime parseDate(String date) {
         return null;
     }
 
+    private String getErrorMessage(Object input) {
+        return "Invalid value '" + input + "' for Date";
+    }
+
 }
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlDurationCoercing.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlDurationCoercing.java
@@ -72,6 +72,10 @@ public Duration parseValue(Object input) {
 
     @Override
     public Duration parseLiteral(Object input) {
+        if (!(input instanceof StringValue)) {
+            throw new CoercingParseLiteralException("Expected AST type 'StringValue' but was '" + CoercingUtil.typeName(input) + "'.");
+        }
+
         String value = ((StringValue) input).getValue();
         Duration result = convertImpl(value);
         if (result == null) {
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlLocalDateCoercing.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlLocalDateCoercing.java
@@ -77,6 +77,10 @@ public LocalDate parseValue(Object input) {
 
     @Override
     public LocalDate parseLiteral(Object input) {
+        if (!(input instanceof StringValue)) {
+            throw new CoercingParseLiteralException("Expected AST type 'StringValue' but was '" + CoercingUtil.typeName(input) + "'.");
+        }
+
         String value = ((StringValue) input).getValue();
         LocalDate result = convertImpl(value);
         if (result == null) {
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlLocalDateTimeCoercing.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlLocalDateTimeCoercing.java
@@ -76,6 +76,10 @@ public LocalDateTime parseValue(Object input) {
 
     @Override
     public LocalDateTime parseLiteral(Object input) {
+        if (!(input instanceof StringValue)) {
+            throw new CoercingParseLiteralException("Expected AST type 'StringValue' but was '" + CoercingUtil.typeName(input) + "'.");
+        }
+
         String value = ((StringValue) input).getValue();
         LocalDateTime result = convertImpl(value);
         if (result == null) {
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlLocalTimeCoercing.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlLocalTimeCoercing.java
@@ -72,6 +72,10 @@ public LocalTime parseValue(Object input) {
 
     @Override
     public LocalTime parseLiteral(Object input) {
+        if (!(input instanceof StringValue)) {
+            throw new CoercingParseLiteralException("Expected AST type 'StringValue' but was '" + CoercingUtil.typeName(input) + "'.");
+        }
+
         String value = ((StringValue) input).getValue();
         LocalTime result = convertImpl(value);
         if (result == null) {
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlOffsetDateTimeCoercing.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlOffsetDateTimeCoercing.java
@@ -69,6 +69,10 @@ public OffsetDateTime parseValue(Object input) {
 
     @Override
     public OffsetDateTime parseLiteral(Object input) {
+        if (!(input instanceof StringValue)) {
+            throw new CoercingParseLiteralException("Expected AST type 'StringValue' but was '" + CoercingUtil.typeName(input) + "'.");
+        }
+
         String value = ((StringValue) input).getValue();
         OffsetDateTime result = convertImpl(value);
         if (result == null) {
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlYearMonthCoercing.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/GraphqlYearMonthCoercing.java
@@ -45,8 +45,8 @@ private YearMonth convertImpl(Object input) {
                     // nothing to-do
                 }
             }
-        } else if (input instanceof YearMonth) {
-            return (YearMonth) input;
+        } else if (input instanceof YearMonth yearMonth) {
+            return yearMonth;
         }
         return null;
     }
@@ -58,9 +58,7 @@ public String serialize(Object input) {
         } else {
             YearMonth result = convertImpl(input);
             if (result == null) {
-                throw new CoercingSerializeException(
-                        "Invalid value '" + input + "' is not a valid YearMonth, please use format yyyy-MM"
-                );
+                throw new CoercingSerializeException(getErrorMessage(input));
             }
             return result.toString();
         }
@@ -70,24 +68,28 @@ public String serialize(Object input) {
     public YearMonth parseValue(Object input) {
         YearMonth result = convertImpl(input);
         if (result == null) {
-            throw new CoercingParseValueException(
-                    "Invalid value '" + input + "' is not a valid YearMonth, please use format yyyy-MM"
-            );
+            throw new CoercingParseValueException(getErrorMessage(input));
         }
         return result;
     }
 
     @Override
     public YearMonth parseLiteral(Object input) {
+        if (!(input instanceof StringValue)) {
+            throw new CoercingParseLiteralException("Expected AST type 'StringValue' but was '" + CoercingUtil.typeName(input) + "'.");
+        }
+
         String value = ((StringValue) input).getValue();
         YearMonth result = convertImpl(value);
         if (result == null) {
-            throw new CoercingParseLiteralException(
-                    "Invalid value '" + input + "' is not a valid YearMonth, please use format yyyy-MM"
-            );
+            throw new CoercingParseLiteralException(getErrorMessage(input));
         }
 
         return result;
     }
 
+    private String getErrorMessage(Object input) {
+        return "Invalid value '" + input + "' is not a valid YearMonth, please use format yyyy-MM";
+    }
+
 }
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/LocalDateScalar.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/LocalDateScalar.java
@@ -32,7 +32,7 @@ private LocalDateScalar() {
     public static GraphQLScalarType create(String name, boolean zoneConversionEnabled, DateTimeFormatter formatter) {
         return GraphQLScalarType.newScalar()
                 .name(name != null ? name : "LocalDate")
-                .description("Local Date type")
+                .description("A Java LocalDate type")
                 .coercing(
                         new GraphqlLocalDateCoercing(
                                 zoneConversionEnabled,
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/LocalDateTimeConverter.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/LocalDateTimeConverter.java
@@ -15,6 +15,8 @@
  */
 package com.tailrocks.graphql.datetime;
 
+import graphql.Internal;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -28,6 +30,7 @@
 /**
  * @author Alexey Zhokhov
  */
+@Internal
 class LocalDateTimeConverter {
 
     private final boolean zoneConversionEnabled;
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/LocalDateTimeScalar.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/LocalDateTimeScalar.java
@@ -32,7 +32,7 @@ private LocalDateTimeScalar() {
     public static GraphQLScalarType create(String name, boolean zoneConversionEnabled, DateTimeFormatter formatter) {
         return GraphQLScalarType.newScalar()
                 .name(name != null ? name : "LocalDateTime")
-                .description("Local Date Time type")
+                .description("A Java LocalDateTime type")
                 .coercing(
                         new GraphqlLocalDateTimeCoercing(
                                 zoneConversionEnabled,
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/LocalTimeScalar.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/LocalTimeScalar.java
@@ -30,7 +30,7 @@ private LocalTimeScalar() {
     public static GraphQLScalarType create(String name) {
         return GraphQLScalarType.newScalar()
                 .name(name != null ? name : "LocalTime")
-                .description("Local Time type")
+                .description("A Java LocalTime type")
                 .coercing(new GraphqlLocalTimeCoercing())
                 .build();
     }
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/OffsetDateTimeScalar.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/OffsetDateTimeScalar.java
@@ -30,7 +30,7 @@ private OffsetDateTimeScalar() {
     public static GraphQLScalarType create(String name) {
         return GraphQLScalarType.newScalar()
                 .name(name != null ? name : "OffsetDateTime")
-                .description("A Java OffsetDateTime")
+                .description("A Java OffsetDateTime type")
                 .coercing(new GraphqlOffsetDateTimeCoercing())
                 .build();
     }
diff --git a/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/YearMonthScalar.java b/graphql-java-datetime/src/main/java/com/tailrocks/graphql/datetime/YearMonthScalar.java
@@ -30,7 +30,7 @@ private YearMonthScalar() {
     public static GraphQLScalarType create(String name) {
         return GraphQLScalarType.newScalar()
                 .name(name != null ? name : "YearMonth")
-                .description("YearMonth type")
+                .description("A Java YearMonth type")
                 .coercing(new GraphqlYearMonthCoercing())
                 .build();
     }
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLDateTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLDateTest.kt
@@ -42,7 +42,7 @@ class GraphQLDateTest : FreeSpec({
             StringValue("2017-07-09")
                     to createDate(2017, 7, 9)
         ).forEach { (literal, result) ->
-            "parse literal ${literal.value} as $result" {
+            "parse literal $literal as $result (${result::class.java})" {
                 GraphqlDateCoercing().parseLiteral(literal) shouldBe result
             }
         }
@@ -51,9 +51,10 @@ class GraphQLDateTest : FreeSpec({
     "parseLiteral -> fail" - {
         listOf(
             StringValue(""),
-            StringValue("not a date")
+            StringValue("not a date"),
+            Object(),
         ).forEach { literal ->
-            "throws exception for input: $literal" {
+            "throws exception for the input: $literal" {
                 shouldThrow<CoercingParseLiteralException> {
                     GraphqlDateCoercing().parseLiteral(literal)
                 }
@@ -71,7 +72,7 @@ class GraphQLDateTest : FreeSpec({
                     to "2017-07-09T11:54:42Z",
             createDate(2017, 7, 9) to "2017-07-09T00:00:00Z"
         ).forEach { (value, result) ->
-            "serialize $value into $result (${result::class})" {
+            "serialize $value (${value::class}) into $result" {
                 GraphqlDateCoercing().serialize(value) shouldBe result
             }
         }
@@ -83,7 +84,7 @@ class GraphQLDateTest : FreeSpec({
             "not a date",
             Object()
         ).forEach { value ->
-            "serialize throws exception for invalid input: $value" {
+            "throws exception for the input: $value" {
                 shouldThrow<CoercingSerializeException> {
                     GraphqlDateCoercing().serialize(value)
                 }
@@ -102,7 +103,7 @@ class GraphQLDateTest : FreeSpec({
             "2017-07-09"
                     to createDate(2017, 7, 9)
         ).forEach { (value, result) ->
-            "parse $value into $result ($result.class)" {
+            "parse $value into $result (${result::class.java})" {
                 GraphqlDateCoercing().parseValue(value) shouldBe result
             }
         }
@@ -114,7 +115,7 @@ class GraphQLDateTest : FreeSpec({
             "not a date",
             Object()
         ).forEach { value ->
-            "throws exception for invalid input: $value" {
+            "throws exception for the input: $value" {
                 shouldThrow<CoercingParseValueException> {
                     GraphqlDateCoercing().parseValue(value)
                 }
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLDurationTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLDurationTest.kt
@@ -21,11 +21,8 @@ import graphql.schema.CoercingParseValueException
 import graphql.schema.CoercingSerializeException
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.FreeSpec
-import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
-
 import java.time.Duration
-
 import java.time.ZoneOffset.UTC
 import java.util.*
 
@@ -41,7 +38,7 @@ class GraphQLDurationTest : FreeSpec({
             StringValue("PT1H30M") to Duration.ofMinutes(90),
             StringValue("P1DT3H") to Duration.ofHours(27)
         ).forEach { (literal, result) ->
-            "parse literal ${literal.value} as $result" {
+            "parse literal $literal as $result (${result::class.java})" {
                 GraphqlDurationCoercing().parseLiteral(literal) shouldBe result
             }
         }
@@ -50,9 +47,10 @@ class GraphQLDurationTest : FreeSpec({
     "parseLiteral -> fail" - {
         listOf(
             StringValue(""),
-            StringValue("not a duration")
+            StringValue("not a duration"),
+            Object(),
         ).forEach { literal ->
-            "throws exception for invalid $literal" {
+            "throws exception for the input: $literal" {
                 shouldThrow<CoercingParseLiteralException> {
                     GraphqlDurationCoercing().parseLiteral(literal)
                 }
@@ -64,7 +62,7 @@ class GraphQLDurationTest : FreeSpec({
         listOf(
             Duration.ofHours(27) to "PT27H"
         ).forEach { (value, result) ->
-            "serialize $value into $result (${result::class.java})" {
+            "serialize $value (${value::class}) into $result" {
                 GraphqlDurationCoercing().serialize(value) shouldBe result
             }
         }
@@ -77,7 +75,7 @@ class GraphQLDurationTest : FreeSpec({
             "1DT3H",
             Object()
         ).forEach { value ->
-            "throws exception for invalid input: $value" {
+            "throws exception for the input: $value" {
                 shouldThrow<CoercingSerializeException> {
                     GraphqlDurationCoercing().serialize(value)
                 }
@@ -103,7 +101,7 @@ class GraphQLDurationTest : FreeSpec({
             "1DT3H",
             Object()
         ).forEach { value ->
-            "throws exception for invalid input: $value" {
+            "throws exception for the input: $value" {
                 shouldThrow<CoercingParseValueException> {
                     GraphqlDurationCoercing().parseValue(value)
                 }
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalDateTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalDateTest.kt
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalDateTimeTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalDateTimeTest.kt
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalTimeTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalTimeTest.kt
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLYearMonthTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLYearMonthTest.kt
diff --git a/samples/spring-boot-webmvc/src/test/kotlin/sample/spring/boot/webmvc/SpringBootWebMvcSampleApplicationTests.kt b/samples/spring-boot-webmvc/src/test/kotlin/sample/spring/boot/webmvc/SpringBootWebMvcSampleApplicationTests.kt

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ private DateScalar() {`
`30`	`30`	`public static GraphQLScalarType create(String name) {`
`31`	`31`	`return GraphQLScalarType.newScalar()`
`32`	`32`	`.name(name != null ? name : "Date")`
`33`		`- .description("Date type")`
	`33`	`+ .description("A Java Date type")`
`34`	`34`	`.coercing(new GraphqlDateCoercing())`
`35`	`35`	`.build();`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ private DurationScalar() {`
`30`	`30`	`public static GraphQLScalarType create(String name) {`
`31`	`31`	`return GraphQLScalarType.newScalar()`
`32`	`32`	`.name(name != null ? name : "Duration")`
`33`		`- .description("A Java 8 ISO 8601 Duration")`
	`33`	`+ .description("A Java Duration type")`
`34`	`34`	`.coercing(new GraphqlDurationCoercing())`
`35`	`35`	`.build();`
`36`	`36`	`}`