Skip to content

Remove name field from BuiltinClassId #1200

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
EgorkaKulikov merged 5 commits into from
Oct 21, 2022
Merged

Remove name field from BuiltinClassId #1200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47f0eef
Remove name field from BuiltinClassId
EgorkaKulikov Oct 20, 2022
49a6d8b
Merge branch 'main' into egor/name_builtins
EgorkaKulikov Oct 20, 2022
52eb8ca
Little correction
EgorkaKulikov Oct 20, 2022
66661cc
Apply corrections
EgorkaKulikov Oct 20, 2022
902e98d
Fix missed field
EgorkaKulikov Oct 20, 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
Next Next commit
Remove name field from BuiltinClassId
  • Loading branch information
@EgorkaKulikov
EgorkaKulikov committed Oct 20, 2022
commit 47f0eef4d8b4ce9a13baf4d61ff2fd9366c5dabe
3 changes: 1 addition & 2 deletions utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,6 @@ open class ClassId @JvmOverloads constructor(
* (it is important because name for nested classes contains $ as a delimiter between nested and outer classes)
*/
class BuiltinClassId(
name: String,
elementClassId: ClassId? = null,
override val canonicalName: String,
override val simpleName: String,
Expand Down Expand Up @@ -906,7 +905,7 @@ class BuiltinClassId(
-1, 0 -> ""
else -> canonicalName.substring(0, index)
},
) : ClassId(name = name, isNullable = isNullable, elementClassId = elementClassId) {
) : ClassId(name = "", isNullable = isNullable, elementClassId = elementClassId) {
init {
BUILTIN_CLASSES_BY_NAMES[name] = this
}
Expand Down
27 changes: 0 additions & 27 deletions utbot-framework/src/main/kotlin/org/utbot/framework/codegen/Domain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,11 @@ object NoStaticMocking : StaticsMocking(
object MockitoStaticMocking : StaticsMocking(id = "Mockito static mocking", displayName = "Mockito static mocking") {

val mockedStaticClassId = BuiltinClassId(
name = "org.mockito.MockedStatic",
canonicalName = "org.mockito.MockedStatic",
simpleName = "MockedStatic"
)

val mockedConstructionClassId = BuiltinClassId(
name = "org.mockito.MockedConstruction",
canonicalName = "org.mockito.MockedConstruction",
simpleName = "MockedConstruction"
)
Expand Down Expand Up @@ -264,21 +262,18 @@ object TestNg : TestFramework(id = "TestNG",displayName = "TestNG") {
internal const val testXmlName: String = "testng.xml"

override val assertionsClass: ClassId = BuiltinClassId(
name = TEST_NG_ASSERTIONS,
canonicalName = TEST_NG_ASSERTIONS,
simpleName = "Assert"
)

override val arraysAssertionsClass: ClassId = BuiltinClassId(
name = TEST_NG_ARRAYS_ASSERTIONS,
canonicalName = TEST_NG_ARRAYS_ASSERTIONS,
simpleName = "ArrayAsserts"
)

override val assertBooleanArrayEquals by lazy { assertionId("assertEquals", booleanArrayClassId, booleanArrayClassId) }

val throwingRunnableClassId = BuiltinClassId(
name = "${assertionsClass.name}\$ThrowingRunnable",
canonicalName = "${assertionsClass.canonicalName}.ThrowingRunnable",
simpleName = "ThrowingRunnable"
)
Expand All @@ -295,19 +290,16 @@ object TestNg : TestFramework(id = "TestNG",displayName = "TestNG") {
)

override val testAnnotationId: ClassId = BuiltinClassId(
name = "$mainPackage.annotations.Test",
canonicalName = "$mainPackage.annotations.Test",
simpleName = "Test"
)

override val parameterizedTestAnnotationId: ClassId = BuiltinClassId(
name = "$mainPackage.annotations.Test",
canonicalName = "$mainPackage.annotations.Test",
simpleName = "Test"
)

override val methodSourceAnnotationId: ClassId = BuiltinClassId(
name = "$mainPackage.annotations.DataProvider",
canonicalName = "$mainPackage.annotations.DataProvider",
simpleName = "DataProvider"
)
Expand All @@ -318,7 +310,6 @@ object TestNg : TestFramework(id = "TestNG",displayName = "TestNG") {
get() {
val outerArrayId = Array<Array<Any?>?>::class.id
val innerArrayId = BuiltinClassId(
name = objectArrayClassId.name,
simpleName = objectArrayClassId.simpleName,
canonicalName = objectArrayClassId.canonicalName,
packageName = objectArrayClassId.packageName,
Expand All @@ -327,7 +318,6 @@ object TestNg : TestFramework(id = "TestNG",displayName = "TestNG") {
)

return BuiltinClassId(
name = outerArrayId.name,
simpleName = outerArrayId.simpleName,
canonicalName = outerArrayId.canonicalName,
packageName = outerArrayId.packageName,
Expand Down Expand Up @@ -398,7 +388,6 @@ object Junit4 : TestFramework(id = "JUnit4",displayName = "JUnit 4") {
get() = parametrizedTestsNotSupportedError

override val testAnnotationId = BuiltinClassId(
name = "$JUNIT4_PACKAGE.Test",
canonicalName = "$JUNIT4_PACKAGE.Test",
simpleName = "Test"
)
Expand All @@ -407,28 +396,24 @@ object Junit4 : TestFramework(id = "JUnit4",displayName = "JUnit 4") {
override val methodSourceAnnotationId = voidClassId

val runWithAnnotationClassId = BuiltinClassId(
name = "$JUNIT4_PACKAGE.runner.RunWith",
canonicalName = "$JUNIT4_PACKAGE.runner.RunWith",
simpleName = "RunWith"
)

override val assertionsClass = BuiltinClassId(
name = JUNIT4_ASSERTIONS,
canonicalName = JUNIT4_ASSERTIONS,
simpleName = "Assert"
)
override val arraysAssertionsClass = assertionsClass

val ignoreAnnotationClassId = with("$JUNIT4_PACKAGE.Ignore") {
BuiltinClassId(
name = this,
canonicalName = this,
simpleName = "Ignore"
)
}

val enclosedClassId = BuiltinClassId(
name = "org.junit.experimental.runners.Enclosed",
canonicalName = "org.junit.experimental.runners.Enclosed",
simpleName = "Enclosed"
)
Expand Down Expand Up @@ -463,25 +448,21 @@ object Junit5 : TestFramework(id = "JUnit5", displayName = "JUnit 5") {
override val methodSourceAnnotationFqn: String = "$JUNIT5_PARAMETERIZED_PACKAGE.provider.MethodSource"

val executableClassId = BuiltinClassId(
name = "$JUNIT5_PACKAGE.function.Executable",
canonicalName = "$JUNIT5_PACKAGE.function.Executable",
simpleName = "Executable"
)

val timeoutClassId = BuiltinClassId(
name = "$JUNIT5_PACKAGE.Timeout",
canonicalName = "$JUNIT5_PACKAGE.Timeout",
simpleName = "Timeout"
)

val timeunitClassId = BuiltinClassId(
name = "TimeUnit",
canonicalName = "java.util.concurrent.TimeUnit",
simpleName = "TimeUnit"
)

val durationClassId = BuiltinClassId(
name = "Duration",
canonicalName = "java.time.Duration",
simpleName = "Duration"
)
Expand All @@ -494,31 +475,26 @@ object Junit5 : TestFramework(id = "JUnit5", displayName = "JUnit 5") {
)

val nestedTestClassAnnotationId = BuiltinClassId(
name = "$JUNIT5_PACKAGE.Nested",
canonicalName = "$JUNIT5_PACKAGE.Nested",
simpleName = "Nested"
)

override val testAnnotationId = BuiltinClassId(
name = "$JUNIT5_PACKAGE.Test",
canonicalName = "$JUNIT5_PACKAGE.Test",
simpleName = "Test"
)

override val parameterizedTestAnnotationId = BuiltinClassId(
name = "$JUNIT5_PARAMETERIZED_PACKAGE.ParameterizedTest",
canonicalName = "$JUNIT5_PARAMETERIZED_PACKAGE.ParameterizedTest",
simpleName = "ParameterizedTest"
)

override val methodSourceAnnotationId: ClassId = BuiltinClassId(
name = "$JUNIT5_PARAMETERIZED_PACKAGE.provider.MethodSource",
canonicalName = "$JUNIT5_PARAMETERIZED_PACKAGE.provider.MethodSource",
simpleName = "MethodSource"
)

override val assertionsClass = BuiltinClassId(
name = JUNIT5_ASSERTIONS,
canonicalName = JUNIT5_ASSERTIONS,
simpleName = "Assertions"
)
Expand Down Expand Up @@ -547,14 +523,12 @@ object Junit5 : TestFramework(id = "JUnit5", displayName = "JUnit 5") {
)

val displayNameClassId = BuiltinClassId(
name = "$JUNIT5_PACKAGE.DisplayName",
canonicalName = "$JUNIT5_PACKAGE.DisplayName",
simpleName = "DisplayName"
)

val disabledAnnotationClassId = with("$JUNIT5_PACKAGE.Disabled") {
BuiltinClassId(
name = this,
canonicalName = this,
simpleName = "Disabled"
)
Expand All @@ -566,7 +540,6 @@ object Junit5 : TestFramework(id = "JUnit5", displayName = "JUnit 5") {
get() {
val arrayListId = java.util.ArrayList::class.id
return BuiltinClassId(
name = arrayListId.name,
simpleName = arrayListId.simpleName,
canonicalName = arrayListId.canonicalName,
packageName = arrayListId.packageName,
Expand Down
5 changes: 0 additions & 5 deletions .../src/main/kotlin/org/utbot/framework/codegen/model/constructor/builtin/MockitoBuiltins.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,26 @@ internal val mockitoBuiltins: Set<MethodId>
)

internal val mockitoClassId = BuiltinClassId(
name = "org.mockito.Mockito",
canonicalName = "org.mockito.Mockito",
simpleName = "Mockito",
)

internal val ongoingStubbingClassId = BuiltinClassId(
name = "org.mockito.stubbing.OngoingStubbing",
canonicalName = "org.mockito.stubbing.OngoingStubbing",
simpleName = "OngoingStubbing",
)

internal val answerClassId = BuiltinClassId(
name = "org.mockito.stubbing.Answer",
canonicalName = "org.mockito.stubbing.Answer",
simpleName = "Answer",
)

internal val argumentMatchersClassId = BuiltinClassId(
name = "org.mockito.ArgumentMatchers",
canonicalName = "org.mockito.ArgumentMatchers",
simpleName = "ArgumentMatchers",
)

internal val mockedConstructionContextClassId = BuiltinClassId(
name = "org.mockito.MockedConstruction.Context",
canonicalName = "org.mockito.MockedConstruction.Context", // TODO use $ as a delimiter of outer and nested classes?
simpleName = "Context",
isNested = true
Expand Down
2 changes: 0 additions & 2 deletions ...c/main/kotlin/org/utbot/framework/codegen/model/constructor/builtin/UtilMethodBuiltins.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ internal abstract class UtilMethodProvider(val utilClassId: ClassId) {

val capturedArgumentClassId: BuiltinClassId
get() = BuiltinClassId(
name = "${utilClassId.name}\$CapturedArgument",
canonicalName = "${utilClassId.name}.CapturedArgument",
simpleName = "CapturedArgument"
)
Expand Down Expand Up @@ -269,7 +268,6 @@ internal class TestClassUtilMethodProvider(testClassId: ClassId) : UtilMethodPro

internal val utUtilsClassId: ClassId
get() = BuiltinClassId(
name = "org.utbot.runtime.utils.UtUtils",
canonicalName = "org.utbot.runtime.utils.UtUtils",
simpleName = "UtUtils",
isFinal = true
Expand Down
2 changes: 0 additions & 2 deletions ...mework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/context/CgContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,6 @@ internal data class CgContext(
val simpleName = testClassCustomName ?: "${classUnderTest.simpleName}Test"
val name = "$packagePrefix$simpleName"
BuiltinClassId(
name = name,
canonicalName = name,
simpleName = simpleName
)
Expand Down Expand Up @@ -548,7 +547,6 @@ internal data class CgContext(
private fun createClassIdForNestedClass(testClassModel: TestClassModel): ClassId {
val simpleName = "${testClassModel.classUnderTest.simpleName}Test"
return BuiltinClassId(
name = currentTestClass.name + "$" + simpleName,
canonicalName = currentTestClass.canonicalName + "." + simpleName,
simpleName = simpleName
)
Expand Down
1 change: 0 additions & 1 deletion ...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,6 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
val expectedException = CgParameterDeclaration(
parameter = declareParameter(
type = BuiltinClassId(
name = classClassId.name,
simpleName = classClassId.simpleName,
canonicalName = classClassId.canonicalName,
packageName = classClassId.packageName,
Expand Down
2 changes: 0 additions & 2 deletions ...rk/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ internal val addToListMethodId: MethodId
*/
internal val argumentsClassId: BuiltinClassId
get() = BuiltinClassId(
name = "org.junit.jupiter.params.provider.Arguments",
simpleName = "Arguments",
canonicalName = "org.junit.jupiter.params.provider.Arguments",
packageName = "org.junit.jupiter.params.provider"
Expand Down Expand Up @@ -314,7 +313,6 @@ fun arrayTypeOf(elementType: ClassId, isNullable: Boolean = false): ClassId {
val arrayIdName = "[${elementType.arrayLikeName}"
return when (elementType) {
is BuiltinClassId -> BuiltinClassId(
name = arrayIdName,
canonicalName = "${elementType.canonicalName}[]",
simpleName = "${elementType.simpleName}[]",
elementClassId = elementType,
Expand Down
1 change: 0 additions & 1 deletion utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/tree/CgElement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,6 @@ class CgNotNullAssertion(val expression: CgExpression) : CgValue {
override val type: ClassId
get() = when (val expressionType = expression.type) {
is BuiltinClassId -> BuiltinClassId(
name = expressionType.name,
canonicalName = expressionType.canonicalName,
simpleName = expressionType.simpleName,
isNullable = false,
Expand Down