svn commit: r1341786 - in /camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi: OSGiIntegrationTestSupport.java freemarker/FreemarkerFileTest.java velocity/VelocityFileTest.java

[davsclaus]

Author: davsclaus
Date: Wed May 23 08:34:25 2012
New Revision: 1341786

URL: http://svn.apache.org/viewvc?rev=1341786&view=rev
Log:
Fixed tests.

Modified:
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=1341786&r1=1341785&r2=1341786&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
 Wed May 23 08:34:25 2012
@@ -137,7 +137,7 @@ public class OSGiIntegrationTestSupport 
             dir = new File(workDir);
         }
         createDirectory(workDir);
-        System.out.println("Using working directory: " + workDir);
+        System.out.println("*** Using working directory: " + workDir + " ***");
 
         Option[] options = combine(
             // Set the karaf environment with some customer configuration

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java?rev=1341786&r1=1341785&r2=1341786&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java
 Wed May 23 08:34:25 2012
@@ -33,7 +33,7 @@ public class FreemarkerFileTest extends 
         deleteDirectory("mydir");
         createDirectory("mydir");
 
-        File src = new 
File("../../src/test/resources/org/apache/camel/itest/osgi/freemarker/example.ftl");
+        File src = new 
File("../../../src/test/resources/org/apache/camel/itest/osgi/freemarker/example.ftl");
         File dest = new File("mydir/example.ftl");
         FileInputStream fis = new FileInputStream(src);
         FileOutputStream fos = new FileOutputStream(dest, false);

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java?rev=1341786&r1=1341785&r2=1341786&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java
 Wed May 23 08:34:25 2012
@@ -33,7 +33,7 @@ public class VelocityFileTest extends Ve
         deleteDirectory("mydir");
         createDirectory("mydir");
 
-        File src = new 
File("../../src/test/resources/org/apache/camel/itest/osgi/velocity/example.vm");
+        File src = new 
File("../../../src/test/resources/org/apache/camel/itest/osgi/velocity/example.vm");
         File dest = new File("mydir/example.vm");
         FileInputStream fis = new FileInputStream(src);
         FileOutputStream fos = new FileOutputStream(dest, false);