You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/10/09 20:24:07 UTC
[2/4] camel git commit: Upgrade Optaplanner to version 6.3.0.Final
Upgrade Optaplanner to version 6.3.0.Final
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c1cd0dd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c1cd0dd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c1cd0dd
Branch: refs/heads/master
Commit: 2c1cd0ddfb1f06b898d128f1e1941595d3f61e1d
Parents: ed601fb
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Oct 9 20:22:51 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Oct 9 20:22:51 2015 +0200
----------------------------------------------------------------------
.../component/optaplanner/OptaPlannerConsumerTest.java | 11 -----------
.../optaplanner/OptaPlannerDaemonSolverTest.java | 6 +++---
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1cd0dd/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java
index 2e86201..19fd296 100644
--- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java
+++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java
@@ -16,21 +16,10 @@
*/
package org.apache.camel.component.optaplanner;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.lang.ObjectUtils;
-import org.junit.Ignore;
import org.junit.Test;
-import org.optaplanner.core.impl.score.director.ScoreDirector;
-import org.optaplanner.core.impl.solver.ProblemFactChange;
import org.optaplanner.examples.cloudbalancing.domain.CloudBalance;
-import org.optaplanner.examples.cloudbalancing.domain.CloudComputer;
-import org.optaplanner.examples.cloudbalancing.domain.CloudProcess;
import org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1cd0dd/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java
----------------------------------------------------------------------
diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java
index 596fd16..663776f 100644
--- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java
+++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.junit.Test;
import org.optaplanner.core.impl.score.director.ScoreDirector;
import org.optaplanner.core.impl.solver.ProblemFactChange;
@@ -46,7 +46,7 @@ public class OptaPlannerDaemonSolverTest extends CamelTestSupport {
template.requestBody("direct:in", planningProblem);
getMockEndpoint("mock:result").assertIsSatisfied();
getMockEndpoint("mock:result").reset();
- getMockEndpoint("mock:result").setExpectedCount(1);
+ getMockEndpoint("mock:result").setExpectedCount(0);
template.requestBody("direct:in", new ProblemFactChange() {
@Override
@@ -77,7 +77,7 @@ public class OptaPlannerDaemonSolverTest extends CamelTestSupport {
getMockEndpoint("mock:result").assertIsSatisfied();
CloudBalance bestSolution = (CloudBalance) template.requestBody("direct:in", "foo");
- assertEquals(3, bestSolution.getComputerList().size());
+ assertEquals(4, bestSolution.getComputerList().size());
}
protected RouteBuilder createRouteBuilder() {
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1cd0dd/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2e17c54..636555c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -391,7 +391,7 @@
<openejb-version>4.7.2</openejb-version>
<openjpa-version>2.4.0</openjpa-version>
<openshift-java-client-version>2.7.0.Final</openshift-java-client-version>
- <optaplanner-version>6.2.0.Final</optaplanner-version>
+ <optaplanner-version>6.3.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>
<osgi-version>4.3.1</osgi-version>