Skip to content

Commit 28728bc

Browse files
committed
Fix unrelated test
1 parent 58df663 commit 28728bc

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
package ai.timefold.solver.core.impl.constructionheuristic;
22

3-
import static ai.timefold.solver.core.config.solver.PreviewFeature.DECLARATIVE_SHADOW_VARIABLES;
4-
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCode;
5-
import static org.assertj.core.api.Assertions.assertThat;
6-
import static org.assertj.core.api.Assertions.assertThatCode;
7-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
8-
import static org.assertj.core.api.SoftAssertions.assertSoftly;
9-
10-
import java.util.ArrayList;
11-
import java.util.Arrays;
12-
import java.util.Collections;
13-
import java.util.List;
14-
import java.util.concurrent.atomic.AtomicLong;
15-
163
import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
174
import ai.timefold.solver.core.api.solver.Solver;
185
import ai.timefold.solver.core.api.solver.SolverFactory;
@@ -53,10 +40,21 @@
5340
import ai.timefold.solver.core.testdomain.valuerange.entityproviding.unassignedvar.TestdataAllowsUnassignedEntityProvidingSolution;
5441
import ai.timefold.solver.core.testutil.AbstractMeterTest;
5542
import ai.timefold.solver.core.testutil.PlannerTestUtils;
56-
43+
import io.micrometer.core.instrument.Metrics;
5744
import org.junit.jupiter.api.Test;
5845

59-
import io.micrometer.core.instrument.Metrics;
46+
import java.util.ArrayList;
47+
import java.util.Arrays;
48+
import java.util.Collections;
49+
import java.util.List;
50+
import java.util.concurrent.atomic.AtomicLong;
51+
52+
import static ai.timefold.solver.core.config.solver.PreviewFeature.DECLARATIVE_SHADOW_VARIABLES;
53+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCode;
54+
import static org.assertj.core.api.Assertions.assertThat;
55+
import static org.assertj.core.api.Assertions.assertThatCode;
56+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
57+
import static org.assertj.core.api.SoftAssertions.assertSoftly;
6058

6159
class DefaultConstructionHeuristicPhaseTest extends AbstractMeterTest {
6260

@@ -365,7 +363,8 @@ void solveWithEntityValueRangeBasicVariable() {
365363
@Test
366364
void solveWithEntityValueRangeListVariable() {
367365
var solverConfig = PlannerTestUtils
368-
.buildSolverConfig(TestdataListEntityProvidingSolution.class, TestdataListEntityProvidingEntity.class)
366+
.buildSolverConfig(TestdataListEntityProvidingSolution.class, TestdataListEntityProvidingEntity.class,
367+
TestdataListEntityProvidingValue.class)
369368
.withEasyScoreCalculatorClass(TestdataListEntityProvidingScoreCalculator.class)
370369
.withPhases(new ConstructionHeuristicPhaseConfig());
371370

@@ -381,8 +380,10 @@ void solveWithEntityValueRangeListVariable() {
381380
var bestSolution = PlannerTestUtils.solve(solverConfig, solution, true);
382381
assertThat(bestSolution).isNotNull();
383382
// Only one entity should provide the value list and assign the values.
384-
assertThat(bestSolution.getEntityList().get(0).getValueList()).hasSameElementsAs(List.of(value1, value2));
385-
assertThat(bestSolution.getEntityList().get(1).getValueList()).hasSameElementsAs(List.of(value3));
383+
assertThat(bestSolution.getEntityList().get(0).getValueList().stream().map(TestdataListEntityProvidingValue::getCode))
384+
.hasSameElementsAs(List.of("v1", "v2"));
385+
assertThat(bestSolution.getEntityList().get(1).getValueList().stream().map(TestdataListEntityProvidingValue::getCode))
386+
.hasSameElementsAs(List.of("v3"));
386387
}
387388

388389
@Test

0 commit comments

Comments
 (0)