phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix java tests

Browse Source
This commit is contained in:
Clément Fournier
2022-05-15 15:30:14 +02:00
parent 0a72e50109
commit 5ae11f4e8a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TypeDisambiguationTest.kt
View File

@ -157,12 +157,12 @@ class TypeDisambiguationTest : ParserTestSpec({
doTest("Ambiguous inner type should produce an error (ref in Foo)") {
val (_, args) = logger.errors[AMBIGUOUS_NAME_REFERENCE]?.first { it.first == refInFoo }!!
val (_, args) = logger.warnings[AMBIGUOUS_NAME_REFERENCE]?.first { it.first == refInFoo }!!
args.map { it.toString() } shouldBe listOf("Mem", "p.Scratch.A.Mem", "p.Scratch.B.Mem")
}
doTest("Ambiguous inner type should produce an error (ref in Scratch)") {
val (_, args) = logger.errors[AMBIGUOUS_NAME_REFERENCE]?.first { it.first == refInScratch }!!
val (_, args) = logger.warnings[AMBIGUOUS_NAME_REFERENCE]?.first { it.first == refInScratch }!!
args.map { it.toString() } shouldBe listOf("Mem", "p.Scratch.A.Mem", "p.Scratch.B.Mem")
}
@ -206,14 +206,14 @@ class TypeDisambiguationTest : ParserTestSpec({
acu.descendants(ASTFieldDeclaration::class.java).map { it.typeNode as ASTClassOrInterfaceType }.toList()
fun assertErrored(t: ASTClassOrInterfaceType, expected: Int, actual: Int) {
val errs = logger.errors[MALFORMED_GENERIC_TYPE]?.filter { it.first == t }
val errs = logger.warnings[MALFORMED_GENERIC_TYPE]?.filter { it.first == t }
?: emptyList()
assertEquals(errs.size, 1, "`${t.text}` should have produced a single error")
errs.single().second.toList() shouldBe listOf(expected, actual)
}
fun assertNoError(t: ASTClassOrInterfaceType) {
val err = logger.errors[MALFORMED_GENERIC_TYPE]?.firstOrNull { it.first == t }
val err = logger.warnings[MALFORMED_GENERIC_TYPE]?.firstOrNull { it.first == t }
assertNull(err, "`${t.text}` should not have produced an error")
}
@ -288,14 +288,14 @@ class TypeDisambiguationTest : ParserTestSpec({
acu.descendants(ASTAnnotation::class.java).map { it.typeNode }.toList()
fun assertErrored(t: ASTClassOrInterfaceType) {
val errs = logger.errors[EXPECTED_ANNOTATION_TYPE]?.filter { it.first == t }
val errs = logger.warnings[EXPECTED_ANNOTATION_TYPE]?.filter { it.first == t }
?: emptyList()
assertEquals(errs.size, 1, "`${t.text}` should have produced a single error")
errs.single().second.toList() shouldBe emptyList()
}
fun assertNoError(t: ASTClassOrInterfaceType) {
val err = logger.errors[MALFORMED_GENERIC_TYPE]?.firstOrNull { it.first == t }
val err = logger.warnings[MALFORMED_GENERIC_TYPE]?.firstOrNull { it.first == t }
assertNull(err, "`${t.text}` should not have produced an error")
}