Fix merge conflict from rebase

kiegroup · Oct 23, 2018 · 585a749 · 585a749
1 parent a14bc74
commit 585a749
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/...re/src/test/java/org/optaplanner/core/impl/score/director/easy/EasyScoreDirectorTest.java b/...re/src/test/java/org/optaplanner/core/impl/score/director/easy/EasyScoreDirectorTest.java
@@ -20,12 +20,9 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.mockito.AdditionalAnswers;
 import org.optaplanner.core.api.score.buildin.simple.SimpleScore;
 import org.optaplanner.core.config.score.trend.InitializingScoreTrendLevel;
 import org.optaplanner.core.impl.domain.solution.descriptor.SolutionDescriptor;
-import org.optaplanner.core.impl.score.director.InnerScoreDirector;
-import org.optaplanner.core.impl.score.director.drools.DroolsScoreDirector;
 import org.optaplanner.core.impl.score.trend.InitializingScoreTrend;
 import org.optaplanner.core.impl.testdata.domain.TestdataValue;
 import org.optaplanner.core.impl.testdata.domain.shadow.corrupted.TestdataCorruptedShadowedEntity;
@@ -59,8 +56,8 @@ private EasyScoreDirectorFactory<Object> mockEasyScoreDirectorFactory() {
     @Test
     public void shadowVariableCorruption() {
         EasyScoreDirectorFactory<TestdataCorruptedShadowedSolution> scoreDirectorFactory =
-                new EasyScoreDirectorFactory<>((EasyScoreCalculator<TestdataCorruptedShadowedSolution>) (solution_) -> SimpleScore.valueOf(0));
-        scoreDirectorFactory.setSolutionDescriptor(TestdataCorruptedShadowedSolution.buildSolutionDescriptor());
+                new EasyScoreDirectorFactory<>(TestdataCorruptedShadowedSolution.buildSolutionDescriptor(),
+                        (EasyScoreCalculator<TestdataCorruptedShadowedSolution>) (solution_) -> SimpleScore.valueOf(0));
         scoreDirectorFactory.setInitializingScoreTrend(
                 InitializingScoreTrend.buildUniformTrend(InitializingScoreTrendLevel.ONLY_DOWN, 1));
         EasyScoreDirector<TestdataCorruptedShadowedSolution> scoreDirector = scoreDirectorFactory.buildScoreDirector(false, false);

diff --git a/...planner/core/impl/testdata/domain/shadow/corrupted/TestdataCorruptedShadowedSolution.java b/...planner/core/impl/testdata/domain/shadow/corrupted/TestdataCorruptedShadowedSolution.java
@@ -31,7 +31,7 @@
 @PlanningSolution
 public class TestdataCorruptedShadowedSolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataCorruptedShadowedSolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(TestdataCorruptedShadowedSolution.class,
                 TestdataCorruptedShadowedEntity.class);
     }