update tests for member/2, showing that 92 is fixed

tuProlog · Jun 20, 2020 · 3c2312f · 3c2312f
1 parent bc2fafa
commit 3c2312f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/CustomTheories.kt b/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/CustomTheories.kt
@@ -201,4 +201,20 @@ object CustomTheories {
             )
         }
     }
+
+    val memberGoalToSolution by lazy {
+        prolog {
+            ktListOf(
+                "member"("X", listOf("a", "b", "c")).hasSolutions(
+                    { yes("X" to "a") },
+                    { yes("X" to "b") },
+                    { yes("X" to "c") },
+                    { no() }
+                ),
+                "member"("f"("X"), listOf("a"(1), "b"(2), "c"(3))).hasSolutions(
+                    { no() }
+                )
+            )
+        }
+    }
 }
diff --git a/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTestImpl.kt b/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTestImpl.kt
@@ -8,6 +8,7 @@ import it.unibo.tuprolog.solve.CustomTheories.ifThenElse1ToSolution
 import it.unibo.tuprolog.solve.CustomTheories.ifThenElse2ToSolution
 import it.unibo.tuprolog.solve.CustomTheories.ifThenTheory1
 import it.unibo.tuprolog.solve.CustomTheories.ifThenTheory2
+import it.unibo.tuprolog.solve.CustomTheories.memberGoalToSolution
 import it.unibo.tuprolog.solve.PrologStandardExampleTheories.callStandardExampleTheory
 import it.unibo.tuprolog.solve.PrologStandardExampleTheories.callStandardExampleTheoryGoalsToSolution
 import it.unibo.tuprolog.solve.PrologStandardExampleTheories.catchAndThrowTheoryExample
@@ -855,26 +856,11 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver
         }
     }
 
-    private fun <T> ktListConcat(l1: List<T>, l2: List<T>): List<T> = l1 + l2
-
     override fun testMember() {
         prolog {
             val solver = solverFactory.solverWithDefaultBuiltins()
 
-            val constants = ktListOf("a", "b", "c")
-            val goal = "member"("X", constants.toTerm())
-
-            val solutions = solver.solve(goal, mediumDuration).toList()
-
-            assertSolutionEquals(
-                ktListConcat(
-                    constants.map { goal.yes("X" to it) },
-                    ktListOf(goal.no())
-                ),
-                solutions
-            )
-
-            assertEquals(constants.size + 1, solutions.size)
+            assertSolverSolutionsCorrect(solver, memberGoalToSolution, mediumDuration)
         }
     }
 

diff --git a/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/TestUtils.kt b/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/TestUtils.kt
@@ -19,6 +19,8 @@ import kotlin.test.fail
 
 private inline val loggingOn get() = false
 
+fun <T> ktListConcat(l1: List<T>, l2: List<T>): List<T> = l1 + l2
+
 /** Utility function to help writing tests; it creates a mapping between the receiver goal struct and the list of given solutions */
 fun <S : Solution> Struct.hasSolutions(vararg solution: Struct.() -> S) =
     this to solution.map { it() }