Remove redundant public modifiers in test source sets

Goooler · qurbonzoda · commit a4b9fb701668 · 2024-01-18T12:10:43.000+02:00
diff --git a/core/commonTest/src/contract/CollectionBehaviors.kt b/core/commonTest/src/contract/CollectionBehaviors.kt
@@ -5,7 +5,7 @@
 
 package tests.contract
 
-public fun <T> CompareContext<List<T>>.listBehavior() {
+fun <T> CompareContext<List<T>>.listBehavior() {
     equalityBehavior()
     collectionBehavior()
     compareProperty( { listIterator() }, { listIteratorBehavior() })
@@ -28,7 +28,7 @@ public fun <T> CompareContext<List<T>>.listBehavior() {
     propertyEquals { subList(0, size) }
 }
 
-public fun <T> CompareContext<ListIterator<T>>.listIteratorBehavior() {
+fun <T> CompareContext<ListIterator<T>>.listIteratorBehavior() {
     listIteratorProperties()
 
     while (expected.hasNext()) {
@@ -44,14 +44,14 @@ public fun <T> CompareContext<ListIterator<T>>.listIteratorBehavior() {
     propertyFails { previous() }
 }
 
-public fun CompareContext<ListIterator<*>>.listIteratorProperties() {
+fun CompareContext<ListIterator<*>>.listIteratorProperties() {
     propertyEquals { hasNext() }
     propertyEquals { hasPrevious() }
     propertyEquals { nextIndex() }
     propertyEquals { previousIndex() }
 }
 
-public fun <T> CompareContext<Iterator<T>>.iteratorBehavior() {
+fun <T> CompareContext<Iterator<T>>.iteratorBehavior() {
     propertyEquals { hasNext() }
 
     while (expected.hasNext()) {
@@ -61,7 +61,7 @@ public fun <T> CompareContext<Iterator<T>>.iteratorBehavior() {
     propertyFails { next() }
 }
 
-public fun <T> CompareContext<Set<T>>.setBehavior(objectName: String = "", ordered: Boolean) {
+fun <T> CompareContext<Set<T>>.setBehavior(objectName: String = "", ordered: Boolean) {
     equalityBehavior(objectName, ordered)
     collectionBehavior(objectName, ordered)
 
@@ -72,7 +72,7 @@ public fun <T> CompareContext<Set<T>>.setBehavior(objectName: String = "", order
 
 
 
-public fun <K, V> CompareContext<Map<K, V>>.mapBehavior(ordered: Boolean) {
+fun <K, V> CompareContext<Map<K, V>>.mapBehavior(ordered: Boolean) {
     propertyEquals { size }
     propertyEquals { isEmpty() }
     equalityBehavior(ordered = ordered)
@@ -92,7 +92,7 @@ public fun <K, V> CompareContext<Map<K, V>>.mapBehavior(ordered: Boolean) {
 }
 
 
-public fun <T> CompareContext<T>.equalityBehavior(objectName: String = "", ordered: Boolean = true) {
+fun <T> CompareContext<T>.equalityBehavior(objectName: String = "", ordered: Boolean = true) {
     val prefix = objectName +  if (objectName.isNotEmpty()) "." else ""
     equals(objectName)
     propertyEquals(prefix + "hashCode") { hashCode() }
@@ -101,7 +101,7 @@ public fun <T> CompareContext<T>.equalityBehavior(objectName: String = "", order
 }
 
 
-public fun <T> CompareContext<Collection<T>>.collectionBehavior(objectName: String = "", ordered: Boolean = true) {
+fun <T> CompareContext<Collection<T>>.collectionBehavior(objectName: String = "", ordered: Boolean = true) {
     val prefix = objectName +  if (objectName.isNotEmpty()) "." else ""
     propertyEquals (prefix + "size") { size }
     propertyEquals (prefix + "isEmpty") { isEmpty() }
diff --git a/core/commonTest/src/contract/ComparisonDSL.kt b/core/commonTest/src/contract/ComparisonDSL.kt
@@ -8,22 +8,22 @@ package tests.contract
 import tests.assertTypeEquals
 import kotlin.test.*
 
-public fun <T> compare(expected: T, actual: T, block: CompareContext<T>.() -> Unit) {
+fun <T> compare(expected: T, actual: T, block: CompareContext<T>.() -> Unit) {
     CompareContext(expected, actual).block()
 }
 
-public class CompareContext<out T>(public val expected: T, public val actual: T) {
+class CompareContext<out T>(val expected: T, val actual: T) {
 
-    public fun equals(message: String = "") {
+    fun equals(message: String = "") {
         assertEquals(expected, actual, message)
     }
-    public fun <P> propertyEquals(message: String = "", getter: T.() -> P) {
+    fun <P> propertyEquals(message: String = "", getter: T.() -> P) {
         assertEquals(expected.getter(), actual.getter(), message)
     }
-    public fun propertyFails(getter: T.() -> Unit) { assertFailEquals({expected.getter()}, {actual.getter()}) }
-    public inline fun <reified E> propertyFailsWith(noinline getter: T.() -> Unit) = propertyFailsWith({ it is E }, getter)
-    public fun propertyFailsWith(exceptionPredicate: (Throwable) -> Boolean, getter: T.() -> Unit) { assertFailEquals({expected.getter()}, {actual.getter()}, exceptionPredicate) }
-    public fun <P> compareProperty(getter: T.() -> P, block: CompareContext<P>.() -> Unit) {
+    fun propertyFails(getter: T.() -> Unit) { assertFailEquals({expected.getter()}, {actual.getter()}) }
+    inline fun <reified E> propertyFailsWith(noinline getter: T.() -> Unit) = propertyFailsWith({ it is E }, getter)
+    fun propertyFailsWith(exceptionPredicate: (Throwable) -> Boolean, getter: T.() -> Unit) { assertFailEquals({expected.getter()}, {actual.getter()}, exceptionPredicate) }
+    fun <P> compareProperty(getter: T.() -> P, block: CompareContext<P>.() -> Unit) {
         compare(expected.getter(), actual.getter(), block)
     }
 
diff --git a/core/commonTest/src/testUtils.kt b/core/commonTest/src/testUtils.kt
@@ -20,17 +20,17 @@ internal fun <K, V> MutableMap<K, V>.remove(key: K, value: V): Boolean =
             false
         }
 
-public expect fun assertTypeEquals(expected: Any?, actual: Any?)
+expect fun assertTypeEquals(expected: Any?, actual: Any?)
 
-public enum class TestPlatform {
+enum class TestPlatform {
     JVM,
     JS,
     Native,
     Wasm,
 }
-public expect val currentPlatform: TestPlatform
+expect val currentPlatform: TestPlatform
 
-public inline fun testOn(platform: TestPlatform, action: () -> Unit) {
+inline fun testOn(platform: TestPlatform, action: () -> Unit) {
     if (platform == currentPlatform) action()
 }
 
diff --git a/core/jsTest/src/testUtilsJs.kt b/core/jsTest/src/testUtilsJs.kt
@@ -7,11 +7,11 @@ package tests
 
 import kotlin.test.assertEquals
 
-public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
+actual fun assertTypeEquals(expected: Any?, actual: Any?) {
     assertEquals(expected?.let { it::class.js }, actual?.let { it::class.js })
 }
 
-public actual val currentPlatform: TestPlatform get() = TestPlatform.JS
+actual val currentPlatform: TestPlatform get() = TestPlatform.JS
 
 actual object NForAlgorithmComplexity {
     actual val O_N: Int = 500_000
diff --git a/core/jvmTest/src/testUtilsJvm.kt b/core/jvmTest/src/testUtilsJvm.kt
@@ -7,11 +7,11 @@ package tests
 
 import kotlin.test.assertEquals
 
-public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
+actual fun assertTypeEquals(expected: Any?, actual: Any?) {
     assertEquals(expected?.javaClass, actual?.javaClass)
 }
 
-public actual val currentPlatform: TestPlatform get() = TestPlatform.JVM
+actual val currentPlatform: TestPlatform get() = TestPlatform.JVM
 
 actual object NForAlgorithmComplexity {
     actual val O_N: Int = 1_000_000
diff --git a/core/nativeTest/src/testUtilsNative.kt b/core/nativeTest/src/testUtilsNative.kt
@@ -7,7 +7,7 @@ package tests
 
 import kotlin.test.assertTrue
 
-public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
+actual fun assertTypeEquals(expected: Any?, actual: Any?) {
     if (expected != null && actual != null) {
         assertTrue(expected::class.isInstance(actual) || actual::class.isInstance(expected),
                 "Expected: $expected,  Actual: $actual")
@@ -16,7 +16,7 @@ public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
     }
 }
 
-public actual val currentPlatform: TestPlatform get() = TestPlatform.Native
+actual val currentPlatform: TestPlatform get() = TestPlatform.Native
 
 actual object NForAlgorithmComplexity {
     actual val O_N: Int = 100_000
diff --git a/core/wasmTest/src/testUtilsJs.kt b/core/wasmTest/src/testUtilsJs.kt
@@ -7,7 +7,7 @@ package tests
 
 import kotlin.test.assertTrue
 
-public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
+actual fun assertTypeEquals(expected: Any?, actual: Any?) {
     if (expected != null && actual != null) {
         assertTrue(expected::class.isInstance(actual) || actual::class.isInstance(expected),
             "Expected: $expected,  Actual: $actual")
@@ -16,7 +16,7 @@ public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
     }
 }
 
-public actual val currentPlatform: TestPlatform get() = TestPlatform.Wasm
+actual val currentPlatform: TestPlatform get() = TestPlatform.Wasm
 
 actual object NForAlgorithmComplexity {
     actual val O_N: Int = 500_000

Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,17 @@ internal fun <K, V> MutableMap<K, V>.remove(key: K, value: V): Boolean =`
`20`	`20`	`false`
`21`	`21`	`}`
`22`	`22`
`23`		`-public expect fun assertTypeEquals(expected: Any?, actual: Any?)`
	`23`	`+expect fun assertTypeEquals(expected: Any?, actual: Any?)`
`24`	`24`
`25`		`-public enum class TestPlatform {`
	`25`	`+enum class TestPlatform {`
`26`	`26`	`JVM,`
`27`	`27`	`JS,`
`28`	`28`	`Native,`
`29`	`29`	`Wasm,`
`30`	`30`	`}`
`31`		`-public expect val currentPlatform: TestPlatform`
	`31`	`+expect val currentPlatform: TestPlatform`
`32`	`32`
`33`		`-public inline fun testOn(platform: TestPlatform, action: () -> Unit) {`
	`33`	`+inline fun testOn(platform: TestPlatform, action: () -> Unit) {`
`34`	`34`	`if (platform == currentPlatform) action()`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package tests`
`7`	`7`
`8`	`8`	`import kotlin.test.assertTrue`
`9`	`9`
`10`		`-public actual fun assertTypeEquals(expected: Any?, actual: Any?) {`
	`10`	`+actual fun assertTypeEquals(expected: Any?, actual: Any?) {`
`11`	`11`	`if (expected != null && actual != null) {`
`12`	`12`	`assertTrue(expected::class.isInstance(actual) \|\| actual::class.isInstance(expected),`
`13`	`13`	`"Expected: $expected, Actual: $actual")`
`@@ -16,7 +16,7 @@ public actual fun assertTypeEquals(expected: Any?, actual: Any?) {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-public actual val currentPlatform: TestPlatform get() = TestPlatform.Native`
	`19`	`+actual val currentPlatform: TestPlatform get() = TestPlatform.Native`
`20`	`20`
`21`	`21`	`actual object NForAlgorithmComplexity {`
`22`	`22`	`actual val O_N: Int = 100_000`