You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/10/13 08:07:58 UTC

svn commit: r824600 - in /camel/trunk/camel-core/src/test/java/org/apache/camel/management: ManagedErrorHandlerOptionsTest.java ManagedScheduledPollConsumerTest.java ManagedTracerOptionsTest.java

Author: davsclaus
Date: Tue Oct 13 06:07:57 2009
New Revision: 824600

URL: http://svn.apache.org/viewvc?rev=824600&view=rev
Log:
MR-187: Added more unit tests.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java
      - copied, changed from r824587, camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java
Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java?rev=824600&r1=824599&r2=824600&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java Tue Oct 13 06:07:57 2009
@@ -70,34 +70,41 @@
         String camelId = (String) mbeanServer.getAttribute(on, "CamelId");
         assertEquals("camel-1", camelId);
 
+        mbeanServer.setAttribute(on, new Attribute("BackOffMultiplier", Double.valueOf("3.5")));
         Double backoff = (Double) mbeanServer.getAttribute(on, "BackOffMultiplier");
         assertNotNull(backoff);
 
-        // TODO continue from here
-
+        mbeanServer.setAttribute(on, new Attribute("CollisionAvoidanceFactor", Double.valueOf("1.5")));
         Double cf = (Double) mbeanServer.getAttribute(on, "CollisionAvoidanceFactor");
         assertNotNull(cf);
 
+        mbeanServer.setAttribute(on, new Attribute("CollisionAvoidancePercent", Double.valueOf("75")));
         Double cp = (Double) mbeanServer.getAttribute(on, "CollisionAvoidancePercent");
         assertNotNull(cp);
 
+        mbeanServer.setAttribute(on, new Attribute("DelayPattern", "0:1000;5:5000"));
         String dp = (String) mbeanServer.getAttribute(on, "DelayPattern");
-        assertNull(dp);
+        assertNotNull(dp);
 
+        mbeanServer.setAttribute(on, new Attribute("RetriesExhaustedLogLevel", "WARN"));
         String ell = (String) mbeanServer.getAttribute(on, "RetriesExhaustedLogLevel");
-        assertEquals(LoggingLevel.DEBUG.name(), ell);
+        assertEquals(LoggingLevel.WARN.name(), ell);
 
+        mbeanServer.setAttribute(on, new Attribute("RetryAttemptedLogLevel", "WARN"));
         String rll = (String) mbeanServer.getAttribute(on, "RetryAttemptedLogLevel");
-        assertEquals(LoggingLevel.DEBUG.name(), rll);
+        assertEquals(LoggingLevel.WARN.name(), rll);
 
+        mbeanServer.setAttribute(on, new Attribute("LogStackTrace", Boolean.TRUE));
         Boolean lst = (Boolean) mbeanServer.getAttribute(on, "LogStackTrace");
-        assertEquals(false, lst.booleanValue());
+        assertEquals(true, lst.booleanValue());
 
+        mbeanServer.setAttribute(on, new Attribute("UseCollisionAvoidance", Boolean.TRUE));
         Boolean uca = (Boolean) mbeanServer.getAttribute(on, "UseCollisionAvoidance");
-        assertEquals(false, uca.booleanValue());
+        assertEquals(true, uca.booleanValue());
 
+        mbeanServer.setAttribute(on, new Attribute("UseExponentialBackOff", Boolean.TRUE));
         Boolean uebf = (Boolean) mbeanServer.getAttribute(on, "UseExponentialBackOff");
-        assertEquals(false, uebf.booleanValue());
+        assertEquals(true, uebf.booleanValue());
 
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java?rev=824600&r1=824599&r2=824600&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java Tue Oct 13 06:07:57 2009
@@ -80,6 +80,19 @@
         delay = (Long) mbeanServer.getAttribute(on, "Delay");
         assertEquals(2000, delay.longValue());
 
+        // change some options
+        mbeanServer.setAttribute(on, new Attribute("UseFixedDelay", Boolean.TRUE));
+        fixedDelay = (Boolean) mbeanServer.getAttribute(on, "UseFixedDelay");
+        assertEquals(Boolean.TRUE, fixedDelay);
+
+        mbeanServer.setAttribute(on, new Attribute("TimeUnit", TimeUnit.SECONDS.name()));
+        timeUnit = (String) mbeanServer.getAttribute(on, "TimeUnit");
+        assertEquals(TimeUnit.SECONDS.toString(), timeUnit);
+
+        mbeanServer.setAttribute(on, new Attribute("InitialDelay", Long.valueOf("2000")));
+        initialDelay = (Long) mbeanServer.getAttribute(on, "InitialDelay");
+        assertEquals(2000, initialDelay.longValue());
+
         context.stop();
         assertFalse("Should no longer be registered", mbeanServer.isRegistered(on));
     }

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java (from r824587, camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java&r1=824587&r2=824600&rev=824600&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java Tue Oct 13 06:07:57 2009
@@ -22,20 +22,14 @@
 import javax.management.ObjectName;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
 
 /**
  * @version $Revision$
  */
-public class ManagedErrorHandlerOptionsTest extends ContextTestSupport {
-
-    private static int counter;
+public class ManagedTracerOptionsTest extends ContextTestSupport {
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
@@ -47,87 +41,122 @@
     }
 
     public void testManagedErrorHandlerOptions() throws Exception {
-        counter = 0;
-
         MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
 
-        Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=errorhandlers,*"), null);
+        Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=tracer,*"), null);
         assertEquals(1, set.size());
         ObjectName on = set.iterator().next();
 
-        mbeanServer.setAttribute(on, new Attribute("MaximumRedeliveries", 3));
-        Integer max = (Integer) mbeanServer.getAttribute(on, "MaximumRedeliveries");
-        assertEquals(3, max.intValue());
-
-        mbeanServer.setAttribute(on, new Attribute("MaximumRedeliveryDelay", Long.valueOf("20000")));
-        Long delay = (Long) mbeanServer.getAttribute(on, "MaximumRedeliveryDelay");
-        assertEquals(20000, delay.longValue());
-
-        mbeanServer.setAttribute(on, new Attribute("RedeliveryDelay", Long.valueOf("250")));
-        delay = (Long) mbeanServer.getAttribute(on, "RedeliveryDelay");
-        assertEquals(250, delay.longValue());
-
-        String camelId = (String) mbeanServer.getAttribute(on, "CamelId");
-        assertEquals("camel-1", camelId);
-
-        Double backoff = (Double) mbeanServer.getAttribute(on, "BackOffMultiplier");
-        assertNotNull(backoff);
-
-        // TODO continue from here
-
-        Double cf = (Double) mbeanServer.getAttribute(on, "CollisionAvoidanceFactor");
-        assertNotNull(cf);
-
-        Double cp = (Double) mbeanServer.getAttribute(on, "CollisionAvoidancePercent");
-        assertNotNull(cp);
-
-        String dp = (String) mbeanServer.getAttribute(on, "DelayPattern");
-        assertNull(dp);
-
-        String ell = (String) mbeanServer.getAttribute(on, "RetriesExhaustedLogLevel");
-        assertEquals(LoggingLevel.DEBUG.name(), ell);
-
-        String rll = (String) mbeanServer.getAttribute(on, "RetryAttemptedLogLevel");
-        assertEquals(LoggingLevel.DEBUG.name(), rll);
+        mbeanServer.setAttribute(on, new Attribute("Enabled", Boolean.TRUE));
+        Boolean enabled = (Boolean) mbeanServer.getAttribute(on, "Enabled");
+        assertEquals(true, enabled.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("DestinationUri", null));
+        String duri = (String) mbeanServer.getAttribute(on, "DestinationUri");
+        assertEquals(null, duri);
+
+        mbeanServer.setAttribute(on, new Attribute("DestinationUri", "mock://traced"));
+        duri = (String) mbeanServer.getAttribute(on, "DestinationUri");
+        assertEquals("mock://traced", duri);
+
+        Boolean useJpa = (Boolean) mbeanServer.getAttribute(on, "UseJpa");
+        assertEquals(false, useJpa.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("LogName", "foo"));
+        String ln = (String) mbeanServer.getAttribute(on, "LogName");
+        assertEquals("foo", ln);
+
+        mbeanServer.setAttribute(on, new Attribute("LogLevel", "WARN"));
+        String ll = (String) mbeanServer.getAttribute(on, "LogLevel");
+        assertEquals(LoggingLevel.WARN.name(), ll);
 
+        mbeanServer.setAttribute(on, new Attribute("LogStackTrace", Boolean.TRUE));
         Boolean lst = (Boolean) mbeanServer.getAttribute(on, "LogStackTrace");
-        assertEquals(false, lst.booleanValue());
+        assertEquals(true, lst.booleanValue());
 
-        Boolean uca = (Boolean) mbeanServer.getAttribute(on, "UseCollisionAvoidance");
-        assertEquals(false, uca.booleanValue());
+        mbeanServer.setAttribute(on, new Attribute("TraceInterceptors", Boolean.TRUE));
+        Boolean ti = (Boolean) mbeanServer.getAttribute(on, "TraceInterceptors");
+        assertEquals(true, ti.booleanValue());
 
-        Boolean uebf = (Boolean) mbeanServer.getAttribute(on, "UseExponentialBackOff");
-        assertEquals(false, uebf.booleanValue());
+        mbeanServer.setAttribute(on, new Attribute("TraceExceptions", Boolean.TRUE));
+        Boolean te = (Boolean) mbeanServer.getAttribute(on, "TraceExceptions");
+        assertEquals(true, te.booleanValue());
 
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMessageCount(1);
-
-        template.sendBody("direct:start", "Hello World");
+        mbeanServer.setAttribute(on, new Attribute("TraceOutExchanges", Boolean.TRUE));
+        Boolean toe = (Boolean) mbeanServer.getAttribute(on, "TraceOutExchanges");
+        assertEquals(true, toe.booleanValue());
 
-        assertEquals(3, counter);
+        doAssertFormatter(mbeanServer, on);
 
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+        template.sendBody("direct:start", "Hello World");
         assertMockEndpointsSatisfied();
+    }
 
-        // now change to 0 attempts and try again
-        counter = 0;
-        mock.reset();
-        mock.expectedMessageCount(0);
-        mbeanServer.setAttribute(on, new Attribute("MaximumRedeliveries", 0));
-
-        try {
-            template.sendBody("direct:start", "Bye World");
-            fail("Should have thrown exception");
-        } catch (CamelExecutionException e) {
-            IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
-            assertEquals("Forced", cause.getMessage());
-
-        }
-
-        assertEquals(1, counter);
-
-        // and should now be 0
-        max = (Integer) mbeanServer.getAttribute(on, "MaximumRedeliveries");
-        assertEquals(0, max.intValue());
+    private void doAssertFormatter(MBeanServer mbeanServer, ObjectName on) throws Exception {
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowBody", Boolean.TRUE));
+        Boolean fsb = (Boolean) mbeanServer.getAttribute(on, "FormatterShowBody");
+        assertEquals(true, fsb.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowBodyType", Boolean.TRUE));
+        Boolean fsbt = (Boolean) mbeanServer.getAttribute(on, "FormatterShowBodyType");
+        assertEquals(true, fsbt.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowOutBody", Boolean.TRUE));
+        Boolean fsob = (Boolean) mbeanServer.getAttribute(on, "FormatterShowOutBody");
+        assertEquals(true, fsob.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowOutBodyType", Boolean.TRUE));
+        Boolean fsobt = (Boolean) mbeanServer.getAttribute(on, "FormatterShowOutBodyType");
+        assertEquals(true, fsobt.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowBreadCrumb", Boolean.TRUE));
+        Boolean fsbc = (Boolean) mbeanServer.getAttribute(on, "FormatterShowBreadCrumb");
+        assertEquals(true, fsbc.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowExchangeId", Boolean.TRUE));
+        Boolean fsei = (Boolean) mbeanServer.getAttribute(on, "FormatterShowExchangeId");
+        assertEquals(true, fsei.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowShortExchangeId", Boolean.TRUE));
+        Boolean fssei = (Boolean) mbeanServer.getAttribute(on, "FormatterShowShortExchangeId");
+        assertEquals(true, fssei.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowHeaders", Boolean.TRUE));
+        Boolean fsh = (Boolean) mbeanServer.getAttribute(on, "FormatterShowHeaders");
+        assertEquals(true, fsh.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowOutHeaders", Boolean.TRUE));
+        Boolean fsoh = (Boolean) mbeanServer.getAttribute(on, "FormatterShowOutHeaders");
+        assertEquals(true, fsoh.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowProperties", Boolean.TRUE));
+        Boolean fsp = (Boolean) mbeanServer.getAttribute(on, "FormatterShowProperties");
+        assertEquals(true, fsp.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowNode", Boolean.TRUE));
+        Boolean fsn = (Boolean) mbeanServer.getAttribute(on, "FormatterShowNode");
+        assertEquals(true, fsn.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowExchangePattern", Boolean.TRUE));
+        Boolean fsep = (Boolean) mbeanServer.getAttribute(on, "FormatterShowExchangePattern");
+        assertEquals(true, fsep.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterShowException", Boolean.TRUE));
+        Boolean fsex = (Boolean) mbeanServer.getAttribute(on, "FormatterShowException");
+        assertEquals(true, fsex.booleanValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterBreadCrumbLength", 100));
+        Integer fbcl = (Integer) mbeanServer.getAttribute(on, "FormatterBreadCrumbLength");
+        assertEquals(100, fbcl.intValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterNodeLength", 50));
+        Integer fnl = (Integer) mbeanServer.getAttribute(on, "FormatterNodeLength");
+        assertEquals(50, fnl.intValue());
+
+        mbeanServer.setAttribute(on, new Attribute("FormatterMaxChars", 250));
+        Integer fmc = (Integer) mbeanServer.getAttribute(on, "FormatterMaxChars");
+        assertEquals(250, fmc.intValue());
     }
 
     @Override
@@ -135,17 +164,9 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                errorHandler(defaultErrorHandler().maximumRedeliveries(5));
-
-                from("direct:start").process(new Processor() {
-                    public void process(Exchange exchange) throws Exception {
-                        counter++;
-                        if (counter < 3) {
-                            throw new  IllegalArgumentException("Forced");
-                        }
-                    }
-                }).to("mock:result");
+                from("direct:start").to("mock:result");
             }
         };
     }
+
 }
\ No newline at end of file