FrankChen021 commented on code in PR #19980: URL: https://github.com/apache/druid/pull/19980#discussion_r3766626191
########## processing/src/test/java/org/apache/druid/testing/JupiterAssertions.java: ########## @@ -0,0 +1,387 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.testing; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.InvocationInterceptor; +import org.junit.jupiter.api.extension.ReflectiveInvocationContext; +import org.junit.jupiter.api.function.Executable; + +import java.lang.reflect.Method; + +/** + * JUnit 5 assertion overloads that retain the JUnit 4 message-first call shape used by migrated tests. + */ +public class JupiterAssertions +{ + private JupiterAssertions() + { + } + + public static void assertTrue(final String message, final boolean condition) + { + org.junit.jupiter.api.Assertions.assertTrue(condition, message); + } + + public static void assertTrue(final boolean condition) + { + org.junit.jupiter.api.Assertions.assertTrue(condition); + } + + public static void assertFalse(final String message, final boolean condition) + { + org.junit.jupiter.api.Assertions.assertFalse(condition, message); + } + + public static void assertFalse(final boolean condition) + { + org.junit.jupiter.api.Assertions.assertFalse(condition); + } + + public static void fail(final String message) + { + org.junit.jupiter.api.Assertions.fail(message); + } + + public static void fail() + { + org.junit.jupiter.api.Assertions.fail(); + } + + public static void assertEquals(final String message, final Object expected, final Object actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + } + + public static void assertEquals(final Object expected, final Object actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + } + + public static void assertNotEquals(final String message, final Object unexpected, final Object actual) + { + org.junit.jupiter.api.Assertions.assertNotEquals(unexpected, actual, message); + } + + public static void assertNotEquals(final Object unexpected, final Object actual) + { + org.junit.jupiter.api.Assertions.assertNotEquals(unexpected, actual); + } + + public static void assertNotEquals(final String message, final long unexpected, final long actual) + { + org.junit.jupiter.api.Assertions.assertNotEquals(unexpected, actual, message); + } + + public static void assertNotEquals(final long unexpected, final long actual) + { + org.junit.jupiter.api.Assertions.assertNotEquals(unexpected, actual); + } + + public static void assertNotEquals( + final String message, + final double unexpected, + final double actual, + final double delta + ) + { + org.junit.jupiter.api.Assertions.assertNotEquals(unexpected, actual, delta, message); + } + + public static void assertNotEquals(final double unexpected, final double actual, final double delta) + { + org.junit.jupiter.api.Assertions.assertNotEquals(unexpected, actual, delta); + } + + public static void assertNotEquals( + final String message, + final float unexpected, + final float actual, + final float delta + ) + { + org.junit.jupiter.api.Assertions.assertNotEquals(unexpected, actual, delta, message); + } + + public static void assertNotEquals(final float unexpected, final float actual, final float delta) + { + org.junit.jupiter.api.Assertions.assertNotEquals(unexpected, actual, delta); + } + + public static void assertArrayEquals(final String message, final Object[] expected, final Object[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, message); + } + + public static void assertArrayEquals(final Object[] expected, final Object[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual); + } + + public static void assertArrayEquals(final String message, final boolean[] expected, final boolean[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, message); + } + + public static void assertArrayEquals(final boolean[] expected, final boolean[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual); + } + + public static void assertArrayEquals(final String message, final byte[] expected, final byte[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, message); + } + + public static void assertArrayEquals(final byte[] expected, final byte[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual); + } + + public static void assertArrayEquals(final String message, final char[] expected, final char[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, message); + } + + public static void assertArrayEquals(final char[] expected, final char[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual); + } + + public static void assertArrayEquals(final String message, final short[] expected, final short[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, message); + } + + public static void assertArrayEquals(final short[] expected, final short[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual); + } + + public static void assertArrayEquals(final String message, final int[] expected, final int[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, message); + } + + public static void assertArrayEquals(final int[] expected, final int[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual); + } + + public static void assertArrayEquals(final String message, final long[] expected, final long[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, message); + } + + public static void assertArrayEquals(final long[] expected, final long[] actual) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual); + } + + public static void assertArrayEquals( + final String message, + final double[] expected, + final double[] actual, + final double delta + ) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, delta, message); + } + + public static void assertArrayEquals(final double[] expected, final double[] actual, final double delta) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, delta); + } + + public static void assertArrayEquals( + final String message, + final float[] expected, + final float[] actual, + final float delta + ) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, delta, message); + } + + public static void assertArrayEquals(final float[] expected, final float[] actual, final float delta) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expected, actual, delta); + } + + public static void assertEquals(final String message, final double expected, final double actual, final double delta) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta, message); + } + + public static void assertEquals(final String message, final float expected, final float actual, final float delta) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta, message); + } + + public static void assertEquals(final long expected, final long actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + } + + public static void assertEquals(final String message, final long expected, final long actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + } + + public static void assertEquals(final double expected, final double actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + } + + public static void assertEquals(final String message, final double expected, final double actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + } + + public static void assertEquals(final double expected, final double actual, final double delta) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta); + } + + public static void assertEquals(final float expected, final float actual, final float delta) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta); + } + + public static void assertNotNull(final String message, final Object object) + { + org.junit.jupiter.api.Assertions.assertNotNull(object, message); + } + + public static void assertNotNull(final Object object) + { + org.junit.jupiter.api.Assertions.assertNotNull(object); + } + + public static void assertNull(final String message, final Object object) + { + org.junit.jupiter.api.Assertions.assertNull(object, message); + } + + public static void assertNull(final Object object) + { + org.junit.jupiter.api.Assertions.assertNull(object); + } + + public static void assertSame(final String message, final Object expected, final Object actual) + { + org.junit.jupiter.api.Assertions.assertSame(expected, actual, message); + } + + public static void assertSame(final Object expected, final Object actual) + { + org.junit.jupiter.api.Assertions.assertSame(expected, actual); + } + + public static void assertNotSame(final String message, final Object unexpected, final Object actual) + { + org.junit.jupiter.api.Assertions.assertNotSame(unexpected, actual, message); + } + + public static void assertNotSame(final Object unexpected, final Object actual) + { + org.junit.jupiter.api.Assertions.assertNotSame(unexpected, actual); + } + + public static <T extends Throwable> T assertThrows(final Class<T> type, final Executable executable) + { + return org.junit.jupiter.api.Assertions.assertThrows(type, executable); + } + + public static <T extends Throwable> T assertThrows( + final String message, + final Class<T> type, + final Executable executable + ) + { + return org.junit.jupiter.api.Assertions.assertThrows(type, executable, message); + } + + /** + * JUnit 5 extension for test cases whose expected exception depends on the parameterized test instance. + */ + public static final class ExceptionExpectation implements InvocationInterceptor + { + private Class<? extends Throwable> expectedType; + private String expectedMessage; + + public void expect(final Class<? extends Throwable> type) + { + expectedType = type; + } + + public void expectMessage(final String message) + { + expectedMessage = message; + } + + @Override + public void interceptTestMethod( + final Invocation<Void> invocation, + final ReflectiveInvocationContext<Method> invocationContext, + final ExtensionContext extensionContext + ) throws Throwable + { + Throwable thrown = null; + try { + invocation.proceed(); + } + catch (Throwable e) { + thrown = e; + } + + final Class<? extends Throwable> type = expectedType; + final String message = expectedMessage; + expectedType = null; + expectedMessage = null; + + if (type == null && message == null) { + if (thrown != null) { + throw thrown; + } + return; + } + + if (thrown == null) { + Assertions.fail("Expected test to throw an exception"); + } + Assertions.assertTrue(type == null || type.isInstance(thrown)); + Assertions.assertTrue( + message == null || containsMessage(thrown, message) + ); + } + + private static boolean containsMessage(final Throwable thrown, final String expectedMessage) + { + for (Throwable current = thrown; current != null; current = current.getCause()) { Review Comment: [P2] Expected-message matching is too permissive The adapter searches all causes, whereas JUnit 4 ExpectedException matches the thrown exception's message. A wrapper with the expected text only in a nested cause can now make migrated tests pass despite a top-level message regression. Match only thrown.getMessage(), or preserve explicit cause-matcher semantics. ########## processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java: ########## @@ -46,8 +44,8 @@ /** * Based on TopNQueryRunnerTest */ -@Ignore -public class TopNQueryRunnerBenchmark extends AbstractBenchmark +@Disabled +public class TopNQueryRunnerBenchmark Review Comment: [P3] TopN benchmark loses measurement harness Removing AbstractBenchmark and all BenchmarkOptions leaves this as a plain disabled JUnit 5 test. When manually run as a benchmark, testmMapped no longer receives JUnitBenchmarks warmup and measurement rounds. Retain the harness/options or migrate to an equivalent runner. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
