This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f04688f59ee CAMEL-19555: added assertions to the camel-spring-main
tests (#11653)
f04688f59ee is described below
commit f04688f59ee3a9a35e2601b4313c806bcdf397f6
Author: kariuwu <92930794+kari...@users.noreply.github.com>
AuthorDate: Thu Oct 5 16:02:04 2023 +0200
CAMEL-19555: added assertions to the camel-spring-main tests (#11653)
---
.../org/apache/camel/spring/MainDummyTest.java | 30 ++++++++-----
.../org/apache/camel/spring/MainExampleTest.java | 51 +++++++++++++---------
.../java/org/apache/camel/spring/MainVetoTest.java | 25 +++++++----
.../camel/spring/MultipleCamelContextTest.java | 10 +++--
.../spring/SpringMainStartFailedIssueTest.java | 12 ++---
5 files changed, 76 insertions(+), 52 deletions(-)
diff --git
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainDummyTest.java
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainDummyTest.java
index e871a00e2d4..7e8f04687b7 100644
---
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainDummyTest.java
+++
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainDummyTest.java
@@ -19,25 +19,33 @@ package org.apache.camel.spring;
import org.apache.camel.CamelContext;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MainDummyTest {
@Test
- public void testMain() throws Exception {
- Main main = new Main();
- main.start();
+ public void testMain() {
+
+ assertDoesNotThrow(() -> {
+ Main main = new Main();
+ main.start();
+
+ // should also be a Camel
+ CamelContext camel =
main.getApplicationContext().getBean(CamelContext.class);
+ assertNotNull(camel, "Camel should be in Spring");
+
+ DummyBean dummy = (DummyBean)
main.getApplicationContext().getBean("dummy");
+ assertNotNull(dummy);
+ assertEquals("John Doe", dummy.getName());
+
+ main.stop();
- // should also be a Camel
- CamelContext camel =
main.getApplicationContext().getBean(CamelContext.class);
- assertNotNull(camel, "Camel should be in Spring");
+ }
- DummyBean dummy = (DummyBean)
main.getApplicationContext().getBean("dummy");
- assertNotNull(dummy);
- assertEquals("John Doe", dummy.getName());
+ );
- main.stop();
}
}
diff --git
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainExampleTest.java
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainExampleTest.java
index 79ee0660631..5907154d497 100644
---
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainExampleTest.java
+++
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainExampleTest.java
@@ -19,36 +19,47 @@ package org.apache.camel.spring;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
public class MainExampleTest {
@Test
- public void testMain() throws Exception {
- Main main = new Main();
- main.configure().addRoutesBuilder(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
-
from("file://src/test/data?initialDelay=0&delay=10&noop=true").process(new
MyProcessor())
- .to("file://target/mainTest");
- }
- });
- main.start();
+ public void testMain() {
+ assertDoesNotThrow(() -> {
+ Main main = new Main();
+ main.configure().addRoutesBuilder(new RouteBuilder() {
+ @Override
+ public void configure() {
+
from("file://src/test/data?initialDelay=0&delay=10&noop=true").process(new
MyProcessor())
+ .to("file://target/mainTest");
+ }
+ });
+ main.start();
- // run for 1 second
- main.configure().setDurationMaxSeconds(1);
+ // run for 1 second
+ main.configure().setDurationMaxSeconds(1);
+
+ main.stop();
+ });
- main.stop();
}
@Test
- public void testFileApplicationContextUri() throws Exception {
- Main main = new Main();
-
main.setFileApplicationContextUri("src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml");
- main.start();
+ public void testFileApplicationContextUri() {
+
+ assertDoesNotThrow(() -> {
+ Main main = new Main();
- // run for 1 second
- main.configure().setDurationMaxSeconds(1);
+
main.setFileApplicationContextUri("src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml");
+ main.start();
+
+ // run for 1 second
+ main.configure().setDurationMaxSeconds(1);
+
+ main.stop();
+
+ });
- main.stop();
}
}
diff --git
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainVetoTest.java
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainVetoTest.java
index 4ba6604d1f5..5fe995e9fd5 100644
---
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainVetoTest.java
+++
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/MainVetoTest.java
@@ -18,23 +18,30 @@ package org.apache.camel.spring;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MainVetoTest {
@Test
- public void testMain() throws Exception {
+ public void testMain() {
// lets make a simple route
- Main main = new Main();
- main.configure().setDurationMaxSeconds(1);
- main.configure().setDurationHitExitCode(99);
-
main.setApplicationContextUri("org/apache/camel/spring/MainVetoTest.xml");
+ assertDoesNotThrow(() -> {
+ Main main = new Main();
+ main.configure().setDurationMaxSeconds(1);
+ main.configure().setDurationHitExitCode(99);
+
main.setApplicationContextUri("org/apache/camel/spring/MainVetoTest.xml");
- // should not hang as we veto fail
- main.run();
+ // should not hang as we veto fail
+ main.run();
+
+ // should complete normally due veto
+ assertEquals(99, main.getExitCode());
+
+ }
+
+ );
- // should complete normally due veto
- assertEquals(99, main.getExitCode());
}
}
diff --git
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/MultipleCamelContextTest.java
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/MultipleCamelContextTest.java
index b3456f7ad1a..b03e34e68e9 100644
---
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/MultipleCamelContextTest.java
+++
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/MultipleCamelContextTest.java
@@ -17,9 +17,11 @@
package org.apache.camel.spring;
import org.apache.camel.CamelContext;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
public class MultipleCamelContextTest {
@Test
@@ -32,9 +34,9 @@ public class MultipleCamelContextTest {
CamelContext camel1 = main.getApplicationContext().getBean("camel1",
CamelContext.class);
CamelContext camel2 = main.getApplicationContext().getBean("camel2",
CamelContext.class);
- Assertions.assertNotSame(camel1, camel2);
- Assertions.assertEquals(2, camel1.getRoutesSize());
- Assertions.assertEquals(3, camel2.getRoutesSize());
+ assertNotSame(camel1, camel2);
+ assertEquals(2, camel1.getRoutesSize());
+ assertEquals(3, camel2.getRoutesSize());
main.stop();
}
diff --git
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/SpringMainStartFailedIssueTest.java
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/SpringMainStartFailedIssueTest.java
index 2c3bc450e32..8a5b7e72069 100644
---
a/components/camel-spring-main/src/test/java/org/apache/camel/spring/SpringMainStartFailedIssueTest.java
+++
b/components/camel-spring-main/src/test/java/org/apache/camel/spring/SpringMainStartFailedIssueTest.java
@@ -21,8 +21,7 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
public class SpringMainStartFailedIssueTest extends CamelTestSupport {
@@ -31,12 +30,9 @@ public class SpringMainStartFailedIssueTest extends
CamelTestSupport {
Main main = new Main();
String[] args = new String[] { "-ac",
"org/apache/camel/spring/SpringMainStartFailedIssueTest.xml" };
- try {
- main.run(args);
- fail("Should have thrown an exception");
- } catch (Exception e) {
- assertIsInstanceOf(FailedToCreateRouteException.class, e);
- }
+
+ Exception e = assertThrows(Exception.class, () -> main.run(args),
"Should have thrown an exception");
+ assertIsInstanceOf(FailedToCreateRouteException.class, e);
assertNull(main.getApplicationContext(), "Spring application context
should NOT be created");
}
