Author: davsclaus
Date: Sat May  7 09:11:47 2011
New Revision: 1100483

URL: http://svn.apache.org/viewvc?rev=1100483&view=rev
Log:
CAMEL-3032: Do not use test-jar in pom.xml. Fixed test failing sometimes on CI.

Removed:
    
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltRouteTest.java
Modified:
    camel/trunk/components/camel-saxon/pom.xml
    
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java
    
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java

Modified: camel/trunk/components/camel-saxon/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/pom.xml?rev=1100483&r1=1100482&r2=1100483&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/pom.xml (original)
+++ camel/trunk/components/camel-saxon/pom.xml Sat May  7 09:11:47 2011
@@ -75,18 +75,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>

Modified: 
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java?rev=1100483&r1=1100482&r2=1100483&view=diff
==============================================================================
--- 
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java
 (original)
+++ 
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java
 Sat May  7 09:11:47 2011
@@ -59,8 +59,10 @@ public class XQueryLanguageFromFileTest 
                 from("file:target/xquery")
                     .choice()
                         .when().xquery("/mail/@from = '[email protected]'")
+                            .convertBodyTo(String.class)
                             .to("mock:davsclaus")
                         .otherwise()
+                            .convertBodyTo(String.class)
                             .to("mock:other");
             }
         };

Modified: 
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java?rev=1100483&r1=1100482&r2=1100483&view=diff
==============================================================================
--- 
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java
 (original)
+++ 
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java
 Sat May  7 09:11:47 2011
@@ -16,10 +16,31 @@
  */
 package org.apache.camel.component.xslt;
 
+import org.apache.camel.CamelContext;
+import org.apache.camel.FailedToCreateRouteException;
+import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.test.junit4.TestSupport;
+import org.junit.Test;
+
+public class SaxonInvalidXsltFileTest extends TestSupport {
+
+    @Test
+    public void testInvalidStylesheet() throws Exception {
+        try {
+            RouteBuilder builder = createRouteBuilder();
+            CamelContext context = new DefaultCamelContext();
+            context.addRoutes(builder);
+            context.start();
+
+            fail("Should have thrown an exception due XSL compilation error");
+        } catch (FailedToCreateRouteException e) {
+            // expected
+            assertIsInstanceOf(ResolveEndpointFailedException.class, 
e.getCause());
+        }
+    }
 
-public class SaxonInvalidXsltFileTest extends InvalidXsltFileTest {
-    
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {


Reply via email to