From 921bbb422e18f4f23288f8be70478cef54afcb3e Mon Sep 17 00:00:00 2001 From: Marcono1234 Date: Sat, 7 Sep 2024 00:38:46 +0200 Subject: [PATCH] Adjust tests --- gson/src/test/java/com/google/gson/GsonTest.java | 2 +- .../google/gson/internal/ConstructorConstructorTest.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gson/src/test/java/com/google/gson/GsonTest.java b/gson/src/test/java/com/google/gson/GsonTest.java index 30a964b5fe..3d09b2ddae 100644 --- a/gson/src/test/java/com/google/gson/GsonTest.java +++ b/gson/src/test/java/com/google/gson/GsonTest.java @@ -175,7 +175,7 @@ public String toString() { + " but got instance of class java.lang.Integer\n" + "Verify that the adapter was registed for the correct type."); - // Returning boxed object should be allowed (e.g. returning `Integer` for `int`) + // Returning boxed primitive should be allowed (e.g. returning `Integer` for `int`) Gson gson2 = new GsonBuilder().registerTypeAdapter(int.class, new IntegerAdapter()).create(); assertThat(gson2.fromJson("0", int.class)).isEqualTo(3); diff --git a/gson/src/test/java/com/google/gson/internal/ConstructorConstructorTest.java b/gson/src/test/java/com/google/gson/internal/ConstructorConstructorTest.java index f70b063214..03a3704310 100644 --- a/gson/src/test/java/com/google/gson/internal/ConstructorConstructorTest.java +++ b/gson/src/test/java/com/google/gson/internal/ConstructorConstructorTest.java @@ -179,16 +179,12 @@ public void testStringMapCreation() { // But when explicitly requesting a `LinkedHashMap` should use JDK `LinkedHashMap` actual = - constructorConstructor - .get(TypeToken.getParameterized(LinkedHashMap.class, String.class, Integer.class)) - .construct(); + constructorConstructor.get(new TypeToken>() {}).construct(); assertThat(actual).isInstanceOf(LinkedHashMap.class); // For all Map types with non-String key, should use JDK `LinkedHashMap` by default actual = - constructorConstructor - .get(TypeToken.getParameterized(Map.class, Integer.class, Integer.class)) - .construct(); + constructorConstructor.get(new TypeToken>() {}).construct(); assertThat(actual).isInstanceOf(LinkedHashMap.class); }