Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 720A410CA3 for ; Wed, 11 Sep 2013 11:20:47 +0000 (UTC) Received: (qmail 88554 invoked by uid 500); 11 Sep 2013 11:20:47 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 88424 invoked by uid 500); 11 Sep 2013 11:20:46 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 88400 invoked by uid 99); 11 Sep 2013 11:20:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Sep 2013 11:20:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9DF9D8BDA93; Wed, 11 Sep 2013 11:20:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Wed, 11 Sep 2013 11:20:52 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/11] git commit: Fixed test on windows Fixed test on windows Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5fdb8b00 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5fdb8b00 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5fdb8b00 Branch: refs/heads/master Commit: 5fdb8b00d9d6defb8a8091ebad9250c8eb79adfb Parents: 1875541 Author: Claus Ibsen Authored: Wed Sep 11 13:19:42 2013 +0200 Committer: Claus Ibsen Committed: Wed Sep 11 13:20:32 2013 +0200 ---------------------------------------------------------------------- .../camel/management/ManagedStreamCachingStrategyTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5fdb8b00/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java index 47b4f0e..32c5238 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java @@ -23,8 +23,11 @@ import javax.management.ObjectName; import org.apache.camel.StreamCache; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.util.FileUtil; import org.apache.camel.util.IOHelper; +import static org.apache.camel.util.FileUtil.normalizePath; + /** * @version */ @@ -50,7 +53,7 @@ public class ManagedStreamCachingStrategyTest extends ManagementTestSupport { assertEquals(Boolean.TRUE, enabled); String dir = (String) mbeanServer.getAttribute(name, "SpoolDirectory"); - assertEquals("target/cachedir/myCamel", dir); + assertEquals(normalizePath("target/cachedir/myCamel"), normalizePath(dir)); Long threshold = (Long) mbeanServer.getAttribute(name, "SpoolThreshold"); assertEquals(StreamCache.DEFAULT_SPOOL_THRESHOLD, threshold.longValue());