fix flatten module order error

Fixes gh-1998
InsertKoinIO · Oct 23, 2024 · 05c7a11 · 05c7a11
1 parent 74f9198
commit 05c7a11
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/Module.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/Module.kt
@@ -251,7 +251,7 @@ fun flatten(modules: List<Module>): Set<Module> {
         }
 
         // Add all the included modules to the stack if they haven't been visited yet.
-        for (module in current.includedModules) {
+        for (module in current.includedModules.asReversed()) {
             if (module !in flatten) {
                 stack += module
             }

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/FlattenTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/FlattenTest.kt
@@ -2,6 +2,7 @@ package org.koin.dsl
 
 import org.koin.core.module.flatten
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class FlattenTest {
@@ -12,17 +13,17 @@ class FlattenTest {
         val m2 = module { }
         val modules = m1 + m2
 
-        assertTrue { flatten(modules) == setOf(m1, m2) }
+        assertSetEqualsInOrder(flatten(modules), setOf(m1, m2))
     }
 
     @Test
     fun test_flatten_common() {
         val m1 = module { }
         val m2 = module { }
-        val m3 = module { includes(m1) }
+        val m3 = module { includes(m1, m2) }
         val modules = m3 + m2
 
-        assertTrue { flatten(modules) == setOf(m3, m1, m2) }
+        assertSetEqualsInOrder(flatten(modules), setOf(m3, m1, m2))
     }
 
     @Test
@@ -32,7 +33,7 @@ class FlattenTest {
         val m3 = module { includes(m1) }
         val modules = m3 + m2
 
-        assertTrue { flatten(modules) == setOf(m3, m1, m2) }
+        assertSetEqualsInOrder(flatten(modules), setOf(m3, m1, m2))
     }
 
     @Test
@@ -43,6 +44,10 @@ class FlattenTest {
         val m3 = module { includes(m1) }
         val modules = m3 + m2
 
-        assertTrue { flatten(modules) == setOf(m3, m1, m4, m2) }
+        assertSetEqualsInOrder(flatten(modules), setOf(m3, m1, m4, m2))
+    }
+
+    private fun assertSetEqualsInOrder(actual: Set<Any>, expected: Set<Any>) {
+        assertEquals(expected.toList(), actual.toList())
     }
 }