Skip to content

corrected ClassId.isAccessibleFrom behavior on arrays #743 #744

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 2 commits into from
Aug 23, 2022
Merged

corrected ClassId.isAccessibleFrom behavior on arrays #743 #744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7adac3
corrected ClassId.isAccessibleFrom behavior on arrays #743
volivan239 Aug 19, 2022
d79405e
Attempts to improve ClassIdUtil
EgorkaKulikov Aug 22, 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
19 changes: 13 additions & 6 deletions utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/util/ClassIdUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package org.utbot.framework.codegen.model.util

import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.util.id
import org.utbot.framework.plugin.api.util.isArray

/**
* For now we will count class accessible if it is:
Expand All @@ -13,13 +14,19 @@ import org.utbot.framework.plugin.api.util.id
* @param packageName name of the package we check accessibility from
*/
infix fun ClassId.isAccessibleFrom(packageName: String): Boolean {
val isOuterClassAccessible = if (isNested) {
outerClass!!.id.isAccessibleFrom(packageName)
} else {
true

if (this.isLocal || this.isSynthetic) {
return false
}

val isAccessibleFromPackageByModifiers = isPublic || (this.packageName == packageName && (isPackagePrivate || isProtected))
val outerClassId = outerClass?.id
if (outerClassId != null && !outerClassId.isAccessibleFrom(packageName)) {
return false
}

return isOuterClassAccessible && isAccessibleFromPackageByModifiers && !isLocal && !isSynthetic
return if (this.isArray) {
elementClassId!!.isAccessibleFrom(packageName)
} else {
isPublic || (this.packageName == packageName && (isPackagePrivate || isProtected))
}
}