MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Junit|Test] fix: use getMethod instead of getDeclaredMethod for accessing public comparison failure data

Browse Source 
The getMethod finds public methods in class hierarchy
The getDeclaredMethod finds public and private methods in target class

Issues IDEA-359095, IDEA-353644

GitOrigin-RevId: 772c318f95c561e36018dfbd16cf2f7b62663e94
This commit is contained in:
Sergei Vorobyov
2024-10-11 12:33:56 +02:00
committed by intellij-monorepo-bot
parent 43e76fd7e4
commit 386665b49e
2 changed files with 113 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java
View File

@@ -234,13 +234,13 @@ public class ComparisonFailureData {
private static ComparisonFailureData createOpentest4jAssertion(Throwable assertion) {
try {
if (isInstance(assertion.getClass(), OPENTEST4J_ASSERTION)) {
Method isExpectedDefinedMethod = assertion.getClass().getDeclaredMethod("isExpectedDefined");
Method isActualDefinedMethod = assertion.getClass().getDeclaredMethod("isActualDefined");
Method isExpectedDefinedMethod = assertion.getClass().getMethod("isExpectedDefined");
Method isActualDefinedMethod = assertion.getClass().getMethod("isActualDefined");
boolean isExpectedDefined = ((Boolean)isExpectedDefinedMethod.invoke(assertion)).booleanValue();
boolean isActualDefined = ((Boolean)isActualDefinedMethod.invoke(assertion)).booleanValue();
if (isExpectedDefined && isActualDefined) {
Method expectedMethod = assertion.getClass().getDeclaredMethod("getExpected");
Method actualMethod = assertion.getClass().getDeclaredMethod("getActual");
Method expectedMethod = assertion.getClass().getMethod("getExpected");
Method actualMethod = assertion.getClass().getMethod("getActual");
Object expectedValueWrapper = expectedMethod.invoke(assertion);
Object actualValueWrapper = actualMethod.invoke(assertion);
AssertionValue expected = getOpentest4jAssertionValue(expectedValueWrapper);
@@ -258,17 +258,17 @@ public class ComparisonFailureData {
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
if (isInstance(valueWrapper.getClass(), OPENTEST4J_VALUE_WRAPPER)) {
Method valueMethod = valueWrapper.getClass().getDeclaredMethod("getValue");
Method valueMethod = valueWrapper.getClass().getMethod("getValue");
Object value = valueMethod.invoke(valueWrapper);
if (value != null && isInstance(value.getClass(), OPENTEST4J_FILE_INFO)) {
Method contentAsStringMethod = value.getClass().getDeclaredMethod("getContentsAsString", Charset.class);
Method contentAsStringMethod = value.getClass().getMethod("getContentsAsString", Charset.class);
String valueString = (String)contentAsStringMethod.invoke(value, OPENTEST4J_FILE_CONTENT_CHARSET);
Method pathMethod = value.getClass().getDeclaredMethod("getPath");
Method pathMethod = value.getClass().getMethod("getPath");
String valuePath = (String)pathMethod.invoke(value);
return new AssertionValue(valueString, valuePath);
}
else {
Method stringRepresentationMethod = valueWrapper.getClass().getDeclaredMethod("getStringRepresentation");
Method stringRepresentationMethod = valueWrapper.getClass().getMethod("getStringRepresentation");
String valueString = (String)stringRepresentationMethod.invoke(valueWrapper);
return new AssertionValue(valueString, null);
}

119
plugins/junit/java-tests/test/com/intellij/execution/junit/JUnitComparisonFailureDataTest.kt
View File

@@ -34,13 +34,25 @@ class JUnitComparisonFailureDataTest {
val expectedText = "expected text"
val actualText = "actual text"
val exception = junit.framework.ComparisonFailure("message", expectedText, actualText)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
run {
val exception = junit.framework.ComparisonFailure("message", expectedText, actualText)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
}
run {
val exception = CustomJunit3ComparisonFailure("message", expectedText, actualText)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
}
}
@Test
@@ -48,13 +60,25 @@ class JUnitComparisonFailureDataTest {
val expectedText = "expected text"
val actualText = "actual text"
val exception = org.junit.ComparisonFailure("message", expectedText, actualText)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
run {
val exception = org.junit.ComparisonFailure("message", expectedText, actualText)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
}
run {
val exception = CustomJunit4ComparisonFailure("message", expectedText, actualText)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
}
}
@Test
@@ -109,6 +133,52 @@ class JUnitComparisonFailureDataTest {
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNull(comparisonData)
}
run {
val exception = CustomJunit5AssertionFailedError("message", expected, actual)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
}
run {
val exception = CustomJunit5AssertionFailedError("message", expectedText, actual)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
}
run {
val exception = CustomJunit5AssertionFailedError("message", expected, actualText)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
}
run {
val exception = CustomJunit5AssertionFailedError("message", expectedText, actualText)
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNotNull(comparisonData)
Assertions.assertEquals(expectedText, comparisonData.expected)
Assertions.assertEquals(actualText, comparisonData.actual)
Assertions.assertNull(comparisonData.expectedFilePath)
Assertions.assertNull(comparisonData.actualFilePath)
}
run {
val exception = CustomJunit5AssertionFailedError()
val comparisonData = ComparisonFailureData.create(exception)
Assertions.assertNull(comparisonData)
}
}
@Test
@@ -288,4 +358,25 @@ class JUnitComparisonFailureDataTest {
Assertions.assertNull(comparisonData.actualFilePath)
}
}
private class CustomJunit3ComparisonFailure : junit.framework.ComparisonFailure {
constructor(message: String?, expected: String?, actual: String?) :
super(message, expected, actual)
}
private class CustomJunit4ComparisonFailure : org.junit.ComparisonFailure {
constructor(message: String?, expected: String?, actual: String?) :
super(message, expected, actual)
}
private class CustomJunit5AssertionFailedError : org.opentest4j.AssertionFailedError {
constructor() :
super()
constructor(message: String?, expected: Any?, actual: Any?) :
super(message, expected, actual)
}
}