azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Test] Disable UNUSED_* diagnostics in tests which are not belong to contolFlowAnalysis suite

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-03-29 12:14:16 +03:00
committed by TeamCityServer
parent 85949b387e
commit cd890d5833
758 changed files with 1832 additions and 3745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.kt
Vendored
+2 -3
View File
@@ -1,11 +1,10 @@
fun foo1() = <!EXPRESSION_EXPECTED!>while (b()) {}<!>
fun foo2() = <!EXPRESSION_EXPECTED!>for (<!UNUSED_PARAMETER!>i<!> in <!ITERATOR_MISSING!>10<!>) {}<!>
fun foo2() = <!EXPRESSION_EXPECTED!>for (i in <!ITERATOR_MISSING!>10<!>) {}<!>
fun foo3() = when (b()) {
true -> 1
else -> 0
}
fun b(): Boolean = true
fun b(): Boolean = true
compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.kt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ fun testResultOfAnonFun1() =
fun testResultOfAnonFun2() =
run(fun () {
if (true) <!UNUSED_EXPRESSION!>42<!> else println()
if (true) 42 else println()
})
fun testReturnFromAnonFun() =
compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.kt
Vendored
+3 -4
View File
@@ -27,17 +27,17 @@ val wxx5 = idUnit(<!TYPE_MISMATCH{NI}!><!NO_ELSE_IN_WHEN!>when<!> { true -> <!CO
val wxx6 = null ?: <!NO_ELSE_IN_WHEN!>when<!> { true -> 42 }
val wxx7 = "" + <!NO_ELSE_IN_WHEN!>when<!> { true -> 42 }
val fn1 = { if (true) <!UNUSED_EXPRESSION!>42<!> }
val fn1 = { if (true) 42 }
val fn2 = { if (true) mlist.add() }
val fn3 = { if (true) work() }
val fn4 = { <!NO_ELSE_IN_WHEN!>when<!> { true -> 42 } }
val fn5 = { <!NO_ELSE_IN_WHEN!>when<!> { true -> mlist.add() } }
val fn6 = { when { true -> work() } }
val ufn1: () -> Unit = { if (true) <!UNUSED_EXPRESSION!>42<!> }
val ufn1: () -> Unit = { if (true) 42 }
val ufn2: () -> Unit = { if (true) mlist.add() }
val ufn3: () -> Unit = { if (true) work() }
val ufn4: () -> Unit = { when { true -> <!UNUSED_EXPRESSION!>42<!> } }
val ufn4: () -> Unit = { when { true -> 42 } }
val ufn5: () -> Unit = { when { true -> mlist.add() } }
val ufn6: () -> Unit = { when { true -> work() } }
@@ -83,4 +83,3 @@ fun foo2() {
}
}
}
compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ fun example() {
val f = if (true) <!IMPLICIT_CAST_TO_ANY!>true<!> else <!IMPLICIT_CAST_TO_ANY!>{}<!>
{
if (true) <!UNUSED_EXPRESSION!>true<!>
if (true) true
}();
{
compiler/testData/diagnostics/tests/controlStructures/kt1075.kt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ package kt1075
fun foo(b: String) {
if (<!TYPE_MISMATCH!>b<!> in 1..10) {} //type mismatch
when (<!TYPE_MISMATCH{NI}!>b<!>) {
<!TYPE_MISMATCH_IN_RANGE!>in<!> 1..10 -> <!UNUSED_EXPRESSION!>1<!> //no type mismatch, but it should be here
else -> <!UNUSED_EXPRESSION!>2<!>
<!TYPE_MISMATCH_IN_RANGE!>in<!> 1..10 -> 1 //no type mismatch, but it should be here
else -> 2
}
}
compiler/testData/diagnostics/tests/controlStructures/kt657.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
//KT-657 Semantic checks for when without condition
package kt657
class Pair<A, B>(<!UNUSED_PARAMETER!>a<!>: A, <!UNUSED_PARAMETER!>b<!>: B)
class Pair<A, B>(a: A, b: B)
fun foo() =
when {
compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
Vendored
+36 -36
View File
@@ -27,8 +27,8 @@ fun foo() {
z = 34
}
}
val <!UNUSED_VARIABLE!>f<!>: ()-> Int = <!TYPE_MISMATCH!>r<!>
val <!UNUSED_VARIABLE!>g<!>: ()-> Any = r
val f: ()-> Int = <!TYPE_MISMATCH!>r<!>
val g: ()-> Any = r
}
//KT-735 Statements without braces are prohibited on the right side of when entries.
@@ -48,27 +48,27 @@ fun test1() { while(true) {} }
fun test2(): Unit { while(true) {} }
fun testCoercionToUnit() {
val <!UNUSED_VARIABLE!>simple<!>: ()-> Unit = {
<!UNUSED_EXPRESSION!>41<!>
val simple: ()-> Unit = {
41
}
val <!UNUSED_VARIABLE!>withIf<!>: ()-> Unit = {
val withIf: ()-> Unit = {
if (true) {
<!UNUSED_EXPRESSION!>3<!>
3
} else {
<!UNUSED_EXPRESSION!>45<!>
45
}
}
val i = 34
val <!UNUSED_VARIABLE!>withWhen<!> : () -> Unit = {
val withWhen : () -> Unit = {
when(i) {
1 -> {
val d = 34
<!UNUSED_EXPRESSION!>"1"<!>
"1"
doSmth(d)
}
2 -> <!UNUSED_EXPRESSION!>'4'<!>
else -> <!UNUSED_EXPRESSION!>true<!>
2 -> '4'
else -> true
}
}
@@ -80,54 +80,54 @@ fun testCoercionToUnit() {
45
}
}
val <!UNUSED_VARIABLE!>f<!> : () -> String = <!TYPE_MISMATCH!>checkType<!>
val f : () -> String = <!TYPE_MISMATCH!>checkType<!>
}
fun doSmth(<!UNUSED_PARAMETER!>i<!>: Int) {}
fun doSmth(i: Int) {}
fun testImplicitCoercion() {
val d = 21
var z = 0
var <!UNUSED_VARIABLE!>i<!> = when(d) {
var i = when(d) {
3 -> null
4 -> { val <!NAME_SHADOWING, UNUSED_VARIABLE!>z<!> = 23 }
4 -> { val <!NAME_SHADOWING!>z<!> = 23 }
else -> z = 20
}
var <!UNUSED_VARIABLE!>u<!> = when(d) {
3 -> { <!IMPLICIT_CAST_TO_ANY!><!UNUSED_VALUE!>z =<!> 34<!> }
else -> <!IMPLICIT_CAST_TO_ANY, UNUSED_CHANGED_VALUE!>z--<!>
var u = when(d) {
3 -> { <!IMPLICIT_CAST_TO_ANY!>z = 34<!> }
else -> <!IMPLICIT_CAST_TO_ANY!>z--<!>
}
var <!UNUSED_VARIABLE!>iff<!> = <!INVALID_IF_AS_EXPRESSION!>if<!> (true) {
<!UNUSED_VALUE!>z =<!> 34
var iff = <!INVALID_IF_AS_EXPRESSION!>if<!> (true) {
z = 34
}
val <!UNUSED_VARIABLE!>g<!> = <!INVALID_IF_AS_EXPRESSION!>if<!> (true) 4
val <!UNUSED_VARIABLE!>h<!> = if (false) <!IMPLICIT_CAST_TO_ANY!>4<!> else <!IMPLICIT_CAST_TO_ANY!>{}<!>
val g = <!INVALID_IF_AS_EXPRESSION!>if<!> (true) 4
val h = if (false) <!IMPLICIT_CAST_TO_ANY!>4<!> else <!IMPLICIT_CAST_TO_ANY!>{}<!>
bar(<!TYPE_MISMATCH{NI}!>if (true) {
<!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>4<!>
} else {
<!UNUSED_VALUE!>z =<!> 342
z = 342
}<!>)
}
fun fooWithAnyArg(<!UNUSED_PARAMETER!>arg<!>: Any) {}
fun fooWithAnyNullableArg(<!UNUSED_PARAMETER!>arg<!>: Any?) {}
fun fooWithAnyArg(arg: Any) {}
fun fooWithAnyNullableArg(arg: Any?) {}
fun testCoercionToAny() {
val d = 21
val <!UNUSED_VARIABLE!>x1<!>: Any = if (1>2) 1 else 2.0
val <!UNUSED_VARIABLE!>x2<!>: Any? = if (1>2) 1 else 2.0
val <!UNUSED_VARIABLE!>x3<!>: Any? = if (1>2) 1 else (if (1>2) null else 2.0)
val x1: Any = if (1>2) 1 else 2.0
val x2: Any? = if (1>2) 1 else 2.0
val x3: Any? = if (1>2) 1 else (if (1>2) null else 2.0)
fooWithAnyArg(if (1>2) 1 else 2.0)
fooWithAnyNullableArg(if (1>2) 1 else 2.0)
fooWithAnyNullableArg(if (1>2) 1 else (if (1>2) null else 2.0))
val <!UNUSED_VARIABLE!>y1<!>: Any = when(d) { 1 -> 1.0 else -> 2.0 }
val <!UNUSED_VARIABLE!>y2<!>: Any? = when(d) { 1 -> 1.0 else -> 2.0 }
val <!UNUSED_VARIABLE!>y3<!>: Any? = when(d) { 1 -> 1.0; 2 -> null; else -> 2.0 }
val y1: Any = when(d) { 1 -> 1.0 else -> 2.0 }
val y2: Any? = when(d) { 1 -> 1.0 else -> 2.0 }
val y3: Any? = when(d) { 1 -> 1.0; 2 -> null; else -> 2.0 }
fooWithAnyArg(when(d) { 1 -> 1.0 else -> 2.0 })
fooWithAnyNullableArg(when(d) { 1 -> 1.0 else -> 2.0 })
@@ -145,16 +145,16 @@ fun fooWithAnuNullableResult(s: String?, name: String, optional: Boolean): Any?
}
}
fun bar(<!UNUSED_PARAMETER!>a<!>: Unit) {}
fun bar(a: Unit) {}
fun testStatementInExpressionContext() {
var <!ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE!>z<!> = 34
val <!UNUSED_VARIABLE!>a1<!>: Unit = <!ASSIGNMENT_IN_EXPRESSION_CONTEXT!><!UNUSED_VALUE!>z =<!> 334<!>
val <!UNUSED_VARIABLE!>f<!> = <!EXPRESSION_EXPECTED!>for (i in 1..10) {}<!>
if (true) return <!ASSIGNMENT_IN_EXPRESSION_CONTEXT!><!UNUSED_VALUE!>z =<!> 34<!>
val a1: Unit = <!ASSIGNMENT_IN_EXPRESSION_CONTEXT!>z = 334<!>
val f = <!EXPRESSION_EXPECTED!>for (i in 1..10) {}<!>
if (true) return <!ASSIGNMENT_IN_EXPRESSION_CONTEXT!>z = 34<!>
return <!EXPRESSION_EXPECTED!>while (true) {}<!>
}
fun testStatementInExpressionContext2() {
val <!UNUSED_VARIABLE!>a2<!>: Unit = <!EXPRESSION_EXPECTED!>while(true) {}<!>
val a2: Unit = <!EXPRESSION_EXPECTED!>while(true) {}<!>
}
compiler/testData/diagnostics/tests/controlStructures/kt786.kt
Vendored
+4 -4
View File
@@ -5,8 +5,8 @@ fun foo() : Int {
val d = 2
var z = 0
when(d) {
5, 3 -> <!UNUSED_CHANGED_VALUE!>z++<!>
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> { <!UNUSED_VALUE!>z =<!> -1000 }
5, 3 -> z++
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> { z = -1000 }
<!UNREACHABLE_CODE!>return z -> 34<!>
}
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
@@ -15,7 +15,7 @@ fun foo() : Int {
fun fff(): Int {
var d = 3
when(d) {
4 -> <!UNUSED_EXPRESSION!>21<!>
4 -> 21
return 2<!UNREACHABLE_CODE!><!> -> <!UNREACHABLE_CODE!>return 47<!>
<!UNREACHABLE_CODE!>bar() -> 45<!>
<!UNREACHABLE_CODE!>444 -> true<!>
@@ -23,4 +23,4 @@ fun fff(): Int {
return 34
}
fun bar(): Int = 8
fun bar(): Int = 8
compiler/testData/diagnostics/tests/controlStructures/kt799.kt
Vendored
+4 -4
View File
@@ -3,9 +3,9 @@
package kt799
fun test() {
val <!UNUSED_VARIABLE!>a<!> : Int = if (true) 6 else return // should be allowed
val a : Int = if (true) 6 else return // should be allowed
val <!UNUSED_VARIABLE!>b<!> = if (true) 6 else return // should be allowed
val b = if (true) 6 else return // should be allowed
doSmth(if (true) 3 else return)
@@ -19,7 +19,7 @@ val b = <!RETURN_NOT_ALLOWED!>return<!> 1
val c = doSmth(if (true) 3 else <!RETURN_NOT_ALLOWED!>return<!>)
fun f(<!UNUSED_PARAMETER!>mi<!>: Int = if (true) 0 else <!RETURN_NOT_ALLOWED!>return<!>) {}
fun f(mi: Int = if (true) 0 else <!RETURN_NOT_ALLOWED!>return<!>) {}
fun doSmth(<!UNUSED_PARAMETER!>i<!>: Int) {
fun doSmth(i: Int) {
}
compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt
Vendored
+1 -1
View File
@@ -11,6 +11,6 @@ fun test() {
<!TYPE_MISMATCH{OI}!>{ }<!> <!USELESS_ELVIS!>?: 1<!>
use({ 2 } <!USELESS_ELVIS!>?: 1<!>);
1 <!USELESS_ELVIS!>?: <!TYPE_MISMATCH{OI}, UNUSED_LAMBDA_EXPRESSION!>{ }<!><!>
1 <!USELESS_ELVIS!>?: <!TYPE_MISMATCH{OI}!>{ }<!><!>
use(1 <!USELESS_ELVIS!>?: { }<!>)
}
compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ fun bar() : Int =
<!TYPE_MISMATCH{OI}!>""<!>
}<!>
finally {
<!UNUSED_EXPRESSION!>""<!>
""
}
compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.kt
Vendored
+2 -2
View File
@@ -22,11 +22,11 @@ fun f() {
}
for (<!VAL_OR_VAR_ON_LOOP_PARAMETER!>val<!> (<!UNUSED_VARIABLE!>i<!>,<!UNUSED_VARIABLE!>j<!>) in Coll()) {
for (<!VAL_OR_VAR_ON_LOOP_PARAMETER!>val<!> (i,j) in Coll()) {
}
for (<!VAL_OR_VAR_ON_LOOP_PARAMETER!>var<!> (<!UNUSED_VARIABLE!>i<!>,<!UNUSED_VARIABLE!>j<!>) in Coll()) {
for (<!VAL_OR_VAR_ON_LOOP_PARAMETER!>var<!> (i,j) in Coll()) {
}
}
compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
package kt234_kt973
class Pair<A, B>(<!UNUSED_PARAMETER!>a<!>: A, <!UNUSED_PARAMETER!>b<!>: B)
class Pair<A, B>(a: A, b: B)
fun test(t : Pair<Int, Int>) : Int {
when (t) {
@@ -21,7 +21,7 @@ fun test1(t : Pair<Int, Int>) : Int {
}
//more tests
fun t1(x: Int) = when(<!UNUSED_EXPRESSION!>x<!>) {
fun t1(x: Int) = when(x) {
else -> 1
}