From d1f00a95e00f8cc2ca4d578219881cffad382bec Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 6 Feb 2018 08:54:20 +0300
Subject: [PATCH] Minor: kotlin-test reformat sources, fix test package names

---
 .../junit/src/main/kotlin/JUnitSupport.kt          | 14 +++++++-------
 .../junit/src/test/kotlin/JUnitContributorTest.kt  |  2 +-
 .../testng/src/main/kotlin/TestNGSupport.kt        | 14 +++++++-------
 .../src/test/kotlin/TestNGContributorTest.kt       |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt b/libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt
index b6dc8db1199..f47acaf622e 100644
--- a/libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt
+++ b/libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt
@@ -19,31 +19,31 @@ class JUnitContributor : AsserterContributor {
 }
 
 object JUnitAsserter : Asserter {
-    override fun assertEquals(message : String?, expected : Any?, actual : Any?) {
+    override fun assertEquals(message: String?, expected: Any?, actual: Any?) {
         Assert.assertEquals(message, expected, actual)
     }
 
-    override fun assertNotEquals(message : String?, illegal : Any?, actual : Any?) {
+    override fun assertNotEquals(message: String?, illegal: Any?, actual: Any?) {
         Assert.assertNotEquals(message, illegal, actual)
     }
 
-    override fun assertSame(message : String?, expected : Any?, actual : Any?) {
+    override fun assertSame(message: String?, expected: Any?, actual: Any?) {
         Assert.assertSame(message, expected, actual)
     }
 
-    override fun assertNotSame(message : String?, illegal : Any?, actual : Any?) {
+    override fun assertNotSame(message: String?, illegal: Any?, actual: Any?) {
         Assert.assertNotSame(message, illegal, actual)
     }
 
-    override fun assertNotNull(message : String?, actual : Any?) {
+    override fun assertNotNull(message: String?, actual: Any?) {
         Assert.assertNotNull(message ?: "actual value is null", actual)
     }
 
-    override fun assertNull(message : String?, actual : Any?) {
+    override fun assertNull(message: String?, actual: Any?) {
         Assert.assertNull(message ?: "actual value is not null", actual)
     }
 
-    override fun fail(message : String?): Nothing {
+    override fun fail(message: String?): Nothing {
         Assert.fail(message)
         // should not get here
         throw AssertionError(message)
diff --git a/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt b/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt
index 12280f5e283..7339c199da2 100644
--- a/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt
+++ b/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt
@@ -1,4 +1,4 @@
-package kotlinx.testing.tests
+package kotlin.test.junit.tests
 
 import org.junit.*
 import java.util.concurrent.*
diff --git a/libraries/kotlin.test/testng/src/main/kotlin/TestNGSupport.kt b/libraries/kotlin.test/testng/src/main/kotlin/TestNGSupport.kt
index f78f5b23fad..17fbb9558c9 100644
--- a/libraries/kotlin.test/testng/src/main/kotlin/TestNGSupport.kt
+++ b/libraries/kotlin.test/testng/src/main/kotlin/TestNGSupport.kt
@@ -23,31 +23,31 @@ class TestNGContributor : AsserterContributor {
 }
 
 object TestNGAsserter : Asserter {
-    override fun assertEquals(message : String?, expected : Any?, actual : Any?) {
+    override fun assertEquals(message: String?, expected: Any?, actual: Any?) {
         Assert.assertEquals(expected, actual, message)
     }
 
-    override fun assertNotEquals(message : String?, illegal : Any?, actual : Any?) {
+    override fun assertNotEquals(message: String?, illegal: Any?, actual: Any?) {
         Assert.assertNotEquals(illegal, actual, message)
     }
 
-    override fun assertSame(message : String?, expected : Any?, actual : Any?) {
+    override fun assertSame(message: String?, expected: Any?, actual: Any?) {
         Assert.assertSame(expected, actual, message)
     }
 
-    override fun assertNotSame(message : String?, illegal : Any?, actual : Any?) {
+    override fun assertNotSame(message: String?, illegal: Any?, actual: Any?) {
         Assert.assertNotSame(illegal, actual, message)
     }
 
-    override fun assertNotNull(message : String?, actual : Any?) {
+    override fun assertNotNull(message: String?, actual: Any?) {
         Assert.assertNotNull(actual, message ?: "actual value is null")
     }
 
-    override fun assertNull(message : String?, actual : Any?) {
+    override fun assertNull(message: String?, actual: Any?) {
         Assert.assertNull(actual, message ?: "actual value is not null")
     }
 
-    override fun fail(message : String?): Nothing {
+    override fun fail(message: String?): Nothing {
         Assert.fail(message)
         // should not get here
         throw AssertionError(message)
diff --git a/libraries/kotlin.test/testng/src/test/kotlin/TestNGContributorTest.kt b/libraries/kotlin.test/testng/src/test/kotlin/TestNGContributorTest.kt
index 962bf2da472..0d97a4bf10f 100644
--- a/libraries/kotlin.test/testng/src/test/kotlin/TestNGContributorTest.kt
+++ b/libraries/kotlin.test/testng/src/test/kotlin/TestNGContributorTest.kt
@@ -1,4 +1,4 @@
-package kotlinx.testing.tests
+package kotlin.test.testng.tests
 
 import org.testng.annotations.*
 import org.testng.*