Introduce assertNotEquals

This commit is contained in:
Zalim Bashorov
2014-10-09 12:29:52 +04:00
parent b086a2b7a5
commit 1b2aa205ec
6 changed files with 25 additions and 1 deletions
+4
View File
@@ -25,6 +25,10 @@ public class QUnitAsserter(): Asserter {
QUnit.ok(expected == actual, "$message. Expected <$expected> actual <$actual>")
}
public override fun assertNotEquals(message: String, illegal: Any?, actual: Any?) {
QUnit.ok(illegal != actual, "$message. Illegal value: <$illegal>")
}
public override fun assertNotNull(message: String, actual: Any?) {
QUnit.ok(actual != null, message)
}
@@ -13,6 +13,9 @@ public class JsTestsAsserter() : Asserter {
public override fun assertEquals(message: String, expected: Any?, actual: Any?) {
assert(actual == expected, "$message. Expected <$expected> actual <$actual>")
}
public override fun assertNotEquals(message: String, illegal: Any?, actual: Any?) {
assert(illegal != actual, "$message. Illegal value: <$illegal>")
}
public override fun assertNotNull(message: String, actual: Any?) {
assert(actual != null, message)
}
@@ -8,6 +8,10 @@ class JUnitAsserter : Asserter {
Assert.assertEquals(message, expected, actual)
}
override fun assertNotEquals(message : String, illegal : Any?, actual : Any?) {
Assert.assertNotEquals(message, illegal, actual)
}
override fun assertNotNull(message : String, actual : Any?) {
Assert.assertNotNull(message, actual)
}
+1 -1
View File
@@ -45,7 +45,7 @@
<asm.version>3.3.1</asm.version>
<dart.name>dart-r3300</dart.name>
<guava.version>11.0.2</guava.version>
<junit-version>4.10</junit-version>
<junit-version>4.11</junit-version>
<kotlin-maven-plugin.version>0.2.3.8</kotlin-maven-plugin.version>
<kotlin-dist>${project-root}/dist</kotlin-dist>
<kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
+7
View File
@@ -35,6 +35,11 @@ public fun assertEquals(expected: Any?, actual: Any?, message: String = "") {
asserter.assertEquals(message, expected, actual)
}
/** Asserts that the actual value is not equal to the illegal value, with an optional message */
public fun assertNotEquals(illegal: Any?, actual: Any?, message: String = "") {
asserter.assertNotEquals(message, illegal, actual)
}
/** Asserts that the expression is not null, with an optional message */
public fun <T : Any> assertNotNull(actual: T?, message: String = ""): T {
asserter.assertNotNull(message, actual)
@@ -91,6 +96,8 @@ public trait Asserter {
public fun assertEquals(message: String, expected: Any?, actual: Any?): Unit
public fun assertNotEquals(message: String, illegal: Any?, actual: Any?): Unit
public fun assertNotNull(message: String, actual: Any?): Unit
public fun assertNull(message: String, actual: Any?): Unit
@@ -67,6 +67,12 @@ private class DefaultAsserter() : Asserter {
}
}
override fun assertNotEquals(message : String, illegal: Any?, actual : Any?) {
if (illegal == actual) {
fail("$message. Illegal value: <$illegal>")
}
}
public override fun assertNotNull(message : String, actual : Any?) {
if (actual == null) {
fail(message)