chore: address more comments

Author: zepfred

core/src/test/java/ai/timefold/solver/core/impl/constructionheuristic/DefaultConstructionHeuristicPhaseTest.java

@@ -511,27 +511,25 @@ void solvePinnedAndUnassignedWithListAndBasicVariables() {
         assertThat(solution.getEntityList().get(1).getValueList()).isEmpty();
 
         // Pin partially the first entity list
-        problem = TestdataUnassignedListMultiVarSolution.generateUninitializedSolution(2, 3, 2);
+        problem = TestdataUnassignedListMultiVarSolution.generateUninitializedSolution(2, 4, 2);
         problem.getEntityList().get(0).setPinnedIndex(2);
-        problem.getEntityList().get(0).setBasicValue(problem.getOtherValueList().get(0));
-        problem.getEntityList().get(0).setSecondBasicValue(problem.getOtherValueList().get(0));
         problem.getEntityList().get(0).setValueList(problem.getValueList().subList(1, 3));
         // Block values and make the basic variable unassigned
         problem.getOtherValueList().get(0).setBlocked(true);
         problem.getOtherValueList().get(1).setBlocked(true);
         solution = PlannerTestUtils.solve(solverConfig, problem);
-        // The basic value is set to null because the entire entity is not fixed.
         assertThat(solution.getEntityList().get(0).getBasicValue()).isNull();
         assertThat(solution.getEntityList().get(0).getSecondBasicValue()).isNotNull();
+        // The pinning index fixed the values 1 and 2. The only remaining option is values are 0 and 3.
+        // The score is bigger when the list size is 3
         assertThat(solution.getEntityList().get(0).getValueList()).hasSize(3);
-        // The pinning index fixed the values 1 and 2. The only remaining option is value 0.
         assertThat(solution.getEntityList().get(0).getValueList())
                 .hasSameElementsAs(
                         List.of(problem.getValueList().get(1), problem.getValueList().get(2), problem.getValueList().get(0)));
         assertThat(solution.getEntityList().get(1).getBasicValue()).isNull();
         assertThat(solution.getEntityList().get(1).getSecondBasicValue()).isNotNull();
-        assertThat(solution.getEntityList().get(1).getValueList()).isEmpty();
-
+        assertThat(solution.getEntityList().get(1).getValueList()).hasSize(1);
+        assertThat(solution.getEntityList().get(1).getValueList()).hasSameElementsAs(List.of(problem.getValueList().get(3)));
     }
 
     @Test

core/src/test/java/ai/timefold/solver/core/testdomain/multivar/list/singleentity/unassignedvar/TestdataUnassignedListMultiVarEasyScoreCalculator.java

@@ -22,6 +22,8 @@ public class TestdataUnassignedListMultiVarEasyScoreCalculator
             }
             if (entity.getValueList().stream().anyMatch(TestdataUnassignedListMultiVarValue::isBlocked)) {
                 score -= 10;
+            } else if (entity.getValueList().size() == 3) {
+                score += 2;
             } else {
                 score++;
             }