svn commit: r745584 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/model/Constants.java test/java/org/apache/camel/model/GenerateXmFromCamelContextlTest.java test/java/org/apache/camel/model/XmlTestSupport.java

[js...@apache.org]

Author: jstrachan
Date: Wed Feb 18 17:47:37 2009
New Revision: 745584

URL: http://svn.apache.org/viewvc?rev=745584&view=rev
Log:
added a helper constant for the JAXB context String to use for camel classes

Added:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java   (with props)
    camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmFromCamelContextlTest.java
      - copied, changed from r745452, camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java

Added: camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java?rev=745584&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java Wed Feb 18 17:47:37 2009
@@ -0,0 +1,25 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class Constants {
+    public static final String JAXB_CONTEXT_PACKAGES = "org.apache.camel:org.apache.camel.model:org.apache.camel.model.config:org.apache.camel.model.dataformat:org.apache.camel.model.language:org.apache.camel.model.loadbalancer";
+}

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmFromCamelContextlTest.java (from r745452, camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmFromCamelContextlTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmFromCamelContextlTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java&r1=745452&r2=745584&rev=745584&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmFromCamelContextlTest.java Wed Feb 18 17:47:37 2009
@@ -20,48 +20,51 @@
 import java.util.List;
 
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.JAXBContext;
 
 import org.apache.camel.model.language.GroovyExpression;
 import org.apache.camel.model.language.XQueryExpression;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
 
 /**
  * @version $Revision$
  */
-public class GenerateXmlTest extends XmlTestSupport {
+public class GenerateXmFromCamelContextlTest extends ContextTestSupport {
 
-    public void testCreateSimpleXml() throws Exception {
-        RoutesType context = new RoutesType();
-        RouteType route = context.route();
-        route.from("seda:a");
-        route.filter(new XQueryExpression("in.header.foo == 'bar'")).
-                to("seda:b");
-        route.description(null, "This is a description of the route", "en");
-        dump(context);
-    }
+    public void testCreateRouteFromCamelCOntext() throws Exception {
+        List<RouteType> list = context.getRouteDefinitions();
+        assertEquals("Size of list " + list, 1, list.size());
+        RouteType routeType = list.get(0);
 
-    public void testGroovyFilterXml() throws Exception {
-        RoutesType context = new RoutesType();
-        RouteType route = context.route();
-        route.from("seda:a");
-        route.interceptors("interceptor1", "interceptor2");
-        route.filter(new GroovyExpression("in.headers.any { h -> h.startsWith('foo') }")).
-                to("seda:b");
-        route.description(null, "This is a description of the route", "en");
-        List<ProcessorType> list = route.getOutputs();
-        assertEquals("Size of list: " + list, 1, list.size());
+        System.out.println("Found route: " + routeType);
 
-        dump(context);
+        // now lets marshall it!
+        dump(routeType);
     }
 
-    protected void dump(RouteContainer context) throws Exception {
+
+    protected void dump(Object object) throws Exception {
+        JAXBContext jaxbContext = XmlTestSupport.createJaxbContext();
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
         StringWriter buffer = new StringWriter();
-        marshaller.marshal(context, buffer);
+        marshaller.marshal(object, buffer);
         log.info("Created: " + buffer);
         assertNotNull(buffer);
         String out = buffer.toString();
         assertTrue("Should contain the description", out.indexOf("This is a description of the route") > 0);
     }
 
-}
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").filter().xpath("/foo/bar = 'abc'").to("mock:result");
+            }
+        };
+
+    }
+}
\ No newline at end of file

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java?rev=745584&r1=745583&r2=745584&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java Wed Feb 18 17:47:37 2009
@@ -51,7 +51,11 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        jaxbContext = JAXBContext
-            .newInstance("org.apache.camel:org.apache.camel.model:org.apache.camel.model.config:org.apache.camel.model.dataformat:org.apache.camel.model.language:org.apache.camel.model.loadbalancer");
+        jaxbContext = createJaxbContext();
+    }
+
+    public static JAXBContext createJaxbContext() throws JAXBException {
+        return JAXBContext
+            .newInstance(Constants.JAXB_CONTEXT_PACKAGES);
     }
 }