[camel] branch master updated: Fix unit tests

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 4328507  Fix unit tests
4328507 is described below

commit 43285079690bef3a98f848ea3ba19c75d8f710b8
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Feb 4 10:05:02 2019 +0100

    Fix unit tests
---
 .../src/test/java/org/apache/camel/language/simple/SimpleTest.java  | 6 +++---
 .../processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index bc87c4a..61bb294 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -564,9 +564,9 @@ public class SimpleTest extends LanguageTestSupport {
         assertExpression("${date:property.birthday:yyyyMMdd}", "19760622");
         assertExpression("${date:property.birthday+24h:yyyyMMdd}", "19760623");
 
-        assertExpression("date:exchangeProperty.birthday", 
propertyCalendar.getTime());
-        assertExpression("date:exchangeProperty.birthday:yyyyMMdd", 
"19760622");
-        assertExpression("date:exchangeProperty.birthday+24h:yyyyMMdd", 
"19760623");
+        assertExpression("${date:exchangeProperty.birthday}", 
propertyCalendar.getTime());
+        assertExpression("${date:exchangeProperty.birthday:yyyyMMdd}", 
"19760622");
+        assertExpression("${date:exchangeProperty.birthday+24h:yyyyMMdd}", 
"19760623");
 
         try {
             assertExpression("${date:yyyyMMdd}", "19740420");
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java
index 67c2ae7..5f71eb4 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java
@@ -41,6 +41,7 @@ public class DeadLetterChannelRedeliverWithDelayBlockingTest 
extends ContextTest
 
         // we expect message 2 to arrive before 1 as message 1 is in trouble
         // and must be redelivered 2 times before succeed
+        mock.expectedMinimumMessageCount(2);
         mock.expectedBodiesReceived("Message 2", "Message 1");
         mock.expectedHeaderReceived("foo", "bar");
         // the first is not redelivered