Skip to content

Commit a6aaacc

Browse files
fix broken security provider check and test.
1 parent cffd061 commit a6aaacc

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/functionalTest/groovy/com/autonomousapps/jvm/projects/SecurityProviderProject.groovy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import com.autonomousapps.kit.GradleProject
77
import com.autonomousapps.kit.Source
88
import com.autonomousapps.kit.SourceType
99
import com.autonomousapps.kit.gradle.Dependency
10-
import com.autonomousapps.kit.gradle.Plugin
1110
import com.autonomousapps.model.Advice
1211
import com.autonomousapps.model.ProjectAdvice
1312

@@ -63,11 +62,11 @@ final class SecurityProviderProject extends AbstractProject {
6362
return actualProjectAdvice(gradleProject)
6463
}
6564

66-
private final appAdvice = [
65+
private final projAdvice = [
6766
Advice.ofChange(moduleCoordinates(conscryptUber), conscryptUber.configuration, 'runtimeOnly'),
6867
] as Set<Advice>
6968

7069
final Set<ProjectAdvice> expectedBuildHealth = [
71-
projectAdviceForDependencies(':proj', appAdvice)
70+
projectAdviceForDependencies(':proj', projAdvice)
7271
]
7372
}

src/main/kotlin/com/autonomousapps/internal/ClassNames.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ internal object ClassNames {
66

77
fun canonicalize(className: String): String = className.replace('/', '.')
88

9-
fun isEnum(superClassName: String?): Boolean = superClassName == "java/lang/Enum"
9+
// TODO(tsr): I think I can delete the slashy version but I'm not sure
10+
fun isEnum(superClassName: String?): Boolean = superClassName == "java/lang/Enum" || superClassName == "java.lang.Enum"
1011

11-
fun isSecurityProvider(superClassName: String?): Boolean = superClassName == "java/security/Provider"
12+
fun isSecurityProvider(superClassName: String?): Boolean = superClassName == "java.security.Provider"
1213
}

0 commit comments

Comments
 (0)