Test clean up

cowtowncoder · cowtowncoder · commit 9efe621ea903 · 2025-07-17T19:16:27.000-07:00
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/HashCodeTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/HashCodeTest.java
@@ -25,12 +25,12 @@ public void testSerialization() throws Exception
     public void testDeserialization() throws Exception
     {
         // success:
-        HashCode result = MAPPER.readValue(quote("0123456789cAfEbAbE"), HashCode.class);
+        HashCode result = MAPPER.readValue(q("0123456789cAfEbAbE"), HashCode.class);
         assertEquals("0123456789cafebabe", result.toString());
 
         // and ... error:
         try {
-            result = MAPPER.readValue(quote("ghijklmn0123456789"), HashCode.class);
+            result = MAPPER.readValue(q("ghijklmn0123456789"), HashCode.class);
             fail("Should not deserialize from non-hex string: got "+result);
         } catch (MismatchedInputException e) {
             verifyException(e, "Illegal hexadecimal character");
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/HostAndPortTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/HostAndPortTest.java
@@ -27,19 +27,19 @@ public void testDeserializationOk() throws Exception
         // Actually, let's support both old style and new style
 
         // old:
-        HostAndPort result = MAPPER.readValue(aposToQuotes("{'hostText':'localhost','port':9090}"),
+        HostAndPort result = MAPPER.readValue(a2q("{'hostText':'localhost','port':9090}"),
                 HostAndPort.class);
         assertEquals("localhost", result.getHost());
         assertEquals(9090, result.getPort());
 
         // and Alt Old too:
-        result = MAPPER.readValue(aposToQuotes("{'port':8080, 'host':'foobar.com'}"),
+        result = MAPPER.readValue(a2q("{'port':8080, 'host':'foobar.com'}"),
                 HostAndPort.class);
         assertEquals("foobar.com", result.getHost());
         assertEquals(8080, result.getPort());
 
         // and new:
-        result = MAPPER.readValue(quote("localhost:7070"), HostAndPort.class);
+        result = MAPPER.readValue(q("localhost:7070"), HostAndPort.class);
         assertEquals("localhost", result.getHost());
         assertEquals(7070, result.getPort());
 
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/IterablesTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/IterablesTest.java
@@ -47,10 +47,10 @@ public String apply(String x) {
                   }
                 });
         String json = MAPPER.writeValueAsString(input);
-        assertEquals(aposToQuotes("['rm','ob','selgnaj']"), json);
+        assertEquals(a2q("['rm','ob','selgnaj']"), json);
 
         // and then as property?
         json = MAPPER.writeValueAsString(new IterableWrapper(input));
-        assertEquals(aposToQuotes("{'values':['rm','ob','selgnaj']}"), json);
+        assertEquals(a2q("{'values':['rm','ob','selgnaj']}"), json);
     }
 }
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/ModuleTestBase.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/ModuleTestBase.java
@@ -36,14 +36,10 @@ protected JsonMapper.Builder builderWithModule(boolean absentsAsNulls) {
     }
 
     protected String a2q(String json) {
-        return aposToQuotes(json);
-    }
-
-    protected String aposToQuotes(String json) {
         return json.replace("'", "\"");
     }
 
-    public String quote(String str) {
+    public String q(String str) {
         return '"'+str+'"';
     }
 
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/MultimapsTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/MultimapsTest.java
@@ -205,7 +205,7 @@ public void testNullHandling() throws Exception
         Multimap<String,Integer> input = ArrayListMultimap.create();
         input.put("empty", null);
         String json = MAPPER.writeValueAsString(input);
-        assertEquals(aposToQuotes("{'empty':[null]}"), json);
+        assertEquals(a2q("{'empty':[null]}"), json);
     }
 
     // [datatypes-collections#27]:
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/ScalarTypesTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/ScalarTypesTest.java
@@ -16,15 +16,14 @@ public void testInternetDomainNameSerialization() throws Exception
     {
         final String INPUT = "google.com";
         InternetDomainName name = InternetDomainName.from(INPUT);
-        assertEquals(quote(INPUT), MAPPER.writeValueAsString(name));
+        assertEquals(q(INPUT), MAPPER.writeValueAsString(name));
     }
 
     @Test
     public void testInternetDomainNameDeserialization() throws Exception
     {
         final String INPUT = "google.com";
-//        InternetDomainName name = MAPPER.readValue(quote(INPUT), InternetDomainName.class);
-        InternetDomainName name = new ObjectMapper().readValue(quote(INPUT), InternetDomainName.class);
+        InternetDomainName name = MAPPER.readValue(q(INPUT), InternetDomainName.class);
         assertNotNull(name);
         assertEquals(INPUT, name.toString());
     }
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/optional/OptionalBasicTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/optional/OptionalBasicTest.java
@@ -377,7 +377,7 @@ public void testPolymorphic() throws Exception
     @Test
     public void testWithCustomDeserializer() throws Exception
     {
-        CaseChangingStringWrapper w = MAPPER.readValue(aposToQuotes("{'value':'FoobaR'}"),
+        CaseChangingStringWrapper w = MAPPER.readValue(a2q("{'value':'FoobaR'}"),
                 CaseChangingStringWrapper.class);
         assertEquals("foobar", w.value.get());
     }
@@ -387,6 +387,6 @@ public void testCustomSerializer() throws Exception
     {
         final String VALUE = "fooBAR";
         String json = MAPPER.writeValueAsString(new CaseChangingStringWrapper(VALUE));
-        assertEquals(json, aposToQuotes("{'value':'FOOBAR'}"));
+        assertEquals(json, a2q("{'value':'FOOBAR'}"));
     }
 }
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/optional/OptionalMergingTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/optional/OptionalMergingTest.java
@@ -55,22 +55,22 @@ public POJO(int x, int y) {
     @Test
     public void testStringReferenceMerging() throws Exception
     {
-        MergedStringReference result = MAPPER.readValue(aposToQuotes("{'value':'override'}"),
+        MergedStringReference result = MAPPER.readValue(a2q("{'value':'override'}"),
                 MergedStringReference.class);
         assertEquals("override", result.value.get());
     }
 
     @Test
     public void testPOJOReferenceMerging() throws Exception
     {
-        MergedPOJOReference result = MAPPER.readValue(aposToQuotes("{'value':{'y':-6}}"),
+        MergedPOJOReference result = MAPPER.readValue(a2q("{'value':{'y':-6}}"),
                 MergedPOJOReference.class);
         assertEquals(7, result.value.get().x);
         assertEquals(-6, result.value.get().y);
 
         // Also should retain values we pass
         result = MAPPER.readerForUpdating(new MergedPOJOReference(10, 20))
-                .readValue(aposToQuotes("{'value':{'x':11}}"));
+                .readValue(a2q("{'value':{'x':11}}"));
         assertEquals(11, result.value.get().x);
         assertEquals(20, result.value.get().y);
     }
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/optional/OptionalUnwrappedTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/optional/OptionalUnwrappedTest.java
@@ -35,7 +35,7 @@ static class OptionalParent {
     public void testUntypedWithOptionalsNotNulls() throws Exception
     {
         final ObjectMapper mapper = mapperWithModule(false);
-        String jsonExp = aposToQuotes("{'XX.name':'Bob'}");
+        String jsonExp = a2q("{'XX.name':'Bob'}");
         String jsonAct = mapper.writeValueAsString(new OptionalParent());
         assertEquals(jsonExp, jsonAct);
     }
@@ -46,7 +46,7 @@ public void testUntypedWithOptionalsNotNulls() throws Exception
     public void testUntypedWithNullEqOptionals() throws Exception
     {
         final ObjectMapper mapper = mapperWithModule(true);
-        String jsonExp = aposToQuotes("{'XX.name':'Bob'}");
+        String jsonExp = a2q("{'XX.name':'Bob'}");
         String jsonAct = mapper.writeValueAsString(new OptionalParent());
         assertEquals(jsonExp, jsonAct);
     }

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,10 @@ public String apply(String x) {`
`47`	`47`	`}`
`48`	`48`	`});`
`49`	`49`	`String json = MAPPER.writeValueAsString(input);`
`50`		`- assertEquals(aposToQuotes("['rm','ob','selgnaj']"), json);`
	`50`	`+ assertEquals(a2q("['rm','ob','selgnaj']"), json);`
`51`	`51`
`52`	`52`	`// and then as property?`
`53`	`53`	`json = MAPPER.writeValueAsString(new IterableWrapper(input));`
`54`		`- assertEquals(aposToQuotes("{'values':['rm','ob','selgnaj']}"), json);`
	`54`	`+ assertEquals(a2q("{'values':['rm','ob','selgnaj']}"), json);`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,10 @@ protected JsonMapper.Builder builderWithModule(boolean absentsAsNulls) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`protected String a2q(String json) {`
`39`		`- return aposToQuotes(json);`
`40`		`- }`
`41`		`-`
`42`		`- protected String aposToQuotes(String json) {`
`43`	`39`	`return json.replace("'", "\"");`
`44`	`40`	`}`
`45`	`41`
`46`		`- public String quote(String str) {`
	`42`	`+ public String q(String str) {`
`47`	`43`	`return '"'+str+'"';`
`48`	`44`	`}`
`49`	`45`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public void testNullHandling() throws Exception`
`205`	`205`	`Multimap<String,Integer> input = ArrayListMultimap.create();`
`206`	`206`	`input.put("empty", null);`
`207`	`207`	`String json = MAPPER.writeValueAsString(input);`
`208`		`- assertEquals(aposToQuotes("{'empty':[null]}"), json);`
	`208`	`+ assertEquals(a2q("{'empty':[null]}"), json);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`// [datatypes-collections#27]:`
Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,14 @@ public void testInternetDomainNameSerialization() throws Exception`
`16`	`16`	`{`
`17`	`17`	`final String INPUT = "google.com";`
`18`	`18`	`InternetDomainName name = InternetDomainName.from(INPUT);`
`19`		`- assertEquals(quote(INPUT), MAPPER.writeValueAsString(name));`
	`19`	`+ assertEquals(q(INPUT), MAPPER.writeValueAsString(name));`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Test`
`23`	`23`	`public void testInternetDomainNameDeserialization() throws Exception`
`24`	`24`	`{`
`25`	`25`	`final String INPUT = "google.com";`
`26`		`-// InternetDomainName name = MAPPER.readValue(quote(INPUT), InternetDomainName.class);`
`27`		`- InternetDomainName name = new ObjectMapper().readValue(quote(INPUT), InternetDomainName.class);`
	`26`	`+ InternetDomainName name = MAPPER.readValue(q(INPUT), InternetDomainName.class);`
`28`	`27`	`assertNotNull(name);`
`29`	`28`	`assertEquals(INPUT, name.toString());`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ public void testPolymorphic() throws Exception`
`377`	`377`	`@Test`
`378`	`378`	`public void testWithCustomDeserializer() throws Exception`
`379`	`379`	`{`
`380`		`- CaseChangingStringWrapper w = MAPPER.readValue(aposToQuotes("{'value':'FoobaR'}"),`
	`380`	`+ CaseChangingStringWrapper w = MAPPER.readValue(a2q("{'value':'FoobaR'}"),`
`381`	`381`	`CaseChangingStringWrapper.class);`
`382`	`382`	`assertEquals("foobar", w.value.get());`
`383`	`383`	`}`
`@@ -387,6 +387,6 @@ public void testCustomSerializer() throws Exception`
`387`	`387`	`{`
`388`	`388`	`final String VALUE = "fooBAR";`
`389`	`389`	`String json = MAPPER.writeValueAsString(new CaseChangingStringWrapper(VALUE));`
`390`		`- assertEquals(json, aposToQuotes("{'value':'FOOBAR'}"));`
	`390`	`+ assertEquals(json, a2q("{'value':'FOOBAR'}"));`
`391`	`391`	`}`
`392`	`392`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,22 +55,22 @@ public POJO(int x, int y) {`
`55`	`55`	`@Test`
`56`	`56`	`public void testStringReferenceMerging() throws Exception`
`57`	`57`	`{`
`58`		`- MergedStringReference result = MAPPER.readValue(aposToQuotes("{'value':'override'}"),`
	`58`	`+ MergedStringReference result = MAPPER.readValue(a2q("{'value':'override'}"),`
`59`	`59`	`MergedStringReference.class);`
`60`	`60`	`assertEquals("override", result.value.get());`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Test`
`64`	`64`	`public void testPOJOReferenceMerging() throws Exception`
`65`	`65`	`{`
`66`		`- MergedPOJOReference result = MAPPER.readValue(aposToQuotes("{'value':{'y':-6}}"),`
	`66`	`+ MergedPOJOReference result = MAPPER.readValue(a2q("{'value':{'y':-6}}"),`
`67`	`67`	`MergedPOJOReference.class);`
`68`	`68`	`assertEquals(7, result.value.get().x);`
`69`	`69`	`assertEquals(-6, result.value.get().y);`
`70`	`70`
`71`	`71`	`// Also should retain values we pass`
`72`	`72`	`result = MAPPER.readerForUpdating(new MergedPOJOReference(10, 20))`
`73`		`- .readValue(aposToQuotes("{'value':{'x':11}}"));`
	`73`	`+ .readValue(a2q("{'value':{'x':11}}"));`
`74`	`74`	`assertEquals(11, result.value.get().x);`
`75`	`75`	`assertEquals(20, result.value.get().y);`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static class OptionalParent {`
`35`	`35`	`public void testUntypedWithOptionalsNotNulls() throws Exception`
`36`	`36`	`{`
`37`	`37`	`final ObjectMapper mapper = mapperWithModule(false);`
`38`		`- String jsonExp = aposToQuotes("{'XX.name':'Bob'}");`
	`38`	`+ String jsonExp = a2q("{'XX.name':'Bob'}");`
`39`	`39`	`String jsonAct = mapper.writeValueAsString(new OptionalParent());`
`40`	`40`	`assertEquals(jsonExp, jsonAct);`
`41`	`41`	`}`
`@@ -46,7 +46,7 @@ public void testUntypedWithOptionalsNotNulls() throws Exception`
`46`	`46`	`public void testUntypedWithNullEqOptionals() throws Exception`
`47`	`47`	`{`
`48`	`48`	`final ObjectMapper mapper = mapperWithModule(true);`
`49`		`- String jsonExp = aposToQuotes("{'XX.name':'Bob'}");`
	`49`	`+ String jsonExp = a2q("{'XX.name':'Bob'}");`
`50`	`50`	`String jsonAct = mapper.writeValueAsString(new OptionalParent());`
`51`	`51`	`assertEquals(jsonExp, jsonAct);`
`52`	`52`	`}`