Skip to content

Commit 4ea606f

Browse files
committed
Fix review comments
1 parent 5c7cc6c commit 4ea606f

7 files changed

Lines changed: 12 additions & 12 deletions

File tree

utbot-core/src/main/kotlin/org/utbot/common/ClassLoaderUtil.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.net.URLClassLoader
55
/**
66
* Checks that the class given by its binary name can be loaded with given classLoader.
77
*/
8-
fun URLClassLoader.canLoad(classBinaryName: String): Boolean {
8+
fun URLClassLoader.hasOnClasspath(classBinaryName: String): Boolean {
99
val classFqn = classBinaryName.replace('.', '/').plus(".class")
1010
return this.findResource(classFqn) != null
1111
}

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/CoverageApi.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package org.utbot.framework.plugin.api
33
/**
44
* Represents a covered bytecode instruction.
55
*
6-
* @param classFqn the fqn in internal form, i.e. com/rest/order/services/OrderService$InnerClass.
6+
* @param internalName the fqn in internal form, i.e. com/rest/order/services/OrderService$InnerClass.
77
* @param methodSignature the signature of the method.
88
* @param lineNumber a number of the line in the source file.
99
* @param id a unique identifier among all instructions in all classes.
1010
*
1111
* @see <a href="CONFLUENCE:Test+Minimization">Test minimization</a>
1212
*/
1313
data class Instruction(
14-
val classFqn: String,
14+
val internalName: String,
1515
val methodSignature: String,
1616
val lineNumber: Int,
1717
val id: Long

utbot-framework-test/src/test/kotlin/org/utbot/sarif/SarifReportTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ class SarifReportTest {
383383

384384
private fun mockCoverage(mockExecution: UtExecution, lineNumber: Int, className: String) {
385385
Mockito.`when`(mockExecution.coverage?.coveredInstructions?.lastOrNull()?.lineNumber).thenReturn(1)
386-
Mockito.`when`(mockExecution.coverage?.coveredInstructions?.lastOrNull()?.classFqn).thenReturn("Main")
386+
Mockito.`when`(mockExecution.coverage?.coveredInstructions?.lastOrNull()?.internalName).thenReturn("Main")
387387
(mockExecution as? UtSymbolicExecution)?.let { mockSymbolicSteps(it, lineNumber, className) }
388388
}
389389

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ open class TestCaseGenerator(
387387
coverage.coveredInstructions
388388
.filter { instruction ->
389389
val instrClassName =
390-
instruction.classFqn
390+
instruction.internalName
391391
.also {
392392
val isInstrClassOnClassPath =
393393
isClassOnUserClasspathCache.getOrPut(it) {

utbot-framework/src/main/kotlin/org/utbot/sarif/SarifReport.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,14 +360,14 @@ class SarifReport(
360360
?: return listOf()
361361

362362
val executionTrace = coveredInstructions.groupBy { instruction ->
363-
instruction.classFqn to instruction.methodSignature // group by method
363+
instruction.internalName to instruction.methodSignature // group by method
364364
}.map { (_, instructionsForOneMethod) ->
365365
instructionsForOneMethod.last() // we need only last to construct the stack trace
366366
}
367367

368368
val sarifExecutionTrace = executionTrace.map { instruction ->
369369
resolveStackTraceElementByNames(
370-
classFqn = instruction.classFqn.replace('/', '.'),
370+
classFqn = instruction.internalName.replace('/', '.'),
371371
methodName = instruction.methodSignature.substringBefore('('),
372372
lineNumber = instruction.lineNumber
373373
)
@@ -508,7 +508,7 @@ class SarifReport(
508508
if (lastCoveredInstruction != null) {
509509
return Pair(
510510
lastCoveredInstruction.lineNumber, // .lineNumber is one-based
511-
lastCoveredInstruction.classFqn.replace('/', '.')
511+
lastCoveredInstruction.internalName.replace('/', '.')
512512
)
513513
}
514514

utbot-junit-contest/src/main/kotlin/org/utbot/contest/Statistics.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ data class CoverageStatistic(val covered: Int, val total: Int)
237237
private fun CoverageInstructionsSet?.getCoverageInfo(classNames: Set<String>): CoverageStatistic = this?.run {
238238
CoverageStatistic(
239239
coveredInstructions.filter {
240-
instr -> classNames.contains(instr.classFqn)
240+
instr -> classNames.contains(instr.internalName)
241241
}.map { it.id }.distinct().size,
242242
totalInstructions.toInt()
243243
)

utbot-spring-commons/src/main/kotlin/org/utbot/spring/context/SpringContextWrapper.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.jetbrains.rd.util.warn
55
import org.springframework.beans.factory.support.BeanDefinitionRegistry
66
import org.springframework.context.ConfigurableApplicationContext
77
import org.springframework.data.repository.CrudRepository
8-
import org.utbot.common.canLoad
8+
import org.utbot.common.hasOnClasspath
99
import org.utbot.spring.api.context.ContextWrapper
1010
import org.utbot.spring.api.context.RepositoryDescription
1111
import java.net.URLClassLoader
@@ -47,7 +47,7 @@ class SpringContextWrapper(override val context: ConfigurableApplicationContext)
4747
val clazz = getBean(name)::class.java
4848
// here immediate hierarchy is enough because proxies are inherited directly
4949
val immediateClazzHierarchy = clazz.interfaces + clazz.superclass + clazz
50-
immediateClazzHierarchy.any { clazz -> userSourcesClassLoader.canLoad(clazz.name) }
50+
immediateClazzHierarchy.any { clazz -> userSourcesClassLoader.hasOnClasspath(clazz.name) }
5151
}
5252
.toSet()
5353

@@ -75,7 +75,7 @@ class SpringContextWrapper(override val context: ConfigurableApplicationContext)
7575
val repositoryClass = repositoryBean.bean::class.java
7676
val repositoryClassName = repositoryClass
7777
.interfaces
78-
.filter { clazz -> userSourcesClassLoader.canLoad(clazz.name) }
78+
.filter { clazz -> userSourcesClassLoader.hasOnClasspath(clazz.name) }
7979
.filter { CrudRepository::class.java.isAssignableFrom(it) }
8080
.map { it.name }
8181
.firstOrNull() ?: CrudRepository::class.java.name

0 commit comments

Comments
 (0)