This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 592d7c793cd31ae236f0f50fda148f977f1ed583
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Sun Jun 21 15:57:29 2020 +0200
Remove unneccessary class inclusion from QuarkusUnitTest
---
.../core/deployment/CamelContextCustomizerTest.java | 4 ++--
.../camel/quarkus/core/runtime/CamelConfigurationTest.java | 2 --
.../quarkus/core/runtime/CamelInjectionPointTest.java | 3 +--
.../camel/quarkus/core/runtime/CamelProducersTest.java | 7 +------
.../camel/quarkus/core/runtime/CamelRegistryTest.java | 5 +----
.../main/deployment/CamelMainAutoConfigurationTest.java | 7 +++++--
.../camel/quarkus/main/deployment/CamelMainInjectTest.java | 1 -
.../main/deployment/CamelMainRoutesDiscoveryTest.java | 5 +++++
.../quarkus/main/deployment/CamelMainRoutesFilterTest.java | 14 ++++++--------
9 files changed, 21 insertions(+), 27 deletions(-)
diff --git
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
index 1860248..68ff6b0 100644
---
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
+++
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
@@ -40,9 +40,9 @@ import static org.assertj.core.api.Assertions.assertThat;
public class CamelContextCustomizerTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
+ .addBuildChainCustomizer(buildCustomizer())
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addClasses(RestConfigurationCustomizer.class))
- .addBuildChainCustomizer(buildCustomizer());
+ .addClasses(RestConfigurationCustomizer.class));
static Consumer<BuildChainBuilder> buildCustomizer() {
return new Consumer<BuildChainBuilder>() {
diff --git
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelConfigurationTest.java
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelConfigurationTest.java
index b2aabc2..f51c1ca 100644
---
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelConfigurationTest.java
+++
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelConfigurationTest.java
@@ -44,8 +44,6 @@ public class CamelConfigurationTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addClass(BeanProducers.class)
- .addClasses(MyExchangeFormatter.class,
MyOtherExchangeFormatter.class)
.addAsResource(applicationProperties(),
"application.properties"));
@Inject
diff --git
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelInjectionPointTest.java
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelInjectionPointTest.java
index 597c24f..e884503 100644
---
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelInjectionPointTest.java
+++
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelInjectionPointTest.java
@@ -34,8 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class CamelInjectionPointTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
- .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addClasses(Configurer.class, MyExchangeFormatter.class));
+ .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
@Inject
Configurer configurer;
diff --git
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelProducersTest.java
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelProducersTest.java
index 755fa42..1ca650a 100644
---
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelProducersTest.java
+++
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelProducersTest.java
@@ -36,12 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class CamelProducersTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
- .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addClasses(BeanUsingProducerTemplate.class)
- .addClasses(BeanUsingFluentProducerTemplate.class)
- .addClasses(BeanUsingConsumerTemplate.class)
- .addClasses(BeanUsingCamelContext.class)
- .addClasses(BeanUsingRegistry.class));
+ .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
@Inject
BeanUsingProducerTemplate usingProducerTemplate;
diff --git
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelRegistryTest.java
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelRegistryTest.java
index 441ec2e..a0f5571 100644
---
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelRegistryTest.java
+++
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelRegistryTest.java
@@ -48,10 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class CamelRegistryTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
- .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addClasses(BeanProducer.class)
- .addClasses(MyRoute.class, MyCDIRoute.class,
MyCDIProducer.class)
- .addClasses(MyLanguage.class, MyDataFormat.class,
MyComponent.class));
+ .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
@Inject
Registry registry;
diff --git
a/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainAutoConfigurationTest.java
b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainAutoConfigurationTest.java
index f8a1e58..54c9e0f 100644
---
a/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainAutoConfigurationTest.java
+++
b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainAutoConfigurationTest.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.Properties;
+import java.util.concurrent.TimeUnit;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
@@ -39,13 +40,12 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
public class CamelMainAutoConfigurationTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addClass(BeanProducers.class)
- .addClasses(MyExchangeFormatter.class,
MyOtherExchangeFormatter.class)
.addAsResource(applicationProperties(),
"application.properties"));
@Inject
@@ -69,6 +69,9 @@ public class CamelMainAutoConfigurationTest {
@Test
public void testComponentAutoConfiguration() {
+ // ensure the camel context is started before doing any assertion
+ await().atMost(10, TimeUnit.SECONDS).until(main::isStarted);
+
// ensure that the exchange formatter explicit set to the LogComponent
// is not overridden by any ExchangeFormatter instance available from
// the container
diff --git
a/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainInjectTest.java
b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainInjectTest.java
index a1465b1..6788d59 100644
---
a/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainInjectTest.java
+++
b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainInjectTest.java
@@ -45,7 +45,6 @@ public class CamelMainInjectTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addClasses(MyRoutes.class, MyProcessor.class)
.addAsResource(applicationProperties(),
"application.properties"));
@Inject
diff --git
a/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRoutesDiscoveryTest.java
b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRoutesDiscoveryTest.java
index e58cbad..dbeb01b 100644
---
a/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRoutesDiscoveryTest.java
+++
b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRoutesDiscoveryTest.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.Properties;
+import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
@@ -34,6 +35,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
public class CamelMainRoutesDiscoveryTest {
@RegisterExtension
@@ -62,6 +64,9 @@ public class CamelMainRoutesDiscoveryTest {
@Test
public void testRoutesDiscovery() {
+ // ensure the camel context is started before doing any assertion
+ await().atMost(10, TimeUnit.SECONDS).until(main::isStarted);
+
assertThat(main.getCamelContext().getRoutes()).isEmpty();
assertThat(main.configure().getRoutesBuilders()).isEmpty();
}
diff --git
a/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRoutesFilterTest.java
b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRoutesFilterTest.java
index d0d00fc..a9bfb95 100644
---
a/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRoutesFilterTest.java
+++
b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRoutesFilterTest.java
@@ -41,7 +41,6 @@ public class CamelMainRoutesFilterTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addClasses(MyRoute.class, MyRouteFiltered.class)
.addAsResource(applicationProperties(),
"application.properties"));
@Inject
@@ -66,17 +65,16 @@ public class CamelMainRoutesFilterTest {
@Test
public void testRoutesFilter() {
+ // ensure the camel context is started before doing any assertion
+ await().atMost(10, TimeUnit.SECONDS).until(main::isStarted);
+
assertThat(main.configure().getRoutesBuilders())
.hasSize(1)
.first().isInstanceOf(MyRoute.class);
- // since Camel is started in a dedicated thread, then routes
- // may not be available until some time
- await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
- assertThat(main.getCamelContext().getRoutes())
- .hasSize(1)
- .first().hasFieldOrPropertyWithValue("id", "my-route");
- });
+ assertThat(main.getCamelContext().getRoutes())
+ .hasSize(1)
+ .first().hasFieldOrPropertyWithValue("id", "my-route");
}
public static class MyRoute extends RouteBuilder {
