Author: davsclaus
Date: Sat Aug 20 08:36:50 2011
New Revision: 1159859
URL: http://svn.apache.org/viewvc?rev=1159859&view=rev
Log:
CAMEL-4360: camel-test do not enable debugger by default. Now it must be
explicit enabled to be used.
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTestNGTest.java
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java?rev=1159859&r1=1159858&r2=1159859&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
Sat Aug 20 08:36:50 2011
@@ -90,6 +90,15 @@ public abstract class CamelTestSupport e
}
/**
+ * Override to enable debugger
+ * <p/>
+ * Is default <tt>false</tt>
+ */
+ public boolean isUseDebugger() {
+ return false;
+ }
+
+ /**
* Override when using <a
href="http://camel.apache.org/advicewith.html";>advice with</a> and return
<tt>true</tt>.
* This helps knowing advice with is to be used, and {@link CamelContext}
will not be started before
* the advice with takes place. This helps by ensuring the advice with has
been property setup before the
@@ -136,10 +145,12 @@ public abstract class CamelTestSupport e
// reduce default shutdown timeout to avoid waiting for 300 seconds
context.getShutdownStrategy().setTimeout(getShutdownTimeout());
- // set debugger
- context.setDebugger(new DefaultDebugger());
- context.getDebugger().addBreakpoint(breakpoint);
- // note: when stopping CamelContext it will automatic remove the
breakpoint
+ // set debugger if enabled
+ if (isUseDebugger()) {
+ context.setDebugger(new DefaultDebugger());
+ context.getDebugger().addBreakpoint(breakpoint);
+ // note: when stopping CamelContext it will automatic remove the
breakpoint
+ }
template = context.createProducerTemplate();
template.start();
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java?rev=1159859&r1=1159858&r2=1159859&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
Sat Aug 20 08:36:50 2011
@@ -140,6 +140,15 @@ public abstract class CamelTestSupport e
return null;
}
+ /**
+ * Override to enable debugger
+ * <p/>
+ * Is default <tt>false</tt>
+ */
+ public boolean isUseDebugger() {
+ return false;
+ }
+
public Service getCamelContextService() {
return camelContextService;
}
@@ -229,10 +238,12 @@ public abstract class CamelTestSupport e
// reduce default shutdown timeout to avoid waiting for 300 seconds
context.getShutdownStrategy().setTimeout(getShutdownTimeout());
- // set debugger
- context.setDebugger(new DefaultDebugger());
- context.getDebugger().addBreakpoint(breakpoint);
- // note: when stopping CamelContext it will automatic remove the
breakpoint
+ // set debugger if enabled
+ if (isUseDebugger()) {
+ context.setDebugger(new DefaultDebugger());
+ context.getDebugger().addBreakpoint(breakpoint);
+ // note: when stopping CamelContext it will automatic remove the
breakpoint
+ }
template = context.createProducerTemplate();
template.start();
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java?rev=1159859&r1=1159858&r2=1159859&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java
Sat Aug 20 08:36:50 2011
@@ -30,6 +30,12 @@ public class DebugJUnit4Test extends Cam
// START SNIPPET: e1
@Override
+ public boolean isUseDebugger() {
+ // must enable debugger
+ return true;
+ }
+
+ @Override
protected void debugBefore(Exchange exchange, Processor processor,
ProcessorDefinition definition, String id,
String shortName) {
// this method is invoked before we are about to enter the given
processor
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java?rev=1159859&r1=1159858&r2=1159859&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
Sat Aug 20 08:36:50 2011
@@ -36,6 +36,12 @@ public class DebugNoLazyTypeConverterTes
// START SNIPPET: e1
@Override
+ public boolean isUseDebugger() {
+ // must enable debugger
+ return true;
+ }
+
+ @Override
protected void debugBefore(Exchange exchange, Processor processor,
ProcessorDefinition definition, String id,
String shortName) {
// this method is invoked before we are about to enter the given
processor
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java?rev=1159859&r1=1159858&r2=1159859&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
Sat Aug 20 08:36:50 2011
@@ -31,6 +31,12 @@ public class DebugTest extends CamelTest
// START SNIPPET: e1
@Override
+ public boolean isUseDebugger() {
+ // must enable debugger
+ return true;
+ }
+
+ @Override
protected void debugBefore(Exchange exchange, Processor processor,
ProcessorDefinition definition, String id,
String shortName) {
// this method is invoked before we are about to enter the given
processor
Modified:
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java?rev=1159859&r1=1159858&r2=1159859&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
(original)
+++
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
Sat Aug 20 08:36:50 2011
@@ -126,6 +126,15 @@ public abstract class CamelTestSupport e
return null;
}
+ /**
+ * Override to enable debugger
+ * <p/>
+ * Is default <tt>false</tt>
+ */
+ public boolean isUseDebugger() {
+ return false;
+ }
+
public Service getCamelContextService() {
return camelContextService;
}
@@ -178,10 +187,12 @@ public abstract class CamelTestSupport e
// reduce default shutdown timeout to avoid waiting for 300 seconds
context.getShutdownStrategy().setTimeout(getShutdownTimeout());
- // set debugger
- context.setDebugger(new DefaultDebugger());
- context.getDebugger().addBreakpoint(breakpoint);
- // note: when stopping CamelContext it will automatic remove the
breakpoint
+ // set debugger if enabled
+ if (isUseDebugger()) {
+ context.setDebugger(new DefaultDebugger());
+ context.getDebugger().addBreakpoint(breakpoint);
+ // note: when stopping CamelContext it will automatic remove the
breakpoint
+ }
template = context.createProducerTemplate();
template.start();
Modified:
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java?rev=1159859&r1=1159858&r2=1159859&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java
(original)
+++
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java
Sat Aug 20 08:36:50 2011
@@ -34,6 +34,12 @@ public class DebugNoLazyTypeConverterTes
}
@Override
+ public boolean isUseDebugger() {
+ // must enable debugger
+ return true;
+ }
+
+ @Override
protected void debugBefore(Exchange exchange, Processor processor,
ProcessorDefinition definition, String id,
String shortName) {
// this method is invoked before we are about to enter the given
processor
Modified:
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java?rev=1159859&r1=1159858&r2=1159859&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java
(original)
+++
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java
Sat Aug 20 08:36:50 2011
@@ -29,6 +29,12 @@ import org.testng.annotations.Test;
public class DebugTest extends CamelTestSupport {
@Override
+ public boolean isUseDebugger() {
+ // must enable debugger
+ return true;
+ }
+
+ @Override
protected void debugBefore(Exchange exchange, Processor processor,
ProcessorDefinition definition, String id,
String shortName) {
// this method is invoked before we are about to enter the given
processor
Modified:
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTestNGTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTestNGTest.java?rev=1159859&r1=1159858&r2=1159859&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTestNGTest.java
(original)
+++
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTestNGTest.java
Sat Aug 20 08:36:50 2011
@@ -29,6 +29,12 @@ import org.testng.annotations.Test;
public class DebugTestNGTest extends CamelTestSupport {
@Override
+ public boolean isUseDebugger() {
+ // must enable debugger
+ return true;
+ }
+
+ @Override
protected void debugBefore(Exchange exchange, Processor processor,
ProcessorDefinition definition, String id,
String shortName) {
// this method is invoked before we are about to enter the given
processor
