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

Minor. Use more granular assertion levels in assertion tests

Browse Source
This commit is contained in:
Ilmir Usmanov
2018-08-06 17:11:32 +03:00
parent 1a1bb53381
commit b4189d9e85
18 changed files with 74 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/assert/jvm/interfaceAssertionsDisabled.kt
Vendored
+4 -4
View File
@@ -4,6 +4,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package interfaceAssertionsDisabled
interface Checker {
fun checkTrue(): Boolean {
var hit = false
@@ -40,9 +42,8 @@ class Dummy
fun disableAssertions(): Checker {
val loader = Dummy::class.java.classLoader
loader.setDefaultAssertionStatus(false)
val c = loader.loadClass("ShouldBeDisabled")
return c.newInstance() as Checker
loader.setPackageAssertionStatus("interfaceAssertionsDisabled", false)
return loader.loadClass("interfaceAssertionsDisabled.ShouldBeDisabled").newInstance() as Checker
}
fun box(): String {
@@ -51,6 +52,5 @@ fun box(): String {
if (c.checkTrueWithMessage()) return "FAIL 1"
if (c.checkFalse()) return "FAIL 2"
if (c.checkFalseWithMessage()) return "FAIL 3"
return "OK"
}
compiler/testData/codegen/box/assert/jvm/interfaceAssertionsEnabled.kt
Vendored
+4 -2
View File
@@ -3,6 +3,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package interfaceAssertionsEnabled
interface Checker {
fun checkTrue(): Boolean {
var hit = false
@@ -39,8 +41,8 @@ class Dummy
fun enableAssertions(): Checker {
val loader = Dummy::class.java.classLoader
loader.setDefaultAssertionStatus(true)
val c = loader.loadClass("ShouldBeEnabled")
loader.setPackageAssertionStatus("interfaceAssertionsEnabled", true)
val c = loader.loadClass("interfaceAssertionsEnabled.ShouldBeEnabled")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/localAnonymousFunction.kt
Vendored
+4 -2
View File
@@ -4,6 +4,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package localAnonymousFunction
interface Checker {
fun checkTrue(): Boolean
fun checkFalse(): Boolean
@@ -97,8 +99,8 @@ class ShouldBeEnabled : Checker {
fun setDesiredAssertionStatus(v: Boolean): Checker {
val loader = Checker::class.java.classLoader
loader.setDefaultAssertionStatus(v)
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
loader.setPackageAssertionStatus("localAnonymousFunction", v)
val c = loader.loadClass(if (v) "localAnonymousFunction.ShouldBeEnabled" else "localAnonymousFunction.ShouldBeDisabled")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/localClass.kt
Vendored
+4 -2
View File
@@ -4,6 +4,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package localClass
interface Checker {
fun checkTrue(): Boolean
fun checkFalse(): Boolean
@@ -137,8 +139,8 @@ class ShouldBeEnabled : Checker {
fun setDesiredAssertionStatus(v: Boolean): Checker {
val loader = Checker::class.java.classLoader
loader.setDefaultAssertionStatus(v)
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
loader.setPackageAssertionStatus("localClass", v)
val c = loader.loadClass(if (v) "localClass.ShouldBeEnabled" else "localClass.ShouldBeDisabled")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/localFunction.kt
Vendored
+4 -2
View File
@@ -4,6 +4,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package localFunction
interface Checker {
fun checkTrue(): Boolean
fun checkFalse(): Boolean
@@ -97,8 +99,8 @@ class ShouldBeEnabled : Checker {
fun setDesiredAssertionStatus(v: Boolean): Checker {
val loader = Checker::class.java.classLoader
loader.setDefaultAssertionStatus(v)
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
loader.setPackageAssertionStatus("localFunction", v)
val c = loader.loadClass(if (v) "localFunction.ShouldBeEnabled" else "localFunction.ShouldBeDisabled")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/localLambda.kt
Vendored
+4 -2
View File
@@ -4,6 +4,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package localLambda
interface Checker {
fun checkTrue(): Boolean
fun checkFalse(): Boolean
@@ -97,8 +99,8 @@ class ShouldBeEnabled : Checker {
fun setDesiredAssertionStatus(v: Boolean): Checker {
val loader = Checker::class.java.classLoader
loader.setDefaultAssertionStatus(v)
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
loader.setPackageAssertionStatus("localLambda", v)
val c = loader.loadClass(if (v) "localLambda.ShouldBeEnabled" else "localLambda.ShouldBeDisabled")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/localObject.kt
Vendored
+4 -2
View File
@@ -4,6 +4,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package localObject
interface Checker {
fun checkTrue(): Boolean
fun checkFalse(): Boolean
@@ -129,8 +131,8 @@ class ShouldBeEnabled : Checker {
fun setDesiredAssertionStatus(v: Boolean): Checker {
val loader = Checker::class.java.classLoader
loader.setDefaultAssertionStatus(v)
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
loader.setPackageAssertionStatus("localObject", v)
val c = loader.loadClass(if (v) "localObject.ShouldBeEnabled" else "localObject.ShouldBeDisabled")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/nonLocalReturn.kt
Vendored
+4 -2
View File
@@ -4,6 +4,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package nonLocalReturn
interface Checker {
fun checkTrueWithMessage(): Boolean
fun checkFalseWithMessage(): Boolean
@@ -60,8 +62,8 @@ class ShouldBeEnabled : Checker {
fun setDesiredAssertionStatus(v: Boolean): Checker {
val loader = Checker::class.java.classLoader
loader.setDefaultAssertionStatus(v)
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
loader.setPackageAssertionStatus("nonLocalReturn", v)
val c = loader.loadClass(if (v) "nonLocalReturn.ShouldBeEnabled" else "nonLocalReturn.ShouldBeDisabled")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/ordinary.kt
Vendored
+4 -2
View File
@@ -4,6 +4,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package ordinary
interface Checker {
fun checkTrue(): Boolean
fun checkFalse(): Boolean
@@ -73,8 +75,8 @@ class ShouldBeEnabled: Checker {
fun setDesiredAssertionStatus(v: Boolean): Checker {
val loader = Checker::class.java.classLoader
loader.setDefaultAssertionStatus(v)
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
loader.setPackageAssertionStatus("ordinary", v)
val c = loader.loadClass(if (v) "ordinary.ShouldBeEnabled" else "ordinary.ShouldBeDisabled")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/superClassInitializer.kt
Vendored
+4 -2
View File
@@ -4,6 +4,8 @@
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
// WITH_RUNTIME
package superClassInitializer
interface Checker {
fun checkTrue(): Boolean
fun checkFalse(): Boolean
@@ -91,8 +93,8 @@ class ShouldBeEnabled : Checker {
fun setDesiredAssertionStatus(v: Boolean): Checker {
val loader = Checker::class.java.classLoader
loader.setDefaultAssertionStatus(v)
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
loader.setPackageAssertionStatus("superClassInitializer", v)
val c = loader.loadClass(if (v) "superClassInitializer.ShouldBeEnabled" else "superClassInitializer.ShouldBeDisabled")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt
Vendored
+4 -2
View File
@@ -5,6 +5,8 @@
// WITH_COROUTINES
// COMMON_COROUTINES_TEST
package suspendFunctionAssertionDisabled
import helpers.*
import COROUTINES_PACKAGE.*
@@ -18,8 +20,8 @@ class Dummy
fun disableAssertions(): Checker {
val loader = Dummy::class.java.classLoader
loader.setDefaultAssertionStatus(false)
val c = loader.loadClass("Checker")
loader.setPackageAssertionStatus("suspendFunctionAssertionDisabled", false)
val c = loader.loadClass("suspendFunctionAssertionDisabled.Checker")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt
Vendored
+4 -2
View File
@@ -5,6 +5,8 @@
// WITH_COROUTINES
// COMMON_COROUTINES_TEST
package suspendFunctionAssertionsEnabled
import helpers.*
import COROUTINES_PACKAGE.*
@@ -18,8 +20,8 @@ class Dummy
fun enableAssertions(): Checker {
val loader = Dummy::class.java.classLoader
loader.setDefaultAssertionStatus(true)
val c = loader.loadClass("Checker")
loader.setPackageAssertionStatus("suspendFunctionAssertionsEnabled", true)
val c = loader.loadClass("suspendFunctionAssertionsEnabled.Checker")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt
Vendored
+4 -2
View File
@@ -5,6 +5,8 @@
// WITH_COROUTINES
// COMMON_COROUTINES_TEST
package suspendLambdaAssertionsDisabled
import helpers.*
import COROUTINES_PACKAGE.*
@@ -18,8 +20,8 @@ class Dummy
fun disableAssertions(): Checker {
val loader = Dummy::class.java.classLoader
loader.setDefaultAssertionStatus(false)
val c = loader.loadClass("Checker")
loader.setPackageAssertionStatus("suspendLambdaAssertionsDisabled", false)
val c = loader.loadClass("suspendLambdaAssertionsDisabled.Checker")
return c.newInstance() as Checker
}
compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt
Vendored
+4 -2
View File
@@ -5,6 +5,8 @@
// WITH_COROUTINES
// COMMON_COROUTINES_TEST
package suspendLambdaAssertionsEnabled
import helpers.*
import COROUTINES_PACKAGE.*
@@ -18,8 +20,8 @@ class Dummy
fun enableAssertions(): Checker {
val loader = Dummy::class.java.classLoader
loader.setDefaultAssertionStatus(true)
val c = loader.loadClass("Checker")
loader.setPackageAssertionStatus("suspendLambdaAssertionsEnabled", true)
val c = loader.loadClass("suspendLambdaAssertionsEnabled.Checker")
return c.newInstance() as Checker
}