Skip to content

Added a fix for resolving names to static inner classes #1212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
public class UnsafeWithField {
Field field;

Field setField(Field f) {
public Field setField(Field f) {
field = f;
return Field.INTEGER;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package examples.enums

import examples.CustomJavaDocTagsEnabler
import examples.SummaryTestCaseGeneratorTest
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
import org.utbot.examples.enums.ComplexEnumExamples
import org.utbot.framework.plugin.api.MockStrategyApi
import org.utbot.tests.infrastructure.DoNotCalculate

@ExtendWith(CustomJavaDocTagsEnabler::class)
class ComplexEnumExampleTest : SummaryTestCaseGeneratorTest(
ComplexEnumExamples::class
) {
@Test
fun testUnsafeWithField() {
val summary1 = "@utbot.classUnderTest {@link ComplexEnumExamples}\n" +
"@utbot.methodUnderTest {@link org.utbot.examples.enums.ComplexEnumExamples#countEqualColors(org.utbot.examples.enums.ComplexEnumExamples.Color,org.utbot.examples.enums.ComplexEnumExamples.Color,org.utbot.examples.enums.ComplexEnumExamples.Color)}\n" +
"@utbot.executesCondition {@code (b == a): False}\n" +
"@utbot.executesCondition {@code (c == a): False}\n" +
"@utbot.executesCondition {@code (a == b): False}\n" +
"@utbot.executesCondition {@code (c == b): False}\n" +
"@utbot.executesCondition {@code (equalToA > equalToB): False}\n" +
"@utbot.returnsFrom {@code return equalToB;}"
val summary2 = "@utbot.classUnderTest {@link ComplexEnumExamples}\n" +
"@utbot.methodUnderTest {@link org.utbot.examples.enums.ComplexEnumExamples#countEqualColors(org.utbot.examples.enums.ComplexEnumExamples.Color,org.utbot.examples.enums.ComplexEnumExamples.Color,org.utbot.examples.enums.ComplexEnumExamples.Color)}\n" +
"@utbot.executesCondition {@code (b == a): False}\n" +
"@utbot.executesCondition {@code (c == a): True}\n" +
"@utbot.executesCondition {@code (a == b): False}\n" +
"@utbot.executesCondition {@code (c == b): False}\n" +
"@utbot.executesCondition {@code (equalToA > equalToB): True}\n" +
"@utbot.returnsFrom {@code return equalToA;}\n"
val summary3 = "@utbot.classUnderTest {@link ComplexEnumExamples}\n" +
"@utbot.methodUnderTest {@link org.utbot.examples.enums.ComplexEnumExamples#countEqualColors(org.utbot.examples.enums.ComplexEnumExamples.Color,org.utbot.examples.enums.ComplexEnumExamples.Color,org.utbot.examples.enums.ComplexEnumExamples.Color)}\n" +
"@utbot.executesCondition {@code (b == a): False}\n" +
"@utbot.executesCondition {@code (c == a): False}\n" +
"@utbot.executesCondition {@code (a == b): False}\n" +
"@utbot.executesCondition {@code (c == b): True}\n" +
"@utbot.executesCondition {@code (equalToA > equalToB): False}\n" +
"@utbot.returnsFrom {@code return equalToB;}\n"
val summary4 = "@utbot.classUnderTest {@link ComplexEnumExamples}\n" +
"@utbot.methodUnderTest {@link org.utbot.examples.enums.ComplexEnumExamples#countEqualColors(org.utbot.examples.enums.ComplexEnumExamples.Color,org.utbot.examples.enums.ComplexEnumExamples.Color,org.utbot.examples.enums.ComplexEnumExamples.Color)}\n" +
"@utbot.executesCondition {@code (b == a): True}\n" +
"@utbot.executesCondition {@code (c == a): True}\n" +
"@utbot.executesCondition {@code (a == b): True}\n" +
"@utbot.executesCondition {@code (c == b): True}\n" +
"@utbot.executesCondition {@code (equalToA > equalToB): False}\n" +
"@utbot.returnsFrom {@code return equalToB;}"

val methodName1 = "testCountEqualColors_EqualToALessOrEqualEqualToB"
val methodName2 = "testCountEqualColors_EqualToAGreaterThanEqualToB"
val methodName3 = "testCountEqualColors_EqualToALessOrEqualEqualToB_1"
val methodName4 = "testCountEqualColors_AEqualsB"

val displayName1 = "b == a : False -> return equalToB"
val displayName2 = "equalToA > equalToB : True -> return equalToA"
val displayName3 = "b == a : False -> return equalToB"
val displayName4 = "b == a : True -> return equalToB"

val summaryKeys = listOf(
summary1,
summary2,
summary3,
summary4
)

val displayNames = listOf(
displayName1,
displayName2,
displayName3,
displayName4
)

val methodNames = listOf(
methodName1,
methodName2,
methodName3,
methodName4
)


val method = ComplexEnumExamples::countEqualColors
val mockStrategy = MockStrategyApi.NO_MOCKS
val coverage = DoNotCalculate

summaryCheck(method, mockStrategy, coverage, summaryKeys, methodNames, displayNames)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package examples.unsafe

import examples.CustomJavaDocTagsEnabler
import examples.SummaryTestCaseGeneratorTest
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
import org.utbot.examples.unsafe.UnsafeWithField
import org.utbot.framework.plugin.api.MockStrategyApi
import org.utbot.tests.infrastructure.DoNotCalculate

@ExtendWith(CustomJavaDocTagsEnabler::class)
class UnsafeWithFieldTest : SummaryTestCaseGeneratorTest(
UnsafeWithField::class
) {
@Test
fun testUnsafeWithField() {
val summary1 = "@utbot.classUnderTest {@link UnsafeWithField}\n" +
"@utbot.methodUnderTest {@link org.utbot.examples.unsafe.UnsafeWithField#setField(java.text.NumberFormat.Field)}\n" +
"@utbot.returnsFrom {@code return Field.INTEGER;}"

val methodName1 = "testSetField_ReturnFieldINTEGER"

val displayName1 = "-> return Field.INTEGER"

val summaryKeys = listOf(
summary1
)

val displayNames = listOf(
displayName1
)

val methodNames = listOf(
methodName1
)

val method = UnsafeWithField::setField
val mockStrategy = MockStrategyApi.NO_MOCKS
val coverage = DoNotCalculate

summaryCheck(method, mockStrategy, coverage, summaryKeys, methodNames, displayNames)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ private fun formMethodReferenceForJavaDoc(
methodParametersAsString: String,
isPrivate: Boolean
): String {
// to avoid $ in names for static inner classes
val prettyClassName: String = className.replace(JAVA_CLASS_DELIMITER, JAVA_DOC_CLASS_DELIMITER)
val validMethodParameters = methodParametersAsString.replace(JAVA_CLASS_DELIMITER, JAVA_DOC_CLASS_DELIMITER)

val text = if (methodParametersAsString == EMPTY_STRING) {
val text = if (validMethodParameters == EMPTY_STRING) {
"$prettyClassName#$methodName()"
} else {
"$prettyClassName#$methodName($methodParametersAsString)"
"$prettyClassName#$methodName($validMethodParameters)"
}

return if (isPrivate) {
Expand Down