Skip to content

Built the link to the nested class for the JavaDocs #1395

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.

Sign up for GitHub

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
Dec 9, 2022
Merged

Built the link to the nested class for the JavaDocs #1395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7abf369
Built the link to the nested class for the JavaDocs
amandelpie Nov 14, 2022
2cc073b
Merge branch 'main' into amandelpie/feature-1361
amandelpie Dec 7, 2022
d41486b
Merged with the existing master
amandelpie Dec 7, 2022
47bda17
Merge branch 'main' into amandelpie/feature-1361
amandelpie Dec 9, 2022
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
2 changes: 2 additions & 0 deletions utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,8 @@ class UtBotSymbolicEngine(
val methodUnderTestDescription = FuzzedMethodDescription(methodUnderTest, collectConstantsForFuzzer(graph)).apply {
compilableName = if (!methodUnderTest.isConstructor) methodUnderTest.name else null
className = classUnderTest.simpleName
canonicalName = classUnderTest.canonicalName
isNested = classUnderTest.isNested
packageName = classUnderTest.packageName
val names = graph.body.method.tags.filterIsInstance<ParamNamesTag>().firstOrNull()?.names
parameterNameMap = { index -> names?.getOrNull(index) }
Expand Down
11 changes: 10 additions & 1 deletion utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/FuzzedMethodDescription.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ open class FuzzedMethodDescription(
val parameters: List<ClassId>,
val concreteValues: Collection<FuzzedConcreteValue> = emptyList()
) {

/**
* Name that can be used to generate test names
*/
Expand All @@ -35,6 +34,16 @@ open class FuzzedMethodDescription(
*/
var packageName: String? = null

/**
* Canonical name.
*/
var canonicalName: String? = null

/**
* True, if class is nested.
*/
var isNested: Boolean = false

/**
* Returns parameter name by its index in the signature
*/
Expand Down
4 changes: 3 additions & 1 deletion ...n/org/utbot/summary/comment/classic/fuzzer/SimpleCommentForTestProducedByFuzzerBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ class SimpleCommentForTestProducedByFuzzerBuilder(
val packageName = methodDescription.packageName
val className = methodDescription.className
val methodName = methodDescription.compilableName
val canonicalName = methodDescription.canonicalName
val isNested = methodDescription.isNested

val result = if (packageName != null && className != null && methodName != null) {
val fullClassName = getFullClassName(packageName, className)
val fullClassName = getFullClassName(canonicalName, packageName, className, isNested)

val methodReference = getMethodReferenceForFuzzingTest(
fullClassName,
Expand Down
8 changes: 6 additions & 2 deletions utbot-summary/src/main/kotlin/org/utbot/summary/comment/customtags/CustomTagsUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ fun getClassReference(fullClassName: String): String {
}

/** Returns correct full class name. */
fun getFullClassName(packageName: String, className: String): String {
return if (packageName.isEmpty()) className else "$packageName.$className"
fun getFullClassName(canonicalName: String?, packageName: String, className: String, isNested: Boolean): String {
return if (isNested && canonicalName != null) {
canonicalName
} else {
if (packageName.isEmpty()) className else "$packageName.$className"
}
}
5 changes: 3 additions & 2 deletions ...t/summary/comment/customtags/fuzzer/CommentWithCustomTagForTestProducedByFuzzerBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import org.utbot.framework.plugin.api.DocStatement
import org.utbot.framework.plugin.api.UtExecutionResult
import org.utbot.fuzzer.FuzzedMethodDescription
import org.utbot.fuzzer.FuzzedValue
import org.utbot.summary.SummarySentenceConstants.CARRIAGE_RETURN
import org.utbot.summary.comment.customtags.getClassReference
import org.utbot.summary.comment.customtags.getFullClassName
import org.utbot.summary.comment.customtags.getMethodReferenceForFuzzingTest
Expand Down Expand Up @@ -34,9 +33,11 @@ class CommentWithCustomTagForTestProducedByFuzzerBuilder(
val packageName = methodDescription.packageName
val className = methodDescription.className
val methodName = methodDescription.compilableName
val canonicalName = methodDescription.canonicalName
val isNested = methodDescription.isNested

return if (packageName != null && className != null && methodName != null) {
val fullClassName = getFullClassName(packageName, className)
val fullClassName = getFullClassName(canonicalName, packageName, className, isNested)

val methodReference = getMethodReferenceForFuzzingTest(
fullClassName,
Expand Down