Add Simple and Bean tests to the foundation group apache#2362

integration-tests/bean/pom.xml → integration-test-groups/foundation/bean/pom.xml

@@ -20,8 +20,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-integration-tests</artifactId>
+        <artifactId>camel-quarkus-integration-tests-foundation</artifactId>
         <version>1.9.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,10 +39,6 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-direct</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-log</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -101,19 +98,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-log-deployment</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
     </dependencies>
 

integration-tests/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java → integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java

@@ -69,30 +69,23 @@ public void configure() {
                 // after we have splitted and handled each message we want to send a single combined
                 // response back to the original caller, so we let this bean build it for us
                 // this bean will receive the result of the aggregate strategy: MyOrderStrategy
-                .process(stateless(MyOrderService.class.getName(), "buildCombinedResponse"))
-                // log out
-                .to("log:out");
+                .process(stateless(MyOrderService.class.getName(), "buildCombinedResponse"));
 
         from("direct:named")
-                .to("bean:namedBean?method=hello")
-                .to("log:named");
+                .to("bean:namedBean?method=hello");
 
         from("direct:method")
-                .bean(MyBean.class, "sayHello")
-                .to("log:named");
+                .bean(MyBean.class, "sayHello");
 
         from("direct:handler")
-                .to("bean:withHandler")
-                .to("log:named");
+                .to("bean:withHandler");
 
         from("direct:handlerOnProxy")
-                .to("bean:withHandlerOnProxy")
-                .to("log:named");
+                .to("bean:withHandlerOnProxy");
 
         from("direct:with-language-param-bindings")
                 .routeId("wlpb-route-31wp")
-                .to("bean:withLanguageParamBindingsBean")
-                .to("log:withLanguageParamBindings");
+                .to("bean:withLanguageParamBindingsBean");
 
         from("direct:methodWithExchangeArg")
                 .to("bean:namedBean");

integration-tests/bean/src/main/java/org/apache/camel/quarkus/component/bean/EagerAppScopedRouteBuilder.java → integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/EagerAppScopedRouteBuilder.java

@@ -61,12 +61,10 @@ public void configure() {
          */
         from("direct:increment")
                 .id("counter")
-                .setBody(exchange -> counter.increment())
-                .to("log:counter");
+                .setBody(exchange -> counter.increment());
         from("direct:config-property")
                 .id("config-property")
-                .setBody(exchange -> "myFooValue = " + myFooValue)
-                .to("log:config-property");
+                .setBody(exchange -> "myFooValue = " + myFooValue);
     }
 
     public Counter getCounter() {

integration-test-groups/foundation/core/src/main/resources/application.properties

@@ -27,5 +27,5 @@ quarkus.camel.native.reflection.exclude-patterns = org.apache.commons.lang3.tupl
 # Quarkus :: Camel
 #
 quarkus.camel.runtime-catalog.languages = false
-quarkus.camel.native.resources.include-patterns = include-pattern-folder/*
+quarkus.camel.native.resources.include-patterns = mysimple.txt,include-pattern-folder/*
 quarkus.camel.native.resources.exclude-patterns = exclude-pattern-folder/*,include-pattern-folder/excluded.txt

integration-test-groups/foundation/pom.xml

@@ -33,11 +33,13 @@
 
     <modules>
         <!-- extensions a..z; do not remove this comment, it is important when sorting via  mvn process-resources -Pformat -->
+        <module>bean</module>
         <module>core</module>
         <module>core-annotations</module>
         <module>customized-log-component</module>
         <module>direct</module>
         <module>log</module>
+        <module>simple</module>
         <module>timer</module>
         <module>type-converter</module>
     </modules>

integration-tests/simple/pom.xml → integration-test-groups/foundation/simple/pom.xml

@@ -20,8 +20,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-integration-tests</artifactId>
+        <artifactId>camel-quarkus-integration-tests-foundation</artifactId>
         <version>1.9.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

integration-tests/simple/src/main/resources/application.properties → integration-test-groups/foundation/simple/src/main/resources/application.properties

@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-quarkus.camel.native.resources.include-patterns = *.txt
+quarkus.camel.native.resources.include-patterns = mysimple.txt,include-pattern-folder/*

integration-tests/foundation-grouped/pom.xml

@@ -63,6 +63,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-jsonb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-bean</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core</artifactId>
@@ -96,6 +100,11 @@
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-mockito</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -108,6 +117,19 @@
         </dependency>
 
         <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-bean-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core-deployment</artifactId>

integration-tests/pom.xml

@@ -74,7 +74,6 @@
         <module>aws2-grouped</module>
         <module>azure-grouped</module>
         <module>base64</module>
-        <module>bean</module>
         <module>bean-validator</module>
         <module>bindy</module>
         <module>box</module>
@@ -188,7 +187,6 @@
         <module>servicenow</module>
         <module>servlet</module>
         <module>shiro</module>
-        <module>simple</module>
         <module>slack</module>
         <module>smallrye-reactive-messaging</module>
         <module>soap</module>

tooling/scripts/test-categories.yaml

@@ -38,7 +38,6 @@ group-02:
   - oaipmh
   - pubnub
   - protobuf
-  - simple
   - smallrye-reactive-messaging
   - solr
   - sql
@@ -86,7 +85,6 @@ group-05:
   - xmlsecurity
   - xstream
 group-06:
-  - bean
   - exec
   - file
   - foundation