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/09/28 15:50:56 UTC
svn commit: r819537 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/management/mbean/
test/java/org/apache/camel/component/seda/
test/java/org/apache/camel/management/
Author: davsclaus
Date: Mon Sep 28 13:50:55 2009
New Revision: 819537
URL: http://svn.apache.org/viewvc?rev=819537&view=rev
Log:
MR-187: Added more unit tests.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java (with props)
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java
- copied, changed from r819504, camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java Mon Sep 28 13:50:55 2009
@@ -45,6 +45,9 @@
@ManagedOperation(description = "Get Exchange from queue by index")
public String browseExchange(Integer index) {
+ if (index >= endpoint.getExchanges().size()) {
+ return null;
+ }
Exchange exchange = endpoint.getExchanges().get(index);
if (exchange == null) {
return null;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java Mon Sep 28 13:50:55 2009
@@ -155,7 +155,7 @@
if (tracer.getDefaultTraceFormatter() == null) {
return false;
}
- return tracer.getDefaultTraceFormatter().isShowOutBodyType();
+ return tracer.getDefaultTraceFormatter().isShowBodyType();
}
@ManagedAttribute(description = "Formatter show body type")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java Mon Sep 28 13:50:55 2009
@@ -21,6 +21,9 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.WaitForTaskToComplete;
+import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -54,6 +57,28 @@
assertEquals("Bye World", response);
}
+ public void testAsyncProducerWait() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ // using the new async API we can fire a real async message
+ Exchange exchange = new DefaultExchange(context);
+ exchange.getIn().setBody("Hello World");
+ exchange.setPattern(ExchangePattern.InOut);
+ exchange.setProperty(Exchange.ASYNC_WAIT, WaitForTaskToComplete.IfReplyExpected);
+ template.send("direct:start", exchange);
+
+ // I should not happen before mock
+ route = route + "send";
+
+ assertMockEndpointsSatisfied();
+
+ assertEquals("Send should occur before processor", "processsend", route);
+
+ String response = exchange.getOut().getBody(String.class);
+ assertEquals("Bye World", response);
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java?rev=819537&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java Mon Sep 28 13:50:55 2009
@@ -0,0 +1,105 @@
+/**
+ * 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.component.seda;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ArrayBlockingQueue;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Producer;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+
+/**
+ * @version $Revision$
+ */
+public class SedaEndpointTest extends ContextTestSupport {
+
+ private BlockingQueue<Exchange> queue = new ArrayBlockingQueue<Exchange>(1000);
+
+ public void testSedaEndpoint() throws Exception {
+ SedaEndpoint seda = new SedaEndpoint("seda://foo", queue);
+ assertNotNull(seda);
+
+ assertEquals(1000, seda.getSize());
+ assertSame(queue, seda.getQueue());
+ assertEquals(1, seda.getConcurrentConsumers());
+
+ Producer prod = seda.createProducer();
+ seda.onStarted((SedaProducer) prod);
+ assertEquals(1, seda.getProducers().size());
+
+ Consumer cons = seda.createConsumer(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ // do nothing
+ }
+ });
+ seda.onStarted((SedaConsumer) cons);
+ assertEquals(1, seda.getConsumers().size());
+
+ assertEquals(0, seda.getExchanges().size());
+ }
+
+ public void testSedaEndpointTwo() throws Exception {
+ SedaEndpoint seda = new SedaEndpoint("seda://foo", queue, 2);
+ assertNotNull(seda);
+
+ assertEquals(1000, seda.getSize());
+ assertSame(queue, seda.getQueue());
+ assertEquals(2, seda.getConcurrentConsumers());
+
+ Producer prod = seda.createProducer();
+ seda.onStarted((SedaProducer) prod);
+ assertEquals(1, seda.getProducers().size());
+
+ Consumer cons = seda.createConsumer(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ // do nothing
+ }
+ });
+ seda.onStarted((SedaConsumer) cons);
+ assertEquals(1, seda.getConsumers().size());
+
+ assertEquals(0, seda.getExchanges().size());
+ }
+
+ public void testSedaEndpointSetQueue() throws Exception {
+ SedaEndpoint seda = new SedaEndpoint();
+ assertNotNull(seda);
+ seda.setQueue(new ArrayBlockingQueue<Exchange>(1000));
+ seda.setConcurrentConsumers(2);
+
+ assertEquals(1000, seda.getSize());
+ assertNotSame(queue, seda.getQueue());
+ assertEquals(2, seda.getConcurrentConsumers());
+
+ Producer prod = seda.createProducer();
+ seda.onStarted((SedaProducer) prod);
+ assertEquals(1, seda.getProducers().size());
+
+ Consumer cons = seda.createConsumer(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ // do nothing
+ }
+ });
+ seda.onStarted((SedaConsumer) cons);
+ assertEquals(1, seda.getConsumers().size());
+
+ assertEquals(0, seda.getExchanges().size());
+ }
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java (from r819504, camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java&r1=819504&r2=819537&rev=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java Mon Sep 28 13:50:55 2009
@@ -26,7 +26,7 @@
/**
* @version $Revision$
*/
-public class ManagedBrowseableEndpointTest extends ContextTestSupport {
+public class ManagedBrowseableEndpointEmptyTest extends ContextTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
@@ -37,30 +37,12 @@
return context;
}
- public void testBrowseableEndpoint() throws Exception {
- getMockEndpoint("mock:result").expectedMessageCount(2);
-
- template.sendBody("direct:start", "Hello World");
- template.sendBody("direct:start", "Bye World");
-
- assertMockEndpointsSatisfied();
-
+ public void testBrowseableEndpointEmpty() throws Exception {
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
-
ObjectName name = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"mock://result\"");
- String uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
- assertEquals("mock://result", uri);
-
- Long size = (Long) mbeanServer.invoke(name, "qeueSize", null, null);
- assertEquals(2, size.longValue());
String out = (String) mbeanServer.invoke(name, "browseExchange", new Object[]{0}, new String[]{"java.lang.Integer"});
- assertNotNull(out);
- assertTrue(out.contains("Hello World"));
-
- out = (String) mbeanServer.invoke(name, "browseExchange", new Object[]{1}, new String[]{"java.lang.Integer"});
- assertNotNull(out);
- assertTrue(out.contains("Bye World"));
+ assertNull(out);
}
@Override
@@ -73,4 +55,4 @@
};
}
-}
+}
\ No newline at end of file
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java?rev=819537&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java Mon Sep 28 13:50:55 2009
@@ -0,0 +1,77 @@
+/**
+ * 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.management;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultCamelContext;
+
+/**
+ * @version $Revision$
+ */
+public class ManagedCamelContextTest extends ContextTestSupport {
+
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = new DefaultCamelContext();
+ DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
+ naming.setHostName("localhost");
+ naming.setDomainName("org.apache.camel");
+ return context;
+ }
+
+ public void testManagedCamelContext() throws Exception {
+ MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
+
+ assertTrue("Should be registered", mbeanServer.isRegistered(on));
+ String name = (String) mbeanServer.getAttribute(on, "CamelId");
+ assertEquals("camel-1", name);
+
+ // invoke operations
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Hello World");
+
+ mbeanServer.invoke(on, "sendBody", new Object[]{"direct:start", "Hello World"}, new String[]{"java.lang.String", "java.lang.String"});
+
+ assertMockEndpointsSatisfied();
+
+ Object reply = mbeanServer.invoke(on, "requestBody", new Object[]{"direct:foo", "Hello World"}, new String[]{"java.lang.String", "java.lang.String"});
+ assertEquals("Bye World", reply);
+
+ // stop Camel
+ mbeanServer.invoke(on, "stop", null, null);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("mock:result");
+
+ from("direct:foo").transform(constant("Bye World"));
+ }
+ };
+ }
+
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java Mon Sep 28 13:50:55 2009
@@ -16,6 +16,7 @@
*/
package org.apache.camel.management;
+import java.util.Set;
import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -45,7 +46,10 @@
public void testCamelContextTracing() throws Exception {
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
+ ObjectName camel = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
+ Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=tracer,*"), null);
+ assertEquals(1, set.size());
+ ObjectName on = set.iterator().next();
// with tracing
MockEndpoint traced = getMockEndpoint("mock:traced");
@@ -58,11 +62,80 @@
assertMockEndpointsSatisfied();
// should be enabled
- Boolean tracing = (Boolean) mbeanServer.getAttribute(on, "Tracing");
+ Boolean tracing = (Boolean) mbeanServer.getAttribute(camel, "Tracing");
assertEquals("Tracing should be enabled", true, tracing.booleanValue());
+ String destinationUri = (String) mbeanServer.getAttribute(on, "DestinationUri");
+ assertEquals("mock:traced", destinationUri);
+
+ String logLevel = (String) mbeanServer.getAttribute(on, "LogLevel");
+ assertEquals(LoggingLevel.OFF.name(), logLevel);
+
+ String logName = (String) mbeanServer.getAttribute(on, "LogName");
+ assertNotNull(logName);
+
+ Boolean logStackTrace = (Boolean) mbeanServer.getAttribute(on, "LogStackTrace");
+ assertEquals(Boolean.FALSE, logStackTrace);
+
+ Boolean traceInterceptors = (Boolean) mbeanServer.getAttribute(on, "TraceInterceptors");
+ assertEquals(Boolean.FALSE, traceInterceptors);
+
+ Boolean traceExceptions = (Boolean) mbeanServer.getAttribute(on, "TraceExceptions");
+ assertEquals(Boolean.TRUE, traceExceptions);
+
+ Boolean traceOutExchanges = (Boolean) mbeanServer.getAttribute(on, "TraceOutExchanges");
+ assertEquals(Boolean.FALSE, traceOutExchanges);
+
+ Boolean formatterShowBody = (Boolean) mbeanServer.getAttribute(on, "FormatterShowBody");
+ assertEquals(Boolean.TRUE, formatterShowBody);
+
+ Boolean formatterShowBodyType = (Boolean) mbeanServer.getAttribute(on, "FormatterShowBodyType");
+ assertEquals(Boolean.TRUE, formatterShowBodyType);
+
+ Boolean formatterShowOutBody = (Boolean) mbeanServer.getAttribute(on, "FormatterShowOutBody");
+ assertEquals(Boolean.FALSE, formatterShowOutBody);
+
+ Boolean formatterShowOutBodyType = (Boolean) mbeanServer.getAttribute(on, "FormatterShowOutBodyType");
+ assertEquals(Boolean.FALSE, formatterShowOutBodyType);
+
+ Boolean formatterShowBreadCrumb = (Boolean) mbeanServer.getAttribute(on, "FormatterShowBreadCrumb");
+ assertEquals(Boolean.TRUE, formatterShowBreadCrumb);
+
+ Boolean formatterShowExchangeId = (Boolean) mbeanServer.getAttribute(on, "FormatterShowExchangeId");
+ assertEquals(Boolean.FALSE, formatterShowExchangeId);
+
+ Boolean formatterShowHeaders = (Boolean) mbeanServer.getAttribute(on, "FormatterShowHeaders");
+ assertEquals(Boolean.TRUE, formatterShowHeaders);
+
+ Boolean formatterShowOutHeaders = (Boolean) mbeanServer.getAttribute(on, "FormatterShowOutHeaders");
+ assertEquals(Boolean.FALSE, formatterShowOutHeaders);
+
+ Boolean formatterShowProperties = (Boolean) mbeanServer.getAttribute(on, "FormatterShowProperties");
+ assertEquals(Boolean.FALSE, formatterShowProperties);
+
+ Boolean formatterShowNode = (Boolean) mbeanServer.getAttribute(on, "FormatterShowNode");
+ assertEquals(Boolean.TRUE, formatterShowNode);
+
+ Boolean formatterShowExchangePattern = (Boolean) mbeanServer.getAttribute(on, "FormatterShowExchangePattern");
+ assertEquals(Boolean.TRUE, formatterShowExchangePattern);
+
+ Boolean formatterShowException = (Boolean) mbeanServer.getAttribute(on, "FormatterShowException");
+ assertEquals(Boolean.TRUE, formatterShowException);
+
+ Boolean formatterShowShortExchangeId = (Boolean) mbeanServer.getAttribute(on, "FormatterShowShortExchangeId");
+ assertEquals(Boolean.FALSE, formatterShowShortExchangeId);
+
+ Integer formatterBreadCrumbLength = (Integer) mbeanServer.getAttribute(on, "FormatterBreadCrumbLength");
+ assertEquals(0, formatterBreadCrumbLength.intValue());
+
+ Integer formatterNodeLength = (Integer) mbeanServer.getAttribute(on, "FormatterNodeLength");
+ assertEquals(0, formatterNodeLength.intValue());
+
+ Integer formatterMaxChars = (Integer) mbeanServer.getAttribute(on, "FormatterMaxChars");
+ assertEquals(0, formatterMaxChars.intValue());
+
// now disable tracing
- mbeanServer.setAttribute(on, new Attribute("Tracing", Boolean.FALSE));
+ mbeanServer.setAttribute(camel, new Attribute("Tracing", Boolean.FALSE));
// without tracing
traced.reset();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java Mon Sep 28 13:50:55 2009
@@ -57,6 +57,27 @@
Integer max = (Integer) mbeanServer.getAttribute(on, "MaximumRedeliveries");
assertEquals(5, max.intValue());
+ Long delay = (Long) mbeanServer.getAttribute(on, "MaximumRedeliveryDelay");
+ assertEquals(60000, delay.longValue());
+
+ delay = (Long) mbeanServer.getAttribute(on, "RedeliveryDelay");
+ assertEquals(0, delay.longValue());
+
+ String camelId = (String) mbeanServer.getAttribute(on, "CamelId");
+ assertEquals("camel-1", camelId);
+
+ Boolean dlc = (Boolean) mbeanServer.getAttribute(on, "DeadLetterChannel");
+ assertEquals(Boolean.FALSE, dlc);
+
+ Boolean dlcom = (Boolean) mbeanServer.getAttribute(on, "DeadLetterUseOriginalMessage");
+ assertEquals(Boolean.FALSE, dlcom);
+
+ Boolean tx = (Boolean) mbeanServer.getAttribute(on, "SupportTransactions");
+ assertEquals(Boolean.FALSE, tx);
+
+ String dlcUri = (String) mbeanServer.getAttribute(on, "DeadLetterChannelEndpointUri");
+ assertNull(dlcUri);
+
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java Mon Sep 28 13:50:55 2009
@@ -51,6 +51,12 @@
name = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"mock://result\"");
uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
assertEquals("mock://result", uri);
+
+ String id = (String) mbeanServer.getAttribute(name, "CamelId");
+ assertEquals("camel-1", id);
+
+ Boolean singleton = (Boolean) mbeanServer.getAttribute(name, "Singleton");
+ assertEquals(Boolean.TRUE, singleton);
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java Mon Sep 28 13:50:55 2009
@@ -16,6 +16,7 @@
*/
package org.apache.camel.management;
+import java.util.Date;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -67,6 +68,11 @@
assertTrue("Should take around 2 sec: was " + last, last > 1900);
assertTrue("Should be around 4 sec now: was " + total, total > 3900);
+
+ Date lastFailed = (Date) mbeanServer.getAttribute(on, "LastExchangeFailureTimestamp");
+ Date firstFailed = (Date) mbeanServer.getAttribute(on, "FirstExchangeFailureTimestamp");
+ assertNull(lastFailed);
+ assertNull(firstFailed);
}
@Override
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=819537&r1=819536&r2=819537&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 Mon Sep 28 13:50:55 2009
@@ -17,6 +17,7 @@
package org.apache.camel.management;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -55,6 +56,15 @@
Long delay = (Long) mbeanServer.getAttribute(on, "Delay");
assertEquals(4000, delay.longValue());
+ Long initialDelay = (Long) mbeanServer.getAttribute(on, "InitialDelay");
+ assertEquals(1000, initialDelay.longValue());
+
+ Boolean fixedDelay = (Boolean) mbeanServer.getAttribute(on, "UseFixedDelay");
+ assertEquals(Boolean.FALSE, fixedDelay);
+
+ String timeUnit = (String) mbeanServer.getAttribute(on, "TimeUnit");
+ assertEquals(TimeUnit.MILLISECONDS.toString(), timeUnit);
+
String routeId = (String) mbeanServer.getAttribute(on, "RouteId");
assertEquals("route1", routeId);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java Mon Sep 28 13:50:55 2009
@@ -21,6 +21,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -59,6 +60,18 @@
String routeId = (String) mbeanServer.getAttribute(on, "RouteId");
assertEquals("route1", routeId);
+ String camelId = (String) mbeanServer.getAttribute(on, "CamelId");
+ assertEquals("camel-1", camelId);
+
+ String state = (String) mbeanServer.getAttribute(on, "State");
+ assertEquals(ServiceStatus.Started.name(), state);
+
+ String destination = (String) mbeanServer.getAttribute(on, "Destination");
+ assertEquals("mock://result", destination);
+
+ String pattern = (String) mbeanServer.getAttribute(on, "MessageExchangePattern");
+ assertNull(pattern);
+
// send it somewhere else
mbeanServer.invoke(on, "changeDestination", new Object[]{"direct:foo"}, new String[]{"java.lang.String"});
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java Mon Sep 28 13:50:55 2009
@@ -60,6 +60,9 @@
Long completed = (Long) mbeanServer.getAttribute(routeName, "ExchangesCompleted");
assertEquals(10, completed.longValue());
+ Long timePeriod = (Long) mbeanServer.getAttribute(throttlerName, "TimePeriodMillis");
+ assertEquals(1000, timePeriod.longValue());
+
Long last = (Long) mbeanServer.getAttribute(routeName, "LastProcessingTime");
Long total = (Long) mbeanServer.getAttribute(routeName, "TotalProcessingTime");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java Mon Sep 28 13:50:55 2009
@@ -16,6 +16,7 @@
*/
package org.apache.camel.management;
+import java.util.Map;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -52,6 +53,15 @@
String state = (String) mbeanServer.getAttribute(on, "State");
assertEquals(ServiceStatus.Started.name(), state);
+ String version = (String) mbeanServer.getAttribute(on, "CamelVersion");
+ assertNotNull(version);
+
+ Map<String, String> properties = (Map) mbeanServer.getAttribute(on, "Properties");
+ assertNull(properties);
+
+ Integer num = (Integer) mbeanServer.getAttribute(on, "InflightExchanges");
+ assertEquals(0, num.intValue());
+
context.stop();
assertFalse("Should no longer be registered", mbeanServer.isRegistered(on));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java Mon Sep 28 13:50:55 2009
@@ -52,6 +52,9 @@
String state = (String) mbeanServer.getAttribute(on, "State");
assertEquals(ServiceStatus.Started.name(), state);
+ String id = (String) mbeanServer.getAttribute(on, "CamelId");
+ assertEquals("camel-1", id);
+
context.stop();
assertFalse("Should no longer be registered", mbeanServer.isRegistered(on));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java Mon Sep 28 13:50:55 2009
@@ -22,6 +22,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
@@ -54,6 +55,12 @@
String routeId = (String) mbeanServer.getAttribute(on, "RouteId");
assertEquals("route1", routeId);
+ String camelId = (String) mbeanServer.getAttribute(on, "CamelId");
+ assertEquals("camel-1", camelId);
+
+ String state = (String) mbeanServer.getAttribute(on, "State");
+ assertEquals(ServiceStatus.Started.name(), state);
+
context.stop();
assertFalse("Should no longer be registered", mbeanServer.isRegistered(on));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java Mon Sep 28 13:50:55 2009
@@ -70,6 +70,9 @@
// String routeId = (String) mbeanServer.getAttribute(on, "RouteId");
// assertEquals("route1", routeId);
+ Boolean singleton = (Boolean) mbeanServer.getAttribute(on, "Singleton");
+ assertEquals(Boolean.TRUE, singleton);
+
context.stop();
assertFalse("Should no longer be registered", mbeanServer.isRegistered(on));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java?rev=819537&r1=819536&r2=819537&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java Mon Sep 28 13:50:55 2009
@@ -46,6 +46,9 @@
String id = (String) mbeanServer.getAttribute(on, "RouteId");
assertEquals("route1", id);
+ String camelId = (String) mbeanServer.getAttribute(on, "CamelId");
+ assertEquals("camel-1", camelId);
+
context.stop();
assertFalse("Should no longer be registered", mbeanServer.isRegistered(on));