Merge branch '2.19'

Author: cowtowncoder

pom.xml

@@ -92,8 +92,8 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- 11-Jan-2025, joohyukkim: JSTEP-10, part 1, migrate to JUnit5 -->
-    <!--
+
+    <!-- 11-Jan-2025, joohyukkim: For JSTEP-10, migrate to JUnit5 -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
@@ -104,12 +104,6 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    -->
 
     <!--  Jakarta XMLBind (nee javax/jaxb( annotation introspector is needed BUT ONLY
           for tests (starting 2.13: previously compile/runtime)

src/test/java/module-info.java

@@ -12,8 +12,8 @@
 
     // Then test dependencies
     requires junit;
-    //requires org.junit.jupiter.api;
-    //requires org.junit.jupiter.params;
+    requires org.junit.jupiter.api;
+    requires org.junit.jupiter.params;
 
     requires com.ctc.wstx; // woodstox
     requires jakarta.xml.bind; // Jakarta-binding

src/test/java/tools/jackson/dataformat/xml/testutil/failure/JacksonTestFailureExpected.java

@@ -0,0 +1,38 @@
+package tools.jackson.dataformat.xml.testutil.failure;
+
+import java.lang.annotation.*;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * <p>
+ * Annotation used to indicate that a JUnit-5 based tests method is expected to fail.
+ *
+ * <p>
+ * When a test method is annotated with {@code @JacksonTestFailureExpected}, the
+ * {@link JacksonTestFailureExpectedInterceptor} will intercept the test execution.
+ * If the test passes, which is an unexpected behavior, the interceptor will throw an exception to fail the test,
+ * indicating that the test was expected to fail but didn't.
+ * </p>
+ *
+ * <h3>Usage Example:</h3>
+ *
+ * <pre><code>
+ *
+ *     &#64;Test
+ *     &#64;JacksonTestFailureExpected
+ *     @Test
+    public void testFeatureNotYetImplemented() {
+ *         // Test code that is expected to fail
+ *     }
+ * }
+ * </code></pre>
+ *
+ * <p>
+ *
+ * @since 2.19
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(JacksonTestFailureExpectedInterceptor.class)
+public @interface JacksonTestFailureExpected { }

src/test/java/tools/jackson/dataformat/xml/testutil/failure/JacksonTestFailureExpectedInterceptor.java

@@ -0,0 +1,43 @@
+package tools.jackson.dataformat.xml.testutil.failure;
+
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.extension.*;
+
+/**
+ * Custom {@link InvocationInterceptor} that intercepts test method invocation.
+ * To pass the test ***only if*** test fails with an exception, and fail the test otherwise.
+ *
+ * @since 2.19
+ */
+public class JacksonTestFailureExpectedInterceptor
+    implements InvocationInterceptor
+{
+    @Override
+    public void interceptTestMethod(Invocation<Void> invocation,
+            ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext)
+        throws Throwable
+    {
+        try {
+            invocation.proceed();
+        } catch (Throwable t) {
+            // do-nothing, we do expect an exception
+            return;
+        }
+        handleUnexpectePassingTest(invocationContext);
+    }
+
+    private void handleUnexpectePassingTest(ReflectiveInvocationContext<Method> invocationContext) {
+        // Collect information we need
+        Object targetClass = invocationContext.getTargetClass();
+        Object testMethod = invocationContext.getExecutable().getName();
+        //List<Object> arguments = invocationContext.getArguments();
+
+        // Create message
+        String message = String.format("Test method %s.%s() passed, but should have failed", targetClass, testMethod);
+
+        // throw exception
+        throw new JacksonTestShouldFailException(message);
+    }
+
+}

src/test/java/tools/jackson/dataformat/xml/testutil/failure/JacksonTestShouldFailException.java

@@ -0,0 +1,18 @@
+package tools.jackson.dataformat.xml.testutil.failure;
+
+/**
+ * Exception used to alert that a test is passing, but should be failing.
+ *
+ * WARNING : This only for test code, and should never be thrown from production code.
+ *
+ * @since 2.19
+ */
+public class JacksonTestShouldFailException
+    extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+
+    public JacksonTestShouldFailException(String msg) {
+        super(msg);
+    }
+}