removing executor, but better

robertfmurdock · Jul 19, 2023 · e4a15ce · e4a15ce
1 parent 6651217
commit e4a15ce
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/...greatrob/coupling/server/action/pairassignmentdocument/CreatePairCandidateReportAction.kt b/...greatrob/coupling/server/action/pairassignmentdocument/CreatePairCandidateReportAction.kt
@@ -7,14 +7,14 @@ import com.zegreatrob.coupling.model.pairassignmentdocument.TimeResultValue
 import com.zegreatrob.coupling.model.pairassignmentdocument.calculateTimeSinceLastPartnership
 import com.zegreatrob.coupling.model.pairassignmentdocument.pairOf
 import com.zegreatrob.coupling.model.player.Player
-import com.zegreatrob.testmints.action.async.SimpleSuspendAction
+import com.zegreatrob.testmints.action.annotation.ActionMint
 
+@ActionMint
 data class CreatePairCandidateReportAction(
     val player: Player,
     val history: List<PairAssignmentDocument>,
     val allPlayers: List<Player>,
-) : SimpleSuspendAction<CreatePairCandidateReportAction.Dispatcher, PairCandidateReport> {
-    override val performFunc = link(Dispatcher::perform)
+) {
 
     interface Dispatcher {
 

diff --git a/...in/com/zegreatrob/coupling/server/action/pairassignmentdocument/FindNewPairsActionTest.kt b/...in/com/zegreatrob/coupling/server/action/pairassignmentdocument/FindNewPairsActionTest.kt
@@ -11,7 +11,6 @@ import com.zegreatrob.minassert.assertIsEqualTo
 import com.zegreatrob.minspy.Spy
 import com.zegreatrob.minspy.SpyData
 import com.zegreatrob.minspy.spyFunction
-import com.zegreatrob.testmints.action.ExecutableActionExecutor
 import com.zegreatrob.testmints.async.asyncSetup
 import kotlinx.coroutines.channels.Channel
 import kotools.types.collection.notEmptyListOf
@@ -22,10 +21,7 @@ class FindNewPairsActionTest {
     interface FindNewPairsActionTestDispatcher :
         NextPlayerAction.Dispatcher<FindNewPairsActionTestDispatcher>,
         CreatePairCandidateReportListAction.Dispatcher<FindNewPairsActionTestDispatcher>,
-        CreatePairCandidateReportAction.Dispatcher {
-        override val execute: ExecutableActionExecutor<FindNewPairsActionTestDispatcher>
-            get() = TODO("Not yet implemented")
-    }
+        CreatePairCandidateReportAction.Dispatcher
 
     @Test
     fun withTwoPlayersEachShouldBeRemovedFromWheelBeforeEachPlay() = asyncSetup(object :

diff --git a/...t/kotlin/com/zegreatrob/coupling/server/action/pairassignmentdocument/GameExamplesTest.kt b/...t/kotlin/com/zegreatrob/coupling/server/action/pairassignmentdocument/GameExamplesTest.kt
@@ -41,7 +41,6 @@ class GameExamplesTest {
         override val wheel = this
         override val actionDispatcher = this
         override val cannon = ActionCannon(this)
-        override val execute = this
     }
 
     class WithUniformBadgesAndLongestTimeRule {

diff --git a/...in/com/zegreatrob/coupling/server/action/pairassignmentdocument/ShufflePairsActionTest.kt b/...in/com/zegreatrob/coupling/server/action/pairassignmentdocument/ShufflePairsActionTest.kt
@@ -14,7 +14,6 @@ import com.zegreatrob.coupling.model.player.Player
 import com.zegreatrob.coupling.stubmodel.stubPlayer
 import com.zegreatrob.coupling.testaction.StubCannon
 import com.zegreatrob.minassert.assertIsEqualTo
-import com.zegreatrob.testmints.action.ExecutableActionExecutor
 import com.zegreatrob.testmints.async.ScopeMint
 import com.zegreatrob.testmints.async.asyncSetup
 import kotlinx.coroutines.channels.Channel
@@ -29,10 +28,7 @@ class ShufflePairsActionTest {
         NextPlayerAction.Dispatcher<ShufflePairsActionInner>,
         CreatePairCandidateReportListAction.Dispatcher<ShufflePairsActionInner>,
         CreatePairCandidateReportAction.Dispatcher,
-        AssignPinsAction.Dispatcher {
-        override val execute: ExecutableActionExecutor<ShufflePairsActionInner>
-            get() = TODO("Not yet implemented")
-    }
+        AssignPinsAction.Dispatcher
 
     @Test
     fun willBuildAGameRunWithAllAvailablePlayersAndThenReturnTheResults() = asyncSetup(object :

diff --git a/...rc/commonTest/kotlin/com/zegreatrob/coupling/server/action/player/NextPlayerActionTest.kt b/...rc/commonTest/kotlin/com/zegreatrob/coupling/server/action/player/NextPlayerActionTest.kt
@@ -11,7 +11,6 @@ import com.zegreatrob.coupling.server.action.pairassignmentdocument.NextPlayerAc
 import com.zegreatrob.coupling.server.action.pairassignmentdocument.PairCandidateReport
 import com.zegreatrob.coupling.testaction.StubCannon
 import com.zegreatrob.minassert.assertIsEqualTo
-import com.zegreatrob.testmints.action.ExecutableActionExecutor
 import com.zegreatrob.testmints.async.ScopeMint
 import com.zegreatrob.testmints.async.asyncSetup
 import kotlinx.coroutines.channels.produce
@@ -53,8 +52,6 @@ class NextPlayerActionTest {
                 )
             },
         )
-        override val execute: ExecutableActionExecutor<CreatePairCandidateReportAction.Dispatcher>
-            get() = TODO("Not yet implemented")
     }) exercise {
         perform(NextPlayerAction(longestTimeSpin(players)))
     } verify { result ->