Align with releases/5.14.x branch

(cherry picked from commit 07807e5)

Author: marcphilipp

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSegmentResolver.java

@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.engine.discovery;
 
+import static org.junit.platform.commons.util.ReflectionUtils.isDeclaredInSamePackage;
 import static org.junit.platform.commons.util.ReflectionUtils.isPackagePrivate;
 
 import java.lang.reflect.Method;
@@ -40,8 +41,7 @@ class MethodSegmentResolver {
 	 */
 	String formatMethodSpecPart(Method method, Class<?> testClass) {
 		var parameterTypes = ClassUtils.nullSafeToString(method.getParameterTypes());
-		if (isPackagePrivate(method)
-				&& !method.getDeclaringClass().getPackageName().equals(testClass.getPackageName())) {
+		if (isPackagePrivate(method) && !isDeclaredInSamePackage(method.getDeclaringClass(), testClass)) {
 			return "%s#%s(%s)".formatted(method.getDeclaringClass().getName(), method.getName(), parameterTypes);
 		}
 		return "%s(%s)".formatted(method.getName(), parameterTypes);

junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java

@@ -1841,7 +1841,7 @@ private static boolean isMethodOverriddenBy(Method upper, Method lower) {
 		}
 
 		// Cannot override a package-private method in another package.
-		if (isPackagePrivate(upper) && !declaredInSamePackage(upper, lower)) {
+		if (isPackagePrivate(upper) && !isDeclaredInSamePackage(upper, lower)) {
 			return false;
 		}
 
@@ -1857,8 +1857,16 @@ public static boolean isPackagePrivate(Member member) {
 		return !(Modifier.isPublic(modifiers) || Modifier.isProtected(modifiers) || Modifier.isPrivate(modifiers));
 	}
 
-	private static boolean declaredInSamePackage(Method m1, Method m2) {
-		return m1.getDeclaringClass().getPackageName().equals(m2.getDeclaringClass().getPackageName());
+	private static boolean isDeclaredInSamePackage(Method m1, Method m2) {
+		return isDeclaredInSamePackage(m1.getDeclaringClass(), m2.getDeclaringClass());
+	}
+
+	/**
+	 * @since 6.0.1
+	 */
+	@API(status = INTERNAL, since = "6.0.1")
+	public static boolean isDeclaredInSamePackage(Class<?> c1, Class<?> c2) {
+		return c1.getPackageName().equals(c2.getPackageName());
 	}
 
 	/**