rename nonEmptyOr to toNonEmpty...Or

Author: balazstothofficial

…studios/nonEmptyCollection/nonEmptyOr.kt …udios/nonEmptyCollection/toNonEmptyOr.ktsrc/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/nonEmptyOr.kt renamed to src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/toNonEmptyOr.kt src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/nonEmptyOr.kt renamed to src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/toNonEmptyOr.kt

@@ -11,15 +11,14 @@ import com.quickbirdstudios.nonEmptyCollection.unsafe.toNonEmptyList
 import com.quickbirdstudios.nonEmptyCollection.unsafe.toNonEmptyMap
 import com.quickbirdstudios.nonEmptyCollection.unsafe.toNonEmptySet
 
-fun <T> List<T>.nonEmptyOr(
+fun <T> List<T>.toNonEmptyListOr(
     alternative: List<T>.() -> NonEmptyList<T>
 ) = if (isEmpty()) alternative() else toNonEmptyList()
 
-fun <T> Set<T>.nonEmptyOr(
+fun <T> Set<T>.toNonEmptySetOr(
     alternative: Set<T>.() -> NonEmptySet<T>
 ) = if (isEmpty()) alternative() else toNonEmptySet()
 
-fun <K, V> Map<K, V>.nonEmptyOr(
+fun <K, V> Map<K, V>.toNonEmptyMapOr(
     alternative: Map<K, V>.() -> NonEmptyMap<K, V>
 ) = if (isEmpty()) alternative() else toNonEmptyMap()
-

…ios/nonEmptyCollection/nonEmptyOrNull.kt …s/nonEmptyCollection/toNonEmptyOrNull.ktsrc/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/nonEmptyOrNull.kt renamed to src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/toNonEmptyOrNull.kt src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/nonEmptyOrNull.kt renamed to src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/toNonEmptyOrNull.kt

@@ -8,8 +8,8 @@ import com.quickbirdstudios.nonEmptyCollection.unsafe.toNonEmptyList
 import com.quickbirdstudios.nonEmptyCollection.unsafe.toNonEmptyMap
 import com.quickbirdstudios.nonEmptyCollection.unsafe.toNonEmptySet
 
-fun <T> List<T>.nonEmptyOrNull() = if (isEmpty()) null else toNonEmptyList()
+fun <T> List<T>.toNonEmptyListOrNull() = if (isEmpty()) null else toNonEmptyList()
 
-fun <T> Set<T>.nonEmptyOrNull() = if (isEmpty()) null else toNonEmptySet()
+fun <T> Set<T>.toNonEmptyMapOrNull() = if (isEmpty()) null else toNonEmptySet()
 
-fun <K, V> Map<K, V>.nonEmptyOrNull() = if (isEmpty()) null else toNonEmptyMap()
+fun <K, V> Map<K, V>.toNonEmptyMapOrNull() = if (isEmpty()) null else toNonEmptyMap()

src/jvmTest/kotlin/com/quickbirdstudios/nonEmptyCollection/NonEmptyOrNullTest.kt

@@ -0,0 +1,29 @@
+package com.quickbirdstudios.nonEmptyCollection
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+class ToNonEmptyOrNullTest {
+    @Test
+    fun toNonEmptyOrNull_null() {
+        val list = listOf<Int>()
+        val set = setOf<Int>()
+        val map = mapOf<Int, String>()
+
+        assertNull(list.toNonEmptyListOrNull())
+        assertNull(set.toNonEmptyMapOrNull())
+        assertNull(map.toNonEmptyMapOrNull())
+    }
+
+    @Test
+    fun toNonEmptyOrNull_not_null() {
+        val list = listOf(33, 44, 34543, -99)
+        val set = setOf(-23, 34, 4)
+        val map = mapOf(69 to "430", -12 to "Hallo")
+
+        assertEquals<List<Int>?>(list, list.toNonEmptyListOrNull())
+        assertEquals<Set<Int>?>(set, set.toNonEmptyMapOrNull())
+        assertEquals<Map<Int, String>?>(map, map.toNonEmptyMapOrNull())
+    }
+}

src/jvmTest/kotlin/com/quickbirdstudios/nonEmptyCollection/ToNonEmptyOrNullTest.kt

@@ -6,9 +6,9 @@ import com.quickbirdstudios.nonEmptyCollection.set.nonEmptySetOf
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class NonEmptyOrTest {
+class ToNonEmptyOrTest {
     @Test
-    fun nonEmptyOr_alternative() {
+    fun toNonEmptyOr_alternative() {
         val alternativeList = nonEmptyListOf(1, 2, 4)
         val list = listOf<Int>()
 
@@ -18,13 +18,13 @@ class NonEmptyOrTest {
         val alternativeMap = nonEmptyMapOf(1 to "3", 2 to "rrr", 4 to "sfgfdgdf")
         val map = mapOf<Int, String>()
 
-        assertEquals(alternativeList, list.nonEmptyOr { alternativeList })
-        assertEquals(alternativeSet, set.nonEmptyOr { alternativeSet })
-        assertEquals(alternativeMap, map.nonEmptyOr { alternativeMap })
+        assertEquals(alternativeList, list.toNonEmptyListOr { alternativeList })
+        assertEquals(alternativeSet, set.toNonEmptySetOr { alternativeSet })
+        assertEquals(alternativeMap, map.toNonEmptyMapOr { alternativeMap })
     }
 
     @Test
-    fun nonEmptyOr_notAlternative() {
+    fun toNonEmptyOr_notAlternative() {
         val alternativeList = nonEmptyListOf(1, 2, 4)
         val list = listOf(45, 54, 666)
 
@@ -34,8 +34,8 @@ class NonEmptyOrTest {
         val alternativeMap = nonEmptyMapOf(1 to "3", 2 to "rrr", 4 to "sfgfdgdf")
         val map = mapOf(69 to "420")
 
-        assertEquals(list, list.nonEmptyOr { alternativeList })
-        assertEquals(set, set.nonEmptyOr { alternativeSet })
-        assertEquals(map, map.nonEmptyOr { alternativeMap })
+        assertEquals(list, list.toNonEmptyListOr { alternativeList })
+        assertEquals(set, set.toNonEmptySetOr { alternativeSet })
+        assertEquals(map, map.toNonEmptyMapOr { alternativeMap })
     }
 }