From e6ca3b9871dbe48b4c560bedd907167798913dca Mon Sep 17 00:00:00 2001
From: Daan Vanden Bosch <daan.v.d.bosch@gmail.com>
Date: Sat, 4 Jun 2022 22:16:43 +0200
Subject: [PATCH] Moved dependency test to CellTests.

---
 .../kotlin/world/phantasmal/cell/CellTests.kt | 37 ++++++++++++++++--
 .../world/phantasmal/cell/DependencyTests.kt  | 38 -------------------
 2 files changed, 33 insertions(+), 42 deletions(-)
 delete mode 100644 cell/src/commonTest/kotlin/world/phantasmal/cell/DependencyTests.kt

diff --git a/cell/src/commonTest/kotlin/world/phantasmal/cell/CellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/CellTests.kt
index 1309a153..0f45ad2b 100644
--- a/cell/src/commonTest/kotlin/world/phantasmal/cell/CellTests.kt
+++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/CellTests.kt
@@ -1,18 +1,44 @@
 package world.phantasmal.cell
 
+import world.phantasmal.cell.test.CellTestSuite
 import world.phantasmal.core.disposable.use
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 /**
  * Test suite for all [Cell] implementations. There is a subclass of this suite for every [Cell]
  * implementation.
  */
-interface CellTests : DependencyTests {
-    override fun createProvider(): Provider
+interface CellTests : CellTestSuite {
+    fun createProvider(): Provider
+
+    /**
+     * Tests low level [Dependency] implementation.
+     */
+    @Test
+    fun correctly_emits_invalidation_notifications_to_its_dependents() = test {
+        val p = createProvider()
+        var dependencyInvalidatedCalled: Boolean
+
+        p.cell.addDependent(object : Dependent {
+            override fun dependencyInvalidated(dependency: Dependency<*>) {
+                assertEquals(p.cell, dependency)
+                dependencyInvalidatedCalled = true
+            }
+        })
+
+        repeat(5) { index ->
+            dependencyInvalidatedCalled = false
+
+            p.emit()
+
+            assertTrue(dependencyInvalidatedCalled, "repetition $index")
+        }
+    }
 
     @Test
     fun value_is_accessible_without_observers() = test {
@@ -202,10 +228,13 @@ interface CellTests : DependencyTests {
         assertEquals(mapped.value, observedValue)
     }
 
-    interface Provider : DependencyTests.Provider {
+    interface Provider {
         val cell: Cell<Any>
 
-        override val dependency: Dependency<*> get() = cell
+        /**
+         * Makes [cell] emit a change.
+         */
+        fun emit()
     }
 }
 
diff --git a/cell/src/commonTest/kotlin/world/phantasmal/cell/DependencyTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/DependencyTests.kt
deleted file mode 100644
index 0be4c127..00000000
--- a/cell/src/commonTest/kotlin/world/phantasmal/cell/DependencyTests.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package world.phantasmal.cell
-
-import world.phantasmal.cell.test.CellTestSuite
-import kotlin.test.*
-
-interface DependencyTests : CellTestSuite {
-    fun createProvider(): Provider
-
-    @Test
-    fun correctly_emits_invalidation_notifications_to_its_dependents() = test {
-        val p = createProvider()
-        var dependencyInvalidatedCalled: Boolean
-
-        p.dependency.addDependent(object : Dependent {
-            override fun dependencyInvalidated(dependency: Dependency<*>) {
-                assertEquals(p.dependency, dependency)
-                dependencyInvalidatedCalled = true
-            }
-        })
-
-        repeat(5) { index ->
-            dependencyInvalidatedCalled = false
-
-            p.emit()
-
-            assertTrue(dependencyInvalidatedCalled, "repetition $index")
-        }
-    }
-
-    interface Provider {
-        val dependency: Dependency<*>
-
-        /**
-         * Makes [dependency] call [Dependent.dependencyInvalidated] on its dependents.
-         */
-        fun emit()
-    }
-}