Skip to content

Commit 3b36628

Browse files
zepfredzepfred
authored
chore: refactor test data models (#1552)
1 parent 2456d9d commit 3b36628

File tree

920 files changed

+4114
-4136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

920 files changed

+4114
-4136
lines changed

‎benchmark/src/test/java/ai/timefold/solver/benchmark/api/PlannerBenchmarkFactoryTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import ai.timefold.solver.core.api.solver.DivertingClassLoader;
2121
import ai.timefold.solver.core.config.phase.custom.CustomPhaseConfig;
2222
import ai.timefold.solver.core.config.solver.SolverConfig;
23-
import ai.timefold.solver.core.impl.testdata.domain.TestdataEntity;
24-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
25-
import ai.timefold.solver.core.impl.testdata.domain.TestdataValue;
26-
import ai.timefold.solver.core.impl.testdata.util.PlannerTestUtils;
27-
import ai.timefold.solver.core.impl.testutil.NoChangeCustomPhaseCommand;
23+
import ai.timefold.solver.core.testdomain.TestdataEntity;
24+
import ai.timefold.solver.core.testdomain.TestdataSolution;
25+
import ai.timefold.solver.core.testdomain.TestdataValue;
26+
import ai.timefold.solver.core.testutil.NoChangeCustomPhaseCommand;
27+
import ai.timefold.solver.core.testutil.PlannerTestUtils;
2828

2929
import org.jspecify.annotations.NonNull;
3030
import org.junit.jupiter.api.BeforeAll;

‎benchmark/src/test/java/ai/timefold/solver/benchmark/config/PlannerBenchmarkConfigTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import ai.timefold.solver.benchmark.impl.io.PlannerBenchmarkConfigIO;
1515
import ai.timefold.solver.core.impl.io.jaxb.TimefoldXmlSerializationException;
16-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
16+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1717
import ai.timefold.solver.jackson.impl.domain.solution.JacksonSolutionFileIO;
1818
import ai.timefold.solver.persistence.common.api.domain.solution.RigidTestdataSolutionFileIO;
1919
import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO;
@@ -68,8 +68,8 @@ void readAndValidateInvalidBenchmarkConfig_failsIndicatingTheIssue() {
6868
+ " <name>Entity Tabu Search</name>\n"
6969
+ " <solver>\n"
7070
// Intentionally wrong to simulate a typo.
71-
+ " <solutionKlazz>ai.timefold.solver.core.impl.testdata.domain.TestdataSolution</solutionKlazz>\n"
72-
+ " <entityClass>ai.timefold.solver.core.impl.testdata.domain.TestdataEntity</entityClass>\n"
71+
+ " <solutionKlazz>ai.timefold.solver.core.testdomain.TestdataSolution</solutionKlazz>\n"
72+
+ " <entityClass>ai.timefold.solver.core.testdomain.TestdataEntity</entityClass>\n"
7373
+ " </solver>\n"
7474
+ " <problemBenchmarks>\n"
7575
+ " <solutionFileIOClass>" + TestdataSolutionFileIO.class.getCanonicalName() + "</solutionFileIOClass>\n"

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/DefaultPlannerBenchmarkTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import ai.timefold.solver.benchmark.impl.result.PlannerBenchmarkResult;
1616
import ai.timefold.solver.benchmark.impl.result.SolverBenchmarkResult;
1717
import ai.timefold.solver.core.config.solver.SolverConfig;
18-
import ai.timefold.solver.core.impl.testdata.domain.TestdataEntity;
19-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
20-
import ai.timefold.solver.core.impl.testdata.util.PlannerTestUtils;
18+
import ai.timefold.solver.core.testdomain.TestdataEntity;
19+
import ai.timefold.solver.core.testdomain.TestdataSolution;
20+
import ai.timefold.solver.core.testutil.PlannerTestUtils;
2121

2222
import org.junit.jupiter.api.Test;
2323

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/ranking/ResilientScoreComparatorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ai.timefold.solver.benchmark.impl.ranking;
22

3-
import static ai.timefold.solver.core.impl.testdata.util.PlannerAssert.assertCompareToOrder;
3+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCompareToOrder;
44

55
import java.util.Comparator;
66

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/ranking/ScoreSubSingleBenchmarkRankingComparatorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ai.timefold.solver.benchmark.impl.ranking;
22

3-
import static ai.timefold.solver.core.impl.testdata.util.PlannerAssert.assertCompareToOrder;
3+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCompareToOrder;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.when;
66

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/ranking/TotalRankSolverRankingWeightFactoryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ai.timefold.solver.benchmark.impl.ranking;
22

3-
import static ai.timefold.solver.core.impl.testdata.util.PlannerAssert.assertCompareToEquals;
4-
import static ai.timefold.solver.core.impl.testdata.util.PlannerAssert.assertCompareToOrder;
3+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCompareToEquals;
4+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCompareToOrder;
55
import static org.mockito.Mockito.mock;
66

77
import java.util.ArrayList;

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/ranking/TotalScoreSingleBenchmarkRankingComparatorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ai.timefold.solver.benchmark.impl.ranking;
22

3-
import static ai.timefold.solver.core.impl.testdata.util.PlannerAssert.assertCompareToOrder;
3+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCompareToOrder;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.when;
66

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/ranking/TotalScoreSolverRankingComparatorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ai.timefold.solver.benchmark.impl.ranking;
22

3-
import static ai.timefold.solver.core.impl.testdata.util.PlannerAssert.assertCompareToEquals;
4-
import static ai.timefold.solver.core.impl.testdata.util.PlannerAssert.assertCompareToOrder;
3+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCompareToEquals;
4+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCompareToOrder;
55
import static org.mockito.Mockito.mock;
66

77
import java.util.ArrayList;

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/ranking/WorstScoreSolverRankingComparatorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ai.timefold.solver.benchmark.impl.ranking;
22

3-
import static ai.timefold.solver.core.impl.testdata.util.PlannerAssert.assertCompareToEquals;
4-
import static ai.timefold.solver.core.impl.testdata.util.PlannerAssert.assertCompareToOrder;
3+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCompareToEquals;
4+
import static ai.timefold.solver.core.testutil.PlannerAssert.assertCompareToOrder;
55
import static org.mockito.Mockito.mock;
66

77
import java.util.ArrayList;

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/result/PlannerBenchmarkResultTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import ai.timefold.solver.core.config.solver.SolverConfig;
2323
import ai.timefold.solver.core.config.solver.random.RandomType;
2424
import ai.timefold.solver.core.impl.heuristic.selector.common.nearby.NearbyDistanceMeter;
25-
import ai.timefold.solver.core.impl.testdata.domain.chained.TestdataChainedEntity;
26-
import ai.timefold.solver.core.impl.testdata.domain.chained.TestdataChainedSolution;
25+
import ai.timefold.solver.core.testdomain.chained.TestdataChainedEntity;
26+
import ai.timefold.solver.core.testdomain.chained.TestdataChainedSolution;
2727

2828
import org.apache.commons.io.IOUtils;
2929
import org.junit.jupiter.api.Test;

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/AbstractSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import ai.timefold.solver.benchmark.impl.result.SingleBenchmarkResult;
3030
import ai.timefold.solver.benchmark.impl.result.SolverBenchmarkResult;
3131
import ai.timefold.solver.benchmark.impl.result.SubSingleBenchmarkResult;
32-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
32+
import ai.timefold.solver.core.testdomain.TestdataSolution;
3333

3434
import org.assertj.core.api.SoftAssertions;
3535
import org.junit.jupiter.api.Test;

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/bestscore/BestScoreSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import ai.timefold.solver.benchmark.impl.result.SubSingleBenchmarkResult;
88
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
99
import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
10-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
10+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1111

1212
import org.assertj.core.api.SoftAssertions;
1313

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/bestsolutionmutation/BestSolutionMutationSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import ai.timefold.solver.benchmark.impl.result.SubSingleBenchmarkResult;
88
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
9-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
9+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1010

1111
import org.assertj.core.api.SoftAssertions;
1212

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/memoryuse/MemoryUseSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import ai.timefold.solver.benchmark.impl.result.SubSingleBenchmarkResult;
88
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
9-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
9+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1010

1111
import org.assertj.core.api.SoftAssertions;
1212

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/movecountperstep/MoveCountPerStepSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import ai.timefold.solver.benchmark.impl.result.SubSingleBenchmarkResult;
88
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
9-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
9+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1010

1111
import org.assertj.core.api.SoftAssertions;
1212

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/movecountpertype/MoveCountPerTypeSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import ai.timefold.solver.benchmark.impl.result.SubSingleBenchmarkResult;
1818
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
1919
import ai.timefold.solver.benchmark.impl.statistic.SubSingleStatistic;
20-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
20+
import ai.timefold.solver.core.testdomain.TestdataSolution;
2121

2222
import org.assertj.core.api.SoftAssertions;
2323
import org.junit.jupiter.api.Test;

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/moveevaluationspeed/MoveEvaluationSpeedSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
2020
import ai.timefold.solver.benchmark.impl.statistic.SubSingleStatistic;
2121
import ai.timefold.solver.benchmark.impl.statistic.common.LongStatisticPoint;
22-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
22+
import ai.timefold.solver.core.testdomain.TestdataSolution;
2323

2424
import org.assertj.core.api.SoftAssertions;
2525
import org.junit.jupiter.api.Test;

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/scorecalculationspeed/ScoreCalculationSpeedSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
1919
import ai.timefold.solver.benchmark.impl.statistic.SubSingleStatistic;
2020
import ai.timefold.solver.benchmark.impl.statistic.common.LongStatisticPoint;
21-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
21+
import ai.timefold.solver.core.testdomain.TestdataSolution;
2222

2323
import org.assertj.core.api.SoftAssertions;
2424
import org.junit.jupiter.api.Test;

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/stepscore/StepScoreSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import ai.timefold.solver.benchmark.impl.result.SubSingleBenchmarkResult;
88
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
99
import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
10-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
10+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1111

1212
import org.assertj.core.api.SoftAssertions;
1313

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/subsingle/constraintmatchtotalbestscore/ConstraintMatchTotalBestScoreSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
1010
import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
1111
import ai.timefold.solver.core.api.score.constraint.ConstraintRef;
12-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
12+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1313

1414
import org.assertj.core.api.SoftAssertions;
1515

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/subsingle/constraintmatchtotalstepscore/ConstraintMatchTotalStepScoreSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
1010
import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
1111
import ai.timefold.solver.core.api.score.constraint.ConstraintRef;
12-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
12+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1313

1414
import org.assertj.core.api.SoftAssertions;
1515

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/subsingle/pickedmovetypebestscore/PickedMoveTypeBestScoreSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import ai.timefold.solver.benchmark.impl.result.SubSingleBenchmarkResult;
88
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
99
import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
10-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
10+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1111

1212
import org.assertj.core.api.SoftAssertions;
1313

‎benchmark/src/test/java/ai/timefold/solver/benchmark/impl/statistic/subsingle/pickedmovetypestepscore/PickedMoveTypeStepScoreSubSingleStatisticTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import ai.timefold.solver.benchmark.impl.result.SubSingleBenchmarkResult;
88
import ai.timefold.solver.benchmark.impl.statistic.AbstractSubSingleStatisticTest;
99
import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
10-
import ai.timefold.solver.core.impl.testdata.domain.TestdataSolution;
10+
import ai.timefold.solver.core.testdomain.TestdataSolution;
1111

1212
import org.assertj.core.api.SoftAssertions;
1313

‎benchmark/src/test/resources/ai/timefold/solver/benchmark/api/classloaderTestdataBenchmarkConfig.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
</problemBenchmarks>
1010
<solver>
1111
<!-- Using these classnames doesn't work because the className still differs from class.getName()-->
12-
<!--<solutionClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.domain.TestdataSolution</solutionClass>-->
13-
<!--<entityClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.domain.TestdataEntity</entityClass>-->
14-
<solutionClass>ai.timefold.solver.core.impl.testdata.domain.TestdataSolution</solutionClass>
15-
<entityClass>ai.timefold.solver.core.impl.testdata.domain.TestdataEntity</entityClass>
12+
<!--<solutionClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.testdomain.TestdataSolution</solutionClass>-->
13+
<!--<entityClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.testdomain.TestdataEntity</entityClass>-->
14+
<solutionClass>ai.timefold.solver.core.testdomain.TestdataSolution</solutionClass>
15+
<entityClass>ai.timefold.solver.core.testdomain.TestdataEntity</entityClass>
1616

1717
<!-- Score configuration -->
1818
<scoreDirectorFactory>
1919
<!-- Using these classnames doesn't work because the className still differs from class.getName()-->
20-
<!--<constraintProviderClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.domain.TestdataConstraintProvider</constraintProviderClass>-->
21-
<constraintProviderClass>ai.timefold.solver.core.impl.testdata.domain.TestdataConstraintProvider</constraintProviderClass>
20+
<!--<constraintProviderClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.testdomain.TestdataConstraintProvider</constraintProviderClass>-->
21+
<constraintProviderClass>ai.timefold.solver.core.testdomain.TestdataConstraintProvider</constraintProviderClass>
2222
</scoreDirectorFactory>
2323
<termination>
2424
<secondsSpentLimit>0</secondsSpentLimit>

‎benchmark/src/test/resources/ai/timefold/solver/benchmark/api/classloaderTestdataBenchmarkConfigTemplate.xml.ftl

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
</problemBenchmarks>
1111
<solver>
1212
<!-- Using these classnames doesn't work because the className still differs from class.getName()-->
13-
<!--<solutionClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.domain.TestdataSolution</solutionClass>-->
14-
<!--<entityClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.domain.TestdataEntity</entityClass>-->
15-
<solutionClass>ai.timefold.solver.core.impl.testdata.domain.TestdataSolution</solutionClass>
16-
<entityClass>ai.timefold.solver.core.impl.testdata.domain.TestdataEntity</entityClass>
13+
<!--<solutionClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.testdomain.TestdataSolution</solutionClass>-->
14+
<!--<entityClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.testdomain.TestdataEntity</entityClass>-->
15+
<solutionClass>ai.timefold.solver.core.testdomain.TestdataSolution</solutionClass>
16+
<entityClass>ai.timefold.solver.core.testdomain.TestdataEntity</entityClass>
1717

1818
<!-- Score configuration -->
1919
<scoreDirectorFactory>
2020
<!-- Using these classnames doesn't work because the className still differs from class.getName()-->
21-
<!-- <constraintProviderClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.domain.TestdataConstraintProvider</constraintProviderClass>-->
22-
<constraintProviderClass>ai.timefold.solver.core.impl.testdata.domain.TestdataConstraintProvider</constraintProviderClass>
21+
<!-- <constraintProviderClass>divertThroughClassLoader.ai.timefold.solver.core.impl.testdata.testdomain.TestdataConstraintProvider</constraintProviderClass>-->
22+
<constraintProviderClass>ai.timefold.solver.core.testdomain.TestdataConstraintProvider</constraintProviderClass>
2323
</scoreDirectorFactory>
2424
<termination>
2525
<secondsSpentLimit>0</secondsSpentLimit>

‎benchmark/src/test/resources/ai/timefold/solver/benchmark/api/testdataBenchmarkConfig.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<inputSolutionFile>target/test/benchmarkTest/input.xml</inputSolutionFile>
99
</problemBenchmarks>
1010
<solver>
11-
<solutionClass>ai.timefold.solver.core.impl.testdata.domain.TestdataSolution</solutionClass>
12-
<entityClass>ai.timefold.solver.core.impl.testdata.domain.TestdataEntity</entityClass>
11+
<solutionClass>ai.timefold.solver.core.testdomain.TestdataSolution</solutionClass>
12+
<entityClass>ai.timefold.solver.core.testdomain.TestdataEntity</entityClass>
1313
<scoreDirectorFactory>
14-
<easyScoreCalculatorClass>ai.timefold.solver.core.impl.testdata.domain.TestdataEasyScoreCalculator</easyScoreCalculatorClass>
14+
<easyScoreCalculatorClass>ai.timefold.solver.core.testdomain.TestdataEasyScoreCalculator</easyScoreCalculatorClass>
1515
</scoreDirectorFactory>
1616
<termination>
1717
<secondsSpentLimit>0</secondsSpentLimit>

‎benchmark/src/test/resources/ai/timefold/solver/benchmark/api/testdataBenchmarkConfigTemplate.xml.ftl

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<inputSolutionFile>target/test/benchmarkTest/input.xml</inputSolutionFile>
1010
</problemBenchmarks>
1111
<solver>
12-
<solutionClass>ai.timefold.solver.core.impl.testdata.domain.TestdataSolution</solutionClass>
13-
<entityClass>ai.timefold.solver.core.impl.testdata.domain.TestdataEntity</entityClass>
12+
<solutionClass>ai.timefold.solver.core.testdomain.TestdataSolution</solutionClass>
13+
<entityClass>ai.timefold.solver.core.testdomain.TestdataEntity</entityClass>
1414
<scoreDirectorFactory>
15-
<easyScoreCalculatorClass>ai.timefold.solver.core.impl.testdata.domain.TestdataEasyScoreCalculator</easyScoreCalculatorClass>
15+
<easyScoreCalculatorClass>ai.timefold.solver.core.testdomain.TestdataEasyScoreCalculator</easyScoreCalculatorClass>
1616
</scoreDirectorFactory>
1717
<termination>
1818
<secondsSpentLimit>0</secondsSpentLimit>

‎benchmark/src/test/resources/ai/timefold/solver/benchmark/config/testBenchmarkConfigWithNamespace.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
<solverBenchmark>
3030
<name>Entity Tabu Search</name>
3131
<solver>
32-
<solutionClass>ai.timefold.solver.core.impl.testdata.domain.TestdataSolution</solutionClass>
33-
<entityClass>ai.timefold.solver.core.impl.testdata.domain.TestdataEntity</entityClass>
32+
<solutionClass>ai.timefold.solver.core.testdomain.TestdataSolution</solutionClass>
33+
<entityClass>ai.timefold.solver.core.testdomain.TestdataEntity</entityClass>
3434
<scoreDirectorFactory>
35-
<constraintProviderClass>ai.timefold.solver.core.impl.testdata.domain.TestdataConstraintProvider</constraintProviderClass>
35+
<constraintProviderClass>ai.timefold.solver.core.testdomain.TestdataConstraintProvider</constraintProviderClass>
3636
</scoreDirectorFactory>
3737
<constructionHeuristic>
3838
<constructionHeuristicType>FIRST_FIT_DECREASING</constructionHeuristicType>
@@ -59,10 +59,10 @@
5959
<solverBenchmark>
6060
<name>Late Acceptance</name>
6161
<solver>
62-
<solutionClass>ai.timefold.solver.core.impl.testdata.domain.TestdataSolution</solutionClass>
63-
<entityClass>ai.timefold.solver.core.impl.testdata.domain.TestdataEntity</entityClass>
62+
<solutionClass>ai.timefold.solver.core.testdomain.TestdataSolution</solutionClass>
63+
<entityClass>ai.timefold.solver.core.testdomain.TestdataEntity</entityClass>
6464
<scoreDirectorFactory>
65-
<constraintProviderClass>ai.timefold.solver.core.impl.testdata.domain.TestdataConstraintProvider</constraintProviderClass>
65+
<constraintProviderClass>ai.timefold.solver.core.testdomain.TestdataConstraintProvider</constraintProviderClass>
6666
</scoreDirectorFactory>
6767
<constructionHeuristic>
6868
<constructionHeuristicType>FIRST_FIT</constructionHeuristicType>

0 commit comments

Comments
 (0)