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

Fix failed tests

Browse Source
This commit is contained in:
Zalim Bashorov
2016-11-07 16:30:53 +03:00
parent 1dedb38481
commit a27572af49
7 changed files with 22 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
// !DIAGNOSTICS: -UNUSED_PARAMETER
class B {
inner class C {
tailrec fun h(counter : Int) {
compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt
Vendored
+2 -1
View File
@@ -1,7 +1,8 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
// !DIAGNOSTICS: -UNUSED_PARAMETER
<!NO_TAIL_CALLS_FOUND!>tailrec fun foo()<!> {
bar {
<!NON_TAIL_RECURSIVE_CALL!>foo<!>()
compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
// !DIAGNOSTICS: -UNUSED_PARAMETER
tailrec fun withWhen(counter : Int, d : Any) : Int =
when (counter) {
0 -> counter
compiler/testData/codegen/box/smap/chainCalls.kt
Vendored
+5 -7
View File
@@ -1,6 +1,4 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FULL_JDK
package test
@@ -15,7 +13,7 @@ fun testProperLineNumber(): String {
catch(e: AssertionError) {
val entry = (e as java.lang.Throwable).getStackTrace()!!.get(1)
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("chainCalls.kt:9" != actual) {
if ("chainCalls.kt:10" != actual) {
return "fail 1: ${actual}"
}
exceptionCount++
@@ -29,7 +27,7 @@ fun testProperLineNumber(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("chainCalls.kt:24" != actual) {
if ("chainCalls.kt:25" != actual) {
return "fail 2: ${actual}"
}
exceptionCount++
@@ -42,7 +40,7 @@ fun testProperLineNumber(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("chainCalls.kt:37" != actual) {
if ("chainCalls.kt:38" != actual) {
return "fail 3: ${actual}"
}
exceptionCount++
@@ -54,7 +52,7 @@ fun testProperLineNumber(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("chainCalls.kt:49" != actual) {
if ("chainCalls.kt:50" != actual) {
return "fail 4: ${actual}"
}
exceptionCount++
compiler/testData/codegen/box/smap/infixCalls.kt
Vendored
+4 -6
View File
@@ -1,6 +1,4 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FULL_JDK
package test
@@ -13,7 +11,7 @@ fun testProperLineNumber(): String {
catch(e: AssertionError) {
val entry = (e as java.lang.Throwable).getStackTrace()!!.get(1)
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("infixCalls.kt:7" != actual) {
if ("infixCalls.kt:8" != actual) {
return "fail 1: ${actual}"
}
exceptionCount++
@@ -26,7 +24,7 @@ fun testProperLineNumber(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("infixCalls.kt:20" != actual) {
if ("infixCalls.kt:21" != actual) {
return "fail 1: ${actual}"
}
exceptionCount++
@@ -38,7 +36,7 @@ fun testProperLineNumber(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("infixCalls.kt:33" != actual) {
if ("infixCalls.kt:34" != actual) {
return "fail 1: ${actual}"
}
exceptionCount++
compiler/testData/codegen/box/smap/simpleCallWithParams.kt
Vendored
+7 -9
View File
@@ -1,6 +1,4 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FULL_JDK
package test
@@ -13,7 +11,7 @@ fun testProperLineNumberAfterInline(): String {
catch(e: AssertionError) {
val entry = (e as java.lang.Throwable).getStackTrace()!!.get(1)
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("simpleCallWithParams.kt:7" != actual) {
if ("simpleCallWithParams.kt:8" != actual) {
return "fail 1: ${actual}"
}
exceptionCount++
@@ -26,7 +24,7 @@ fun testProperLineNumberAfterInline(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("simpleCallWithParams.kt:20" != actual) {
if ("simpleCallWithParams.kt:21" != actual) {
return "fail 2: ${actual}"
}
exceptionCount++
@@ -44,7 +42,7 @@ fun testProperLineForOtherParameters(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("simpleCallWithParams.kt:38" != actual) {
if ("simpleCallWithParams.kt:39" != actual) {
return "fail 3: ${actual}"
}
exceptionCount++
@@ -58,7 +56,7 @@ fun testProperLineForOtherParameters(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("simpleCallWithParams.kt:52" != actual) {
if ("simpleCallWithParams.kt:53" != actual) {
return "fail 4: ${actual}"
}
exceptionCount++
@@ -70,7 +68,7 @@ fun testProperLineForOtherParameters(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("simpleCallWithParams.kt:65" != actual) {
if ("simpleCallWithParams.kt:66" != actual) {
return "fail 5: ${actual}"
}
exceptionCount++
@@ -82,7 +80,7 @@ fun testProperLineForOtherParameters(): String {
catch(e: AssertionError) {
val entry = e.stackTrace!![1]
val actual = "${entry.getFileName()}:${entry.getLineNumber()}"
if ("simpleCallWithParams.kt:77" != actual) {
if ("simpleCallWithParams.kt:78" != actual) {
return "fail 6: ${actual}"
}
exceptionCount++