Fix some missed failing->tofix cases

cowtowncoder · cowtowncoder · commit 132f2e7675c4 · 2025-01-14T19:48:39.000-08:00
diff --git a/pom.xml b/pom.xml
@@ -110,16 +110,6 @@
             </execution>
           </executions>
         </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>tools/jackson/**/failing/*.java</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
 
diff --git a/yaml/pom.xml b/yaml/pom.xml
@@ -32,7 +32,11 @@
   </properties>
 
   <dependencies>
-    <!-- Extends Jackson core, databind (optional); uses SnakeYAML for parsing, generation -->
+    <!-- Extends Jackson core, databind; uses SnakeYAML for parsing, generation -->
+    <dependency>
+      <groupId>tools.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/StreamingParse146Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/StreamingParse146Test.java
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/IntegerWithUnderscoresReadTest.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/IntegerWithUnderscoresReadTest.java
@@ -1,7 +1,10 @@
-package tools.jackson.dataformat.yaml.failing;
+package tools.jackson.dataformat.yaml.tofix;
+
+import org.junit.jupiter.api.Test;
 
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.dataformat.yaml.ModuleTestBase;
+import tools.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -22,10 +25,13 @@ public void setV(Integer v)
         }
     }
 
+    private final ObjectMapper MAPPER = newObjectMapper();
+
+    @JacksonTestFailureExpected
+    @Test
     public void testJsonIntegerWithUnderscores() throws Exception
     {
-        ObjectMapper mapper = new ObjectMapper();
-        IntegerHolder integerHolder = mapper.readValue("{\"v\": \"1_000_000\"}", IntegerHolder.class);
+        IntegerHolder integerHolder = MAPPER.readValue("{\"v\": \"1_000_000\"}", IntegerHolder.class);
         assertNotNull(integerHolder);
         assertEquals(Integer.valueOf(1000000), integerHolder.getV());
     }
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/LongWithUnderscoresReadTest.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/LongWithUnderscoresReadTest.java
@@ -1,8 +1,11 @@
-package tools.jackson.dataformat.yaml.failing;
+package tools.jackson.dataformat.yaml.tofix;
+
+import org.junit.jupiter.api.Test;
 
 import tools.jackson.databind.ObjectMapper;
+
 import tools.jackson.dataformat.yaml.ModuleTestBase;
-import tools.jackson.dataformat.yaml.YAMLFactory;
+import tools.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -24,19 +27,23 @@ public void setV(Long v)
         }
     }
 
+    private final ObjectMapper MAPPER = newObjectMapper();
+
+    @JacksonTestFailureExpected
+    @Test
     public void testYamlLongWithUnderscores() throws Exception
     {
-        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-        LongHolder longHolder = mapper.readValue("v: 1_000_000", LongHolder.class);
+        LongHolder longHolder = MAPPER.readValue("v: 1_000_000", LongHolder.class);
         assertNotNull(longHolder);
         assertEquals(LongHolder.class, longHolder.getClass());
         assertEquals(Long.valueOf(1000000), longHolder.getV());
     }
 
+    @JacksonTestFailureExpected
+    @Test
     public void testJsonLongWithUnderscores() throws Exception
     {
-        ObjectMapper mapper = new ObjectMapper();
-        LongHolder longHolder = mapper.readValue("{\"v\": \"1_000_000\"}", LongHolder.class);
+        LongHolder longHolder = MAPPER.readValue("{\"v\": \"1_000_000\"}", LongHolder.class);
         assertNotNull(longHolder);
         assertEquals(Long.valueOf(1000000), longHolder.getV());
     }
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/NumberAltIntRead71Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/NumberAltIntRead71Test.java
@@ -1,11 +1,12 @@
-package tools.jackson.dataformat.yaml.failing;
+package tools.jackson.dataformat.yaml.tofix;
 
 import java.math.BigInteger;
 
 import org.junit.jupiter.api.Test;
 
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.dataformat.yaml.ModuleTestBase;
+import tools.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -32,6 +33,7 @@ static class BigHolder {
     private final ObjectMapper MAPPER = newObjectMapper();
     
     // [dataformats-text#71]
+    @JacksonTestFailureExpected
     @Test
     public void testDeserHexInt71() throws Exception
     {
@@ -46,6 +48,7 @@ public void testDeserHexInt71() throws Exception
         _verifyNumber(new BigInteger("-11112222333344445555ACDC", 16), "-0x11112222333344445555acdc");
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testDeserHexUnderscores() throws Exception
     {
@@ -57,6 +60,7 @@ public void testDeserHexUnderscores() throws Exception
         _verifyNumber(-Long.parseLong("12345678c0", 16), "-0x12_3456_78c0");
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testDeserOctal() throws Exception
     {
@@ -71,6 +75,7 @@ public void testDeserOctal() throws Exception
         _verifyNumber(new BigInteger("-123456771234567712345677", 8), "-0123456771234567712345677");
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testDeserOctalUnderscores() throws Exception
     {
@@ -82,6 +87,7 @@ public void testDeserOctalUnderscores() throws Exception
         _verifyNumber(-Long.parseLong("1234567712345677", 8), "-01_234_567_712_345_677");
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testDeserBinary() throws Exception
     {
@@ -90,6 +96,7 @@ public void testDeserBinary() throws Exception
         _verifyNumber(-Integer.parseInt("1010", 2), "-0b1010");
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testDeserBinaryUnderscores() throws Exception
     {
@@ -102,6 +109,7 @@ public void testDeserBinaryUnderscores() throws Exception
     //    least not yet, due to likely backwards-compatibility issues
     //    with IP numbers
     /*
+    @JacksonTestFailureExpected
     @Test
     public void testDeserBase60() throws Exception
     {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`		`-package tools.jackson.dataformat.yaml.failing;`
	`1`	`+package tools.jackson.dataformat.yaml.tofix;`
	`2`	`+`
	`3`	`+import org.junit.jupiter.api.Test;`
`2`	`4`
`3`	`5`	`import tools.jackson.databind.ObjectMapper;`
`4`	`6`	`import tools.jackson.dataformat.yaml.ModuleTestBase;`
	`7`	`+import tools.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;`
`5`	`8`
`6`	`9`	`import static org.junit.jupiter.api.Assertions.*;`
`7`	`10`
`@@ -22,10 +25,13 @@ public void setV(Integer v)`
`22`	`25`	`}`
`23`	`26`	`}`
`24`	`27`
	`28`	`+ private final ObjectMapper MAPPER = newObjectMapper();`
	`29`	`+`
	`30`	`+ @JacksonTestFailureExpected`
	`31`	`+ @Test`
`25`	`32`	`public void testJsonIntegerWithUnderscores() throws Exception`
`26`	`33`	`{`
`27`		`- ObjectMapper mapper = new ObjectMapper();`
`28`		`- IntegerHolder integerHolder = mapper.readValue("{\"v\": \"1_000_000\"}", IntegerHolder.class);`
	`34`	`+ IntegerHolder integerHolder = MAPPER.readValue("{\"v\": \"1_000_000\"}", IntegerHolder.class);`
`29`	`35`	`assertNotNull(integerHolder);`
`30`	`36`	`assertEquals(Integer.valueOf(1000000), integerHolder.getV());`
`31`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`		`-package tools.jackson.dataformat.yaml.failing;`
	`1`	`+package tools.jackson.dataformat.yaml.tofix;`
`2`	`2`
`3`	`3`	`import java.math.BigInteger;`
`4`	`4`
`5`	`5`	`import org.junit.jupiter.api.Test;`
`6`	`6`
`7`	`7`	`import tools.jackson.databind.ObjectMapper;`
`8`	`8`	`import tools.jackson.dataformat.yaml.ModuleTestBase;`
	`9`	`+import tools.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;`
`9`	`10`
`10`	`11`	`import static org.junit.jupiter.api.Assertions.assertEquals;`
`11`	`12`
`@@ -32,6 +33,7 @@ static class BigHolder {`
`32`	`33`	`private final ObjectMapper MAPPER = newObjectMapper();`
`33`	`34`
`34`	`35`	`// [dataformats-text#71]`
	`36`	`+ @JacksonTestFailureExpected`
`35`	`37`	`@Test`
`36`	`38`	`public void testDeserHexInt71() throws Exception`
`37`	`39`	`{`
`@@ -46,6 +48,7 @@ public void testDeserHexInt71() throws Exception`
`46`	`48`	`_verifyNumber(new BigInteger("-11112222333344445555ACDC", 16), "-0x11112222333344445555acdc");`
`47`	`49`	`}`
`48`	`50`
	`51`	`+ @JacksonTestFailureExpected`
`49`	`52`	`@Test`
`50`	`53`	`public void testDeserHexUnderscores() throws Exception`
`51`	`54`	`{`
`@@ -57,6 +60,7 @@ public void testDeserHexUnderscores() throws Exception`
`57`	`60`	`_verifyNumber(-Long.parseLong("12345678c0", 16), "-0x12_3456_78c0");`
`58`	`61`	`}`
`59`	`62`
	`63`	`+ @JacksonTestFailureExpected`
`60`	`64`	`@Test`
`61`	`65`	`public void testDeserOctal() throws Exception`
`62`	`66`	`{`
`@@ -71,6 +75,7 @@ public void testDeserOctal() throws Exception`
`71`	`75`	`_verifyNumber(new BigInteger("-123456771234567712345677", 8), "-0123456771234567712345677");`
`72`	`76`	`}`
`73`	`77`
	`78`	`+ @JacksonTestFailureExpected`
`74`	`79`	`@Test`
`75`	`80`	`public void testDeserOctalUnderscores() throws Exception`
`76`	`81`	`{`
`@@ -82,6 +87,7 @@ public void testDeserOctalUnderscores() throws Exception`
`82`	`87`	`_verifyNumber(-Long.parseLong("1234567712345677", 8), "-01_234_567_712_345_677");`
`83`	`88`	`}`
`84`	`89`
	`90`	`+ @JacksonTestFailureExpected`
`85`	`91`	`@Test`
`86`	`92`	`public void testDeserBinary() throws Exception`
`87`	`93`	`{`
`@@ -90,6 +96,7 @@ public void testDeserBinary() throws Exception`
`90`	`96`	`_verifyNumber(-Integer.parseInt("1010", 2), "-0b1010");`
`91`	`97`	`}`
`92`	`98`
	`99`	`+ @JacksonTestFailureExpected`
`93`	`100`	`@Test`
`94`	`101`	`public void testDeserBinaryUnderscores() throws Exception`
`95`	`102`	`{`
`@@ -102,6 +109,7 @@ public void testDeserBinaryUnderscores() throws Exception`
`102`	`109`	`// least not yet, due to likely backwards-compatibility issues`
`103`	`110`	`// with IP numbers`
`104`	`111`	`/*`
	`112`	`+ @JacksonTestFailureExpected`
`105`	`113`	`@Test`
`106`	`114`	`public void testDeserBase60() throws Exception`
`107`	`115`	`{`