You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ap...@apache.org on 2026/09/23 07:09:50 UTC

(camel) branch main updated: Remove Spock dependency

This is an automated email from the ASF dual-hosted git repository.

apupier 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 b0b92bc9f642 Remove Spock dependency
b0b92bc9f642 is described below

commit b0b92bc9f64212d223aabd40a9198023c717ab2d
Author: Aurélien Pupier <ap...@ibm.com>
AuthorDate: Tue Sep 22 16:18:44 2026 +0200

    Remove Spock dependency
    
    Spock is a test framework to write test in BDD style in Groovy. It was
    mainly useful when Java didn't have Java text blocks.
    It was used only in yaml dsl modules.
    By removing it, it allows to avoid also to depend on Spock to upgrade to
    major Groovy versions.
    
    Co-authored-by: IBM Bob 2.1.0
    Signed-off-by: Aurélien Pupier <ap...@ibm.com>
---
 dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml   |  57 --
 .../dsl/yaml/common/ConstructorResolverTest.groovy | 233 -----
 .../apache/camel/dsl/yaml/common/NodeAtTest.groovy | 107 ---
 .../dsl/yaml/common/ConstructorResolverTest.java   | 243 ++++++
 .../apache/camel/dsl/yaml/common/NodeAtTest.java   | 102 +++
 .../camel-yaml-dsl-deserializers/pom.xml           |  36 -
 .../camel/dsl/yaml/deserializers/SplitTest.groovy  |  96 ---
 .../camel/dsl/yaml/deserializers/SplitTest.java    | 125 +++
 dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml          |  52 --
 .../org/apache/camel/dsl/yaml/AggregateTest.groovy | 169 ----
 .../org/apache/camel/dsl/yaml/BeansTest.groovy     | 428 ---------
 .../camel/dsl/yaml/ChoiceCamelExtTest.groovy       | 111 ---
 .../org/apache/camel/dsl/yaml/ChoiceTest.groovy    | 111 ---
 .../camel/dsl/yaml/CircuitBreakerTest.groovy       | 146 ----
 .../apache/camel/dsl/yaml/ConvertHeaderTest.groovy |  96 ---
 .../camel/dsl/yaml/ConvertVariableTest.groovy      |  97 ---
 .../org/apache/camel/dsl/yaml/DelayTest.groovy     |  72 --
 .../apache/camel/dsl/yaml/DynamicRouterTest.groovy |  58 --
 .../org/apache/camel/dsl/yaml/EndpointsTest.groovy | 114 ---
 .../org/apache/camel/dsl/yaml/EnrichTest.groovy    |  58 --
 .../camel/dsl/yaml/EnrichVariableTest.groovy       | 264 ------
 .../apache/camel/dsl/yaml/ErrorHandlerTest.groovy  | 213 -----
 .../apache/camel/dsl/yaml/ExpressionTest.groovy    | 194 -----
 .../org/apache/camel/dsl/yaml/FilterTest.groovy    | 130 ---
 .../apache/camel/dsl/yaml/FromVariableTest.groovy  | 116 ---
 .../camel/dsl/yaml/JSonPathSuppressTest.groovy     | 190 ----
 .../org/apache/camel/dsl/yaml/KameletTest.groovy   | 463 ----------
 .../apache/camel/dsl/yaml/LineNumberTest.groovy    | 159 ----
 .../apache/camel/dsl/yaml/LoadBalanceTest.groovy   |  89 --
 .../org/apache/camel/dsl/yaml/LoopTest.groovy      |  87 --
 .../org/apache/camel/dsl/yaml/MarshalTest.groovy   | 128 ---
 .../camel/dsl/yaml/MarshalVariableTest.groovy      | 270 ------
 .../org/apache/camel/dsl/yaml/NoteTest.groovy      |  93 --
 .../apache/camel/dsl/yaml/OnExceptionTest.groovy   | 102 ---
 .../apache/camel/dsl/yaml/PipeLoaderTest.groovy    | 857 -------------------
 .../apache/camel/dsl/yaml/PollEnrichTest.groovy    |  62 --
 .../org/apache/camel/dsl/yaml/PollTest.groovy      |  63 --
 .../apache/camel/dsl/yaml/RecipientListTest.groovy |  65 --
 .../apache/camel/dsl/yaml/RemoveHeaderTest.groovy  |  74 --
 .../camel/dsl/yaml/RemovePropertyTest.groovy       |  74 --
 .../camel/dsl/yaml/RemoveVariableTest.groovy       |  55 --
 .../apache/camel/dsl/yaml/ResequenceTest.groovy    |  77 --
 .../org/apache/camel/dsl/yaml/RestTest.groovy      | 250 ------
 .../camel/dsl/yaml/RouteConfigurationTest.groovy   | 463 ----------
 .../camel/dsl/yaml/RouteReloadNewFileTest.groovy   |  97 ---
 .../camel/dsl/yaml/RouteReloadRollbackTest.groovy  | 242 ------
 .../apache/camel/dsl/yaml/RouteTemplateTest.groovy | 551 ------------
 .../org/apache/camel/dsl/yaml/RoutesTest.groovy    | 458 ----------
 .../apache/camel/dsl/yaml/RoutingSlipTest.groovy   |  62 --
 .../camel/dsl/yaml/SSLContextParametersTest.groovy | 120 ---
 .../org/apache/camel/dsl/yaml/SagaTest.groovy      |  98 ---
 .../org/apache/camel/dsl/yaml/ScriptTest.groovy    |  58 --
 .../org/apache/camel/dsl/yaml/SetBodyTest.groovy   |  58 --
 .../org/apache/camel/dsl/yaml/SetHeaderTest.groovy |  90 --
 .../apache/camel/dsl/yaml/SetHeadersTest.groovy    |  92 --
 .../apache/camel/dsl/yaml/SetPropertyTest.groovy   |  64 --
 .../apache/camel/dsl/yaml/SetVariableTest.groovy   |  64 --
 .../apache/camel/dsl/yaml/SetVariablesTest.groovy  |  88 --
 .../org/apache/camel/dsl/yaml/SplitTest.groovy     | 128 ---
 .../camel/dsl/yaml/TemplatedRouteTest.groovy       | 147 ----
 .../org/apache/camel/dsl/yaml/ThrottleTest.groovy  |  61 --
 .../org/apache/camel/dsl/yaml/ToDynamicTest.groovy | 111 ---
 .../groovy/org/apache/camel/dsl/yaml/ToTest.groovy |  68 --
 .../camel/dsl/yaml/ToVariableDynamicTest.groovy    | 255 ------
 .../apache/camel/dsl/yaml/ToVariableTest.groovy    | 252 ------
 .../apache/camel/dsl/yaml/TransformersTest.groovy  | 128 ---
 .../org/apache/camel/dsl/yaml/TryTest.groovy       | 167 ----
 .../org/apache/camel/dsl/yaml/UnmarshalTest.groovy | 161 ----
 .../camel/dsl/yaml/UnmarshalVariableTest.groovy    | 268 ------
 .../org/apache/camel/dsl/yaml/ValidateTest.groovy  |  58 --
 .../apache/camel/dsl/yaml/ValidatorsTest.groovy    | 100 ---
 .../YamlDeserializerResolverDiscoveryTest.groovy   | 952 ---------------------
 .../camel/dsl/yaml/support/YamlTestSupport.groovy  | 231 -----
 .../dsl/yaml/support/model/MyBuiltBean.groovy      |  65 --
 .../org/apache/camel/dsl/yaml/AggregateTest.java   | 164 ++++
 .../org/apache/camel/dsl/yaml/BeanTest.java}       |  40 +-
 .../java/org/apache/camel/dsl/yaml/BeansTest.java  | 416 +++++++++
 .../org/apache/camel/dsl/yaml/CacheTest.java}      |  72 +-
 .../camel/dsl/yaml/CallNestedKameletTest.java}     |  32 +-
 .../apache/camel/dsl/yaml/ChoiceCamelExtTest.java  |  75 ++
 .../java/org/apache/camel/dsl/yaml/ChoiceTest.java |  87 ++
 .../apache/camel/dsl/yaml/CircuitBreakerTest.java  | 134 +++
 .../org/apache/camel/dsl/yaml/ClaimCheckTest.java} |  35 +-
 .../camel/dsl/yaml/CompactNotationWarnTest.java}   | 106 +--
 .../apache/camel/dsl/yaml/ConvertBodyTest.java}    |  58 +-
 .../apache/camel/dsl/yaml/ConvertHeaderTest.java   |  87 ++
 .../apache/camel/dsl/yaml/ConvertVariableTest.java |  87 ++
 .../apache/camel/dsl/yaml/DataFormatsTest.java}    |  39 +-
 .../java/org/apache/camel/dsl/yaml/DelayTest.java  |  75 ++
 .../apache/camel/dsl/yaml/DynamicRouterTest.java   |  61 ++
 .../apache/camel/dsl/yaml/EmptyRouteFileTest.java} |  37 +-
 .../org/apache/camel/dsl/yaml/EndpointsTest.java}  |  12 +-
 .../java/org/apache/camel/dsl/yaml/EnrichTest.java |  61 ++
 .../apache/camel/dsl/yaml/EnrichVariableTest.java  | 142 +++
 .../apache/camel/dsl/yaml/ErrorHandlerTest.java    | 224 +++++
 .../org/apache/camel/dsl/yaml/ExpressionTest.java  | 187 ++++
 .../java/org/apache/camel/dsl/yaml/FilterTest.java | 119 +++
 .../apache/camel/dsl/yaml/FromVariableTest.java    | 107 +++
 .../camel/dsl/yaml/IdempotentConsumerTest.java}    |  47 +-
 .../apache/camel/dsl/yaml/InterceptFromTest.java}  |  37 +-
 .../dsl/yaml/InterceptSendToEndpointTest.java}     |  39 +-
 .../org/apache/camel/dsl/yaml/InterceptTest.java}  |  69 +-
 .../camel/dsl/yaml/JSonPathSuppressTest.java       | 178 ++++
 .../org/apache/camel/dsl/yaml/KameletBean.java     |  82 ++
 .../dsl/yaml/KameletLoaderDependenciesTest.java}   |  48 +-
 .../apache/camel/dsl/yaml/KameletLoaderTest.java}  | 445 ++++------
 .../org/apache/camel/dsl/yaml/KameletTest.java     | 395 +++++++++
 .../org/apache/camel/dsl/yaml/LineNumberTest.java  | 153 ++++
 .../org/apache/camel/dsl/yaml/LoadBalanceTest.java |  82 ++
 .../org/apache/camel/dsl/yaml/LocationTest.java}   |  39 +-
 .../org/apache/camel/dsl/yaml/LogTest.java}        |  35 +-
 .../java/org/apache/camel/dsl/yaml/LoopTest.java   |  82 ++
 .../org/apache/camel/dsl/yaml/MainTest.java}       |  37 +-
 .../org/apache/camel/dsl/yaml/MarshalTest.java     | 130 +++
 .../apache/camel/dsl/yaml/MarshalVariableTest.java | 156 ++++
 .../camel/dsl/yaml/MessageHistoryFactoryTest.java} |  44 +-
 .../org/apache/camel/dsl/yaml/MulticastTest.java}  |  45 +-
 .../java/org/apache/camel/dsl/yaml/NoteTest.java   | 102 +++
 .../apache/camel/dsl/yaml/OnCompletionTest.java}   |  37 +-
 .../org/apache/camel/dsl/yaml/OnExceptionTest.java | 105 +++
 .../org/apache/camel/dsl/yaml/PausableTest.java}   |  27 +-
 .../dsl/yaml/PipeLoaderErrorHandlerTest.java}      | 209 +++--
 .../org/apache/camel/dsl/yaml/PipeLoaderTest.java  | 733 ++++++++++++++++
 .../org/apache/camel/dsl/yaml/PipelineTest.java}   |  28 +-
 .../org/apache/camel/dsl/yaml/PollEnrichTest.java  |  64 ++
 .../camel/dsl/yaml/PollEnrichVariableTest.java}    |  48 +-
 .../java/org/apache/camel/dsl/yaml/PollTest.java   |  73 ++
 .../org/apache/camel/dsl/yaml/ProcessTest.java}    |  58 +-
 .../apache/camel/dsl/yaml/RecipientListTest.java   |  67 ++
 .../apache/camel/dsl/yaml/RemoveHeaderTest.java    |  77 ++
 .../apache/camel/dsl/yaml/RemovePropertyTest.java  |  77 ++
 .../apache/camel/dsl/yaml/RemoveVariableTest.java  |  59 ++
 .../org/apache/camel/dsl/yaml/ResequenceTest.java  |  88 ++
 .../camel/dsl/yaml/ResolveResourceTest.java}       |  40 +-
 .../java/org/apache/camel/dsl/yaml/RestTest.java   | 243 ++++++
 .../org/apache/camel/dsl/yaml/ResumableTest.java}  |  28 +-
 .../org/apache/camel/dsl/yaml/RollbackTest.java}   |  32 +-
 .../camel/dsl/yaml/RouteConfigurationTest.java     | 421 +++++++++
 .../camel/dsl/yaml/RouteReloadNewFileTest.java     | 150 ++++
 .../camel/dsl/yaml/RouteReloadRollbackTest.java    | 328 +++++++
 .../apache/camel/dsl/yaml/RouteTemplateTest.java   | 542 ++++++++++++
 .../java/org/apache/camel/dsl/yaml/RoutesTest.java | 442 ++++++++++
 .../org/apache/camel/dsl/yaml/RoutingSlipTest.java |  64 ++
 .../camel/dsl/yaml/SSLContextParametersTest.java   | 125 +++
 .../java/org/apache/camel/dsl/yaml/SagaTest.java   | 105 +++
 .../org/apache/camel/dsl/yaml/SampleTest.java}     |  30 +-
 .../java/org/apache/camel/dsl/yaml/ScriptTest.java |  61 ++
 .../org/apache/camel/dsl/yaml/SetBodyTest.java     |  63 ++
 .../camel/dsl/yaml/SetExchangePatternTest.java}    |  30 +-
 .../org/apache/camel/dsl/yaml/SetHeaderTest.java   |  87 ++
 .../org/apache/camel/dsl/yaml/SetHeadersTest.java  |  85 ++
 .../org/apache/camel/dsl/yaml/SetPropertyTest.java |  64 ++
 .../org/apache/camel/dsl/yaml/SetVariableTest.java |  64 ++
 .../apache/camel/dsl/yaml/SetVariablesTest.java    |  85 ++
 .../camel/dsl/yaml/SimpleInitBlockTest.java}       |  98 +--
 .../apache/camel/dsl/yaml/SimplePrettyTest.java}   |  85 +-
 .../camel/dsl/yaml/SimpleTrimResultTest.java}      |  42 +-
 .../org/apache/camel/dsl/yaml/SortTest.java}       |  28 +-
 .../apache/camel/dsl/yaml/SplitKameletTest.java}   |  41 +-
 .../java/org/apache/camel/dsl/yaml/SplitTest.java  | 115 +++
 .../org/apache/camel/dsl/yaml/StepsTest.java}      |  46 +-
 .../org/apache/camel/dsl/yaml/StopTest.java}       |  24 +-
 .../apache/camel/dsl/yaml/TemplatedRouteTest.java  | 153 ++++
 .../org/apache/camel/dsl/yaml/ThreadsTest.java}    |  30 +-
 .../org/apache/camel/dsl/yaml/ThrottleTest.java    |  66 ++
 .../apache/camel/dsl/yaml/ThrowExceptionTest.java} |  32 +-
 .../org/apache/camel/dsl/yaml/ToDynamicTest.java   |  76 ++
 .../java/org/apache/camel/dsl/yaml/ToTest.java     |  76 ++
 .../camel/dsl/yaml/ToVariableDynamicTest.java      | 139 +++
 .../org/apache/camel/dsl/yaml/ToVariableTest.java  | 138 +++
 .../org/apache/camel/dsl/yaml/TransactedTest.java} |  29 +-
 .../camel/dsl/yaml/TransformDataTypeTest.java}     |  37 +-
 .../org/apache/camel/dsl/yaml/TransformTest.java}  |  39 +-
 .../apache/camel/dsl/yaml/TransformersTest.java    | 138 +++
 .../java/org/apache/camel/dsl/yaml/TryTest.java    | 121 +++
 .../org/apache/camel/dsl/yaml/UnmarshalTest.java   | 172 ++++
 .../camel/dsl/yaml/UnmarshalVariableTest.java      | 161 ++++
 .../org/apache/camel/dsl/yaml/ValidateTest.java    |  61 ++
 .../org/apache/camel/dsl/yaml/ValidatorsTest.java  | 109 +++
 .../org/apache/camel/dsl/yaml/WireTapTest.java}    |  49 +-
 .../camel/dsl/yaml/WireTapVariableTest.java}       |  50 +-
 .../apache/camel/dsl/yaml/XPathNamespaceTest.java} |  59 +-
 .../YamlDeserializerResolverDiscoveryTest.java     | 878 +++++++++++++++++++
 .../dsl/yaml/issues/KameletTemplatingTest.java}    |  76 +-
 .../dsl/yaml/support/MockRestConsumerFactory.java} |  20 +-
 .../camel/dsl/yaml/support/YamlTestSupport.java    | 263 ++++++
 .../camel/dsl/yaml/support/model/MyBean.java}      |  35 +-
 .../dsl/yaml/support/model/MyBeanBuilder.java}     |  40 +-
 .../camel/dsl/yaml/support/model/MyBuiltBean.java  |  85 ++
 .../camel/dsl/yaml/support/model/MyCtrBean.java}   |  32 +-
 .../dsl/yaml/support/model/MyDestroyBean.java}     |  50 +-
 .../camel/dsl/yaml/support/model/MyException.java} |   8 +-
 .../camel/dsl/yaml/support/model/MyFacBean.java}   |  34 +-
 .../camel/dsl/yaml/support/model/MyFacHelper.java} |   9 +-
 .../yaml/support/model/MyFailingProcessor.java}    |  12 +-
 .../camel/dsl/yaml/support/model/MyFooBar.java}    |  21 +-
 .../camel/dsl/yaml/support/model/MySetBody.java}   |  22 +-
 .../yaml/support/model/MyUppercaseProcessor.java}  |  12 +-
 .../org/apache/camel/dsl/yaml/ClaimCheckTest.java} |  38 +-
 .../apache/camel/dsl/yaml/EmptyRouteFileTest.java  |  40 +
 .../org/apache/camel/dsl/yaml/EndpointsTest.java}  |  12 +-
 .../java/org/apache/camel/dsl/yaml/LogTest.java}   |  38 +-
 .../org/apache/camel/dsl/yaml/MulticastTest.java}  |  48 +-
 .../org/apache/camel/dsl/yaml/PausableTest.java}   |  30 +-
 .../org/apache/camel/dsl/yaml/PipelineTest.java}   |  29 +-
 .../org/apache/camel/dsl/yaml/ResumableTest.java}  |  29 +-
 .../org/apache/camel/dsl/yaml/RollbackTest.java}   |  33 +-
 .../org/apache/camel/dsl/yaml/SampleTest.java}     |  31 +-
 .../java/org/apache/camel/dsl/yaml/SortTest.java}  |  29 +-
 .../java/org/apache/camel/dsl/yaml/StepsTest.java  |  46 +
 .../java/org/apache/camel/dsl/yaml/StopTest.java}  |  27 +-
 .../org/apache/camel/dsl/yaml/ThreadsTest.java}    |  31 +-
 .../apache/camel/dsl/yaml/ThrowExceptionTest.java} |  33 +-
 .../org/apache/camel/dsl/yaml/TransactedTest.java} |  39 +-
 .../camel/dsl/yaml/TransformDataTypeTest.java}     |  37 +-
 .../org/apache/camel/dsl/yaml/TransformTest.java}  |  40 +-
 parent/pom.xml                                     |   1 -
 217 files changed, 12605 insertions(+), 13701 deletions(-)

diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml
index 1a0f605e024b..1f9c6b121103 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml
@@ -34,12 +34,6 @@
 
     <properties>
         <firstVersion>3.9.0</firstVersion>
-        <sourcecheckExcludes>
-            **/*.groovy
-        </sourcecheckExcludes>
-        <sourcecheckExcludesComma>
-            ${sourcecheckExcludes},
-        </sourcecheckExcludesComma>
         <camel-prepare-component>false</camel-prepare-component>
     </properties>
 
@@ -66,36 +60,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <version>${spock-version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.groovy</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.junit.platform</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.groovy</groupId>
-            <artifactId>groovy</artifactId>
-            <version>${groovy-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.groovy</groupId>
-            <artifactId>groovy-test-junit5</artifactId>
-            <version>${groovy-version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
@@ -114,25 +78,4 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.gmavenplus</groupId>
-                <artifactId>gmavenplus-plugin</artifactId>
-                <version>${gmavenplus-plugin-version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>addTestSources</goal>
-                            <goal>compileTests</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <invokeDynamic>true</invokeDynamic>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
deleted file mode 100644
index d7956a3ab241..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * 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.dsl.yaml.common
-
-import groovy.transform.ToString
-import org.apache.camel.impl.DefaultCamelContext
-import org.apache.camel.spi.annotations.YamlType
-import org.snakeyaml.engine.v2.api.ConstructNode
-import org.snakeyaml.engine.v2.api.Load
-import org.snakeyaml.engine.v2.api.LoadSettings
-import org.snakeyaml.engine.v2.nodes.Node
-import org.snakeyaml.engine.v2.nodes.ScalarNode
-import spock.lang.Specification
-
-class ConstructorResolverTest extends Specification {
-
-    static int getJavaMajorVersion() {
-        String javaSpecVersion = System.getProperty("java.specification.version")
-
-        return Integer.parseInt(javaSpecVersion)
-
-    }
-
-    def "preserves same order resolvers for different node ids"() {
-        given:
-            def settings = LoadSettings.builder().build()
-        when:
-            def ctr = new YamlDeserializationContext(settings)
-            ctr.setCamelContext(new DefaultCamelContext())
-            ctr.addResolver(new MyNodeResolver())
-            ctr.addResolver(new MyNestedResolver())
-
-            def load = new Load(settings, ctr)
-
-            def result = load.loadFromString('''
-                - my-node:
-                    message: node
-                    nested:
-                      message: nested
-            '''.stripLeading())
-        then:
-            with(result, List) {
-                size() == 1
-
-                with(get(0), MyNode) {
-                    message == 'node'
-                    nested != null
-                    nested.message == 'nested'
-                }
-            }
-
-    }
-
-    def "clears constructor cache when resolver list changes"() {
-        given:
-            def settings = LoadSettings.builder().build()
-            def ctr = new YamlDeserializationContext(settings)
-            ctr.setCamelContext(new DefaultCamelContext())
-            ctr.addResolver(new FixedMyNodeResolver('first', YamlDeserializerResolver.ORDER_DEFAULT + 1))
-
-            def load = new Load(settings, ctr)
-
-        when:
-            def first = load.loadFromString('''
-                - my-node: {}
-            '''.stripLeading())
-
-            ctr.addResolver(new FixedMyNodeResolver('second', YamlDeserializerResolver.ORDER_DEFAULT))
-            def second = load.loadFromString('''
-                - my-node: {}
-            '''.stripLeading())
-
-        then:
-            first[0].message == 'first'
-            second[0].message == 'second'
-    }
-
-
-    static class MyNodeResolver implements YamlDeserializerResolver {
-        @Override
-        ConstructNode resolve(String id) {
-            switch (id) {
-                case 'my-node':
-                case 'org.apache.camel.dsl.yaml.common.ConstructorResolverTest$MyNode':
-                    return new MyNodeConstructor()
-            }
-            return null
-        }
-    }
-
-    static class MyNestedResolver implements YamlDeserializerResolver {
-        @Override
-        ConstructNode resolve(String id) {
-            switch (id) {
-                case 'nested':
-                case 'org.apache.camel.dsl.yaml.common.ConstructorResolverTest$MyNested':
-                    return new MyNestedConstructor()
-            }
-            return null
-        }
-    }
-
-    static class FixedMyNodeResolver implements YamlDeserializerResolver {
-        private final String message
-        private final int order
-
-        FixedMyNodeResolver(String message, int order) {
-            this.message = message
-            this.order = order
-        }
-
-        @Override
-        int getOrder() {
-            return order
-        }
-
-        @Override
-        ConstructNode resolve(String id) {
-            switch (id) {
-                case 'my-node':
-                    return new FixedMyNodeConstructor(message)
-            }
-            return null
-        }
-    }
-
-    static class FixedMyNodeConstructor extends YamlDeserializerBase<MyNode> {
-        private final String message
-
-        FixedMyNodeConstructor(String message) {
-            super(MyNode.class)
-            this.message = message
-        }
-
-        @Override
-        protected MyNode newInstance() {
-            return new MyNode(message: message)
-        }
-
-        @Override
-        protected boolean setProperty(MyNode target, String propertyKey, String propertyName, Node value) {
-            return false
-        }
-    }
-
-    @ToString
-    static class MyNode {
-        String message
-        MyNested nested
-    }
-
-    @ToString
-    static class MyNested {
-        String message
-    }
-
-    @YamlType(types = MyNode.class, nodes = [ "my-node" ])
-    static class MyNodeConstructor extends YamlDeserializerBase<MyNode> {
-        MyNodeConstructor() {
-            super(MyNode.class)
-        }
-
-        @Override
-        protected MyNode newInstance() {
-            return new MyNode()
-        }
-
-        @Override
-        protected MyNode newInstance(String value) {
-            return new MyNode(message: value)
-        }
-
-        @Override
-        protected boolean setProperty(MyNode target, String propertyKey, String propertyName, Node value) throws Exception {
-            switch (propertyKey) {
-                case 'message':
-                    target.message = ((ScalarNode)value).value
-                    break
-                case 'nested':
-                    target.nested = asType(value, MyNested.class)
-                    break
-                default:
-                    return false
-            }
-
-            return true
-        }
-    }
-
-    @YamlType(types = MyNested.class)
-    static class MyNestedConstructor extends YamlDeserializerBase<MyNested> {
-        MyNestedConstructor() {
-            super(MyNested.class)
-        }
-
-        @Override
-        protected MyNested newInstance() {
-            return new MyNested()
-        }
-
-        @Override
-        protected MyNested newInstance(String value) {
-            return new MyNested(message: value)
-        }
-
-        @Override
-        protected boolean setProperty(MyNested target, String propertyKey, String propertyName, Node value) throws Exception {
-            switch (propertyKey) {
-                case 'message':
-                    target.message = ((ScalarNode)value).value
-                    break
-                default:
-                    return false
-            }
-
-            return true
-        }
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/NodeAtTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/NodeAtTest.groovy
deleted file mode 100644
index 9df80f30ca8a..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/NodeAtTest.groovy
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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.dsl.yaml.common
-
-import org.snakeyaml.engine.v2.common.FlowStyle
-import org.snakeyaml.engine.v2.common.ScalarStyle
-import org.snakeyaml.engine.v2.nodes.MappingNode
-import org.snakeyaml.engine.v2.nodes.NodeTuple
-import org.snakeyaml.engine.v2.nodes.ScalarNode
-import org.snakeyaml.engine.v2.nodes.Tag
-import spock.lang.Specification
-
-class NodeAtTest extends Specification {
-
-    private static ScalarNode scalar(String value) {
-        return new ScalarNode(Tag.STR, value, ScalarStyle.PLAIN)
-    }
-
-    private static MappingNode mapping(Map<String, Object> entries) {
-        def tuples = entries.collect { k, v ->
-            def valNode = v instanceof Map ? mapping(v as Map<String, Object>) : scalar(v.toString())
-            new NodeTuple(scalar(k), valNode)
-        }
-        return new MappingNode(Tag.MAP, tuples, FlowStyle.BLOCK)
-    }
-
-    def "nodeAt with leading slash"() {
-        given:
-            def root = mapping(foo: [bar: 'hello'])
-        when:
-            def result = YamlDeserializerSupport.nodeAt(root, "/foo/bar")
-        then:
-            result instanceof ScalarNode
-            (result as ScalarNode).value == 'hello'
-    }
-
-    def "nodeAt without leading slash"() {
-        given:
-            def root = mapping(foo: [bar: 'hello'])
-        when:
-            def result = YamlDeserializerSupport.nodeAt(root, "foo/bar")
-        then:
-            result instanceof ScalarNode
-            (result as ScalarNode).value == 'hello'
-    }
-
-    def "nodeAt single segment"() {
-        given:
-            def root = mapping(foo: 'hello')
-        when:
-            def result = YamlDeserializerSupport.nodeAt(root, "/foo")
-        then:
-            result instanceof ScalarNode
-            (result as ScalarNode).value == 'hello'
-    }
-
-    def "nodeAt returns null for missing path"() {
-        given:
-            def root = mapping(foo: [bar: 'hello'])
-        when:
-            def result = YamlDeserializerSupport.nodeAt(root, "/foo/missing")
-        then:
-            result == null
-    }
-
-    def "nodeAt with empty pointer returns root"() {
-        given:
-            def root = mapping(foo: 'hello')
-        when:
-            def result = YamlDeserializerSupport.nodeAt(root, "")
-        then:
-            result == root
-    }
-
-    def "nodeAt three levels deep"() {
-        given:
-            def root = mapping(a: [b: [c: 'deep']])
-        when:
-            def result = YamlDeserializerSupport.nodeAt(root, "/a/b/c")
-        then:
-            result instanceof ScalarNode
-            (result as ScalarNode).value == 'deep'
-    }
-
-    def "nodeAt stops at first missing segment"() {
-        given:
-            def root = mapping(a: [b: [c: 'deep']])
-        when:
-            def result = YamlDeserializerSupport.nodeAt(root, "/a/missing/c")
-        then:
-            result == null
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/java/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/java/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.java
new file mode 100644
index 000000000000..5b4dc1e864a4
--- /dev/null
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/java/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.java
@@ -0,0 +1,243 @@
+/*
+ * 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.dsl.yaml.common;
+
+import java.util.List;
+
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spi.annotations.YamlType;
+import org.junit.jupiter.api.Test;
+import org.snakeyaml.engine.v2.api.ConstructNode;
+import org.snakeyaml.engine.v2.api.Load;
+import org.snakeyaml.engine.v2.api.LoadSettings;
+import org.snakeyaml.engine.v2.nodes.Node;
+import org.snakeyaml.engine.v2.nodes.ScalarNode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ConstructorResolverTest {
+
+    static int getJavaMajorVersion() {
+        String javaSpecVersion = System.getProperty("java.specification.version");
+        return Integer.parseInt(javaSpecVersion);
+    }
+
+    @Test
+    void preservesSameOrderResolversForDifferentNodeIds() {
+        var settings = LoadSettings.builder().build();
+        var ctr = new YamlDeserializationContext(settings);
+        ctr.setCamelContext(new DefaultCamelContext());
+        ctr.addResolver(new MyNodeResolver());
+        ctr.addResolver(new MyNestedResolver());
+
+        var load = new Load(settings, ctr);
+
+        var result = load.loadFromString("""
+                - my-node:
+                    message: node
+                    nested:
+                      message: nested
+                """);
+
+        assertThat(result).isNotNull();
+        var list = (List<?>) result;
+        assertThat(list.size()).isEqualTo(1);
+
+        var node = (MyNode) list.get(0);
+        assertThat(node.message).isEqualTo("node");
+        assertThat(node.nested).isNotNull();
+        assertThat(node.nested.message).isEqualTo("nested");
+    }
+
+    @Test
+    void clearsConstructorCacheWhenResolverListChanges() {
+        var settings = LoadSettings.builder().build();
+        var ctr = new YamlDeserializationContext(settings);
+        ctr.setCamelContext(new DefaultCamelContext());
+        ctr.addResolver(new FixedMyNodeResolver("first", YamlDeserializerResolver.ORDER_DEFAULT + 1));
+
+        var load = new Load(settings, ctr);
+
+        var first = (List<?>) load.loadFromString("""
+                - my-node: {}
+                """);
+
+        ctr.addResolver(new FixedMyNodeResolver("second", YamlDeserializerResolver.ORDER_DEFAULT));
+        var second = (List<?>) load.loadFromString("""
+                - my-node: {}
+                """);
+
+        assertThat(((MyNode) first.get(0)).message).isEqualTo("first");
+        assertThat(((MyNode) second.get(0)).message).isEqualTo("second");
+    }
+
+    // ---- inner support classes ----
+
+    static class MyNodeResolver implements YamlDeserializerResolver {
+        @Override
+        public ConstructNode resolve(String id) {
+            switch (id) {
+                case "my-node":
+                case "org.apache.camel.dsl.yaml.common.ConstructorResolverTest$MyNode":
+                    return new MyNodeConstructor();
+                default:
+                    return null;
+            }
+        }
+    }
+
+    static class MyNestedResolver implements YamlDeserializerResolver {
+        @Override
+        public ConstructNode resolve(String id) {
+            switch (id) {
+                case "nested":
+                case "org.apache.camel.dsl.yaml.common.ConstructorResolverTest$MyNested":
+                    return new MyNestedConstructor();
+                default:
+                    return null;
+            }
+        }
+    }
+
+    static class FixedMyNodeResolver implements YamlDeserializerResolver {
+        private final String message;
+        private final int order;
+
+        FixedMyNodeResolver(String message, int order) {
+            this.message = message;
+            this.order = order;
+        }
+
+        @Override
+        public int getOrder() {
+            return order;
+        }
+
+        @Override
+        public ConstructNode resolve(String id) {
+            if ("my-node".equals(id)) {
+                return new FixedMyNodeConstructor(message);
+            }
+            return null;
+        }
+    }
+
+    static class FixedMyNodeConstructor extends YamlDeserializerBase<MyNode> {
+        private final String message;
+
+        FixedMyNodeConstructor(String message) {
+            super(MyNode.class);
+            this.message = message;
+        }
+
+        @Override
+        protected MyNode newInstance() {
+            MyNode node = new MyNode();
+            node.message = message;
+            return node;
+        }
+
+        @Override
+        protected boolean setProperty(MyNode target, String propertyKey, String propertyName, Node value) {
+            return false;
+        }
+    }
+
+    static class MyNode {
+        String message;
+        MyNested nested;
+
+        @Override
+        public String toString() {
+            return "MyNode{message='" + message + "', nested=" + nested + "}";
+        }
+    }
+
+    static class MyNested {
+        String message;
+
+        @Override
+        public String toString() {
+            return "MyNested{message='" + message + "'}";
+        }
+    }
+
+    @YamlType(types = MyNode.class, nodes = { "my-node" })
+    static class MyNodeConstructor extends YamlDeserializerBase<MyNode> {
+        MyNodeConstructor() {
+            super(MyNode.class);
+        }
+
+        @Override
+        protected MyNode newInstance() {
+            return new MyNode();
+        }
+
+        @Override
+        protected MyNode newInstance(String value) {
+            MyNode node = new MyNode();
+            node.message = value;
+            return node;
+        }
+
+        @Override
+        protected boolean setProperty(MyNode target, String propertyKey, String propertyName, Node value) {
+            switch (propertyKey) {
+                case "message":
+                    target.message = ((ScalarNode) value).getValue();
+                    break;
+                case "nested":
+                    target.nested = asType(value, MyNested.class);
+                    break;
+                default:
+                    return false;
+            }
+            return true;
+        }
+    }
+
+    @YamlType(types = MyNested.class)
+    static class MyNestedConstructor extends YamlDeserializerBase<MyNested> {
+        MyNestedConstructor() {
+            super(MyNested.class);
+        }
+
+        @Override
+        protected MyNested newInstance() {
+            return new MyNested();
+        }
+
+        @Override
+        protected MyNested newInstance(String value) {
+            MyNested nested = new MyNested();
+            nested.message = value;
+            return nested;
+        }
+
+        @Override
+        protected boolean setProperty(MyNested target, String propertyKey, String propertyName, Node value) {
+            switch (propertyKey) {
+                case "message":
+                    target.message = ((ScalarNode) value).getValue();
+                    break;
+                default:
+                    return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/java/org/apache/camel/dsl/yaml/common/NodeAtTest.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/java/org/apache/camel/dsl/yaml/common/NodeAtTest.java
new file mode 100644
index 000000000000..ea2d7c5c05e3
--- /dev/null
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/java/org/apache/camel/dsl/yaml/common/NodeAtTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.dsl.yaml.common;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.snakeyaml.engine.v2.common.FlowStyle;
+import org.snakeyaml.engine.v2.common.ScalarStyle;
+import org.snakeyaml.engine.v2.nodes.MappingNode;
+import org.snakeyaml.engine.v2.nodes.NodeTuple;
+import org.snakeyaml.engine.v2.nodes.ScalarNode;
+import org.snakeyaml.engine.v2.nodes.Tag;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class NodeAtTest {
+
+    private static ScalarNode scalar(String value) {
+        return new ScalarNode(Tag.STR, value, ScalarStyle.PLAIN);
+    }
+
+    private static MappingNode mapping(Map<String, Object> entries) {
+        List<NodeTuple> tuples = new ArrayList<>();
+        for (Map.Entry<String, Object> e : entries.entrySet()) {
+            var valNode = e.getValue() instanceof Map
+                    ? mapping((Map<String, Object>) e.getValue())
+                    : scalar(e.getValue().toString());
+            tuples.add(new NodeTuple(scalar(e.getKey()), valNode));
+        }
+        return new MappingNode(Tag.MAP, tuples, FlowStyle.BLOCK);
+    }
+
+    @Test
+    void nodeAtWithLeadingSlash() {
+        var root = mapping(Map.of("foo", Map.of("bar", "hello")));
+        var result = YamlDeserializerSupport.nodeAt(root, "/foo/bar");
+        assertThat(result).isInstanceOf(ScalarNode.class);
+        assertThat(((ScalarNode) result).getValue()).isEqualTo("hello");
+    }
+
+    @Test
+    void nodeAtWithoutLeadingSlash() {
+        var root = mapping(Map.of("foo", Map.of("bar", "hello")));
+        var result = YamlDeserializerSupport.nodeAt(root, "foo/bar");
+        assertThat(result).isInstanceOf(ScalarNode.class);
+        assertThat(((ScalarNode) result).getValue()).isEqualTo("hello");
+    }
+
+    @Test
+    void nodeAtSingleSegment() {
+        var root = mapping(Map.of("foo", "hello"));
+        var result = YamlDeserializerSupport.nodeAt(root, "/foo");
+        assertThat(result).isInstanceOf(ScalarNode.class);
+        assertThat(((ScalarNode) result).getValue()).isEqualTo("hello");
+    }
+
+    @Test
+    void nodeAtReturnsNullForMissingPath() {
+        var root = mapping(Map.of("foo", Map.of("bar", "hello")));
+        var result = YamlDeserializerSupport.nodeAt(root, "/foo/missing");
+        assertThat(result).isNull();
+    }
+
+    @Test
+    void nodeAtWithEmptyPointerReturnsRoot() {
+        var root = mapping(Map.of("foo", "hello"));
+        var result = YamlDeserializerSupport.nodeAt(root, "");
+        assertThat(result).isEqualTo(root);
+    }
+
+    @Test
+    void nodeAtThreeLevelsDeep() {
+        var root = mapping(Map.of("a", Map.of("b", Map.of("c", "deep"))));
+        var result = YamlDeserializerSupport.nodeAt(root, "/a/b/c");
+        assertThat(result).isInstanceOf(ScalarNode.class);
+        assertThat(((ScalarNode) result).getValue()).isEqualTo("deep");
+    }
+
+    @Test
+    void nodeAtStopsAtFirstMissingSegment() {
+        var root = mapping(Map.of("a", Map.of("b", Map.of("c", "deep"))));
+        var result = YamlDeserializerSupport.nodeAt(root, "/a/missing/c");
+        assertThat(result).isNull();
+    }
+}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
index 0c164a77b3eb..88ea0e465d68 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
@@ -34,12 +34,6 @@
 
     <properties>
         <firstVersion>3.9.0</firstVersion>
-        <sourcecheckExcludes>
-            **/*.groovy
-        </sourcecheckExcludes>
-        <sourcecheckExcludesComma>
-            ${sourcecheckExcludes},
-        </sourcecheckExcludesComma>
         <camel-prepare-component>false</camel-prepare-component>
     </properties>
 
@@ -61,36 +55,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <version>${spock-version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.groovy</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.junit.platform</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.groovy</groupId>
-            <artifactId>groovy</artifactId>
-            <version>${groovy-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.groovy</groupId>
-            <artifactId>groovy-test-junit5</artifactId>
-            <version>${groovy-version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/test/groovy/org/apache/camel/dsl/yaml/deserializers/SplitTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/test/groovy/org/apache/camel/dsl/yaml/deserializers/SplitTest.groovy
deleted file mode 100644
index 04e20307a042..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/test/groovy/org/apache/camel/dsl/yaml/deserializers/SplitTest.groovy
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.dsl.yaml.deserializers
-
-import org.apache.camel.dsl.yaml.common.YamlDeserializationContext
-import org.apache.camel.impl.DefaultCamelContext
-import org.apache.camel.model.SplitDefinition
-import org.snakeyaml.engine.v2.api.Load
-import org.snakeyaml.engine.v2.api.LoadSettings
-import spock.lang.Specification
-
-class SplitTest extends Specification {
-
-    def "split"() {
-        given:
-            def settings = LoadSettings.builder().build()
-
-            def ctr = new YamlDeserializationContext(settings)
-            ctr.setCamelContext(new DefaultCamelContext())
-            ctr.addResolver(new CustomResolver())
-            ctr.addResolver(new ModelDeserializersResolver())
-        when:
-            def load = new Load(settings, ctr)
-
-            def result = load.loadFromString('''
-                - split:
-                    simple: test
-                    steps:
-                      - to:
-                          uri: to1                          
-                      - to:
-                          uri: to2
-            '''.stripLeading())
-        then:
-            with(result, List) {
-                size() == 1
-
-                with(get(0), SplitDefinition) {
-                    outputs.size() == 2
-                    expression != null
-                    expression.language == 'simple'
-                    expression.expression == 'test'
-                }
-            }
-    }
-
-    def "split with expression block"() {
-        given:
-            def settings = LoadSettings.builder().build()
-
-            def ctr = new YamlDeserializationContext(settings)
-            ctr.setCamelContext(new DefaultCamelContext())
-            ctr.addResolver(new CustomResolver())
-            ctr.addResolver(new ModelDeserializersResolver())
-        when:
-
-            def load = new Load(settings, ctr)
-
-            def result = load.loadFromString('''
-                - split:
-                    expression:
-                      simple: test
-                    steps:
-                      - to:
-                          uri: to1                          
-                      - to:
-                          uri: to2
-            '''.stripLeading())
-        then:
-            with(result, List) {
-                size() == 1
-
-                with(get(0), SplitDefinition) {
-                    outputs.size() == 2
-                    expression != null
-                    expression.language == 'simple'
-                    expression.expression == 'test'
-                }
-            }
-
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/test/java/org/apache/camel/dsl/yaml/deserializers/SplitTest.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/test/java/org/apache/camel/dsl/yaml/deserializers/SplitTest.java
new file mode 100644
index 000000000000..15e47134f7e3
--- /dev/null
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/test/java/org/apache/camel/dsl/yaml/deserializers/SplitTest.java
@@ -0,0 +1,125 @@
+/*
+ * 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.dsl.yaml.deserializers;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
+
+import org.apache.camel.dsl.yaml.common.YamlDeserializationContext;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.model.SplitDefinition;
+import org.apache.camel.spi.Resource;
+import org.junit.jupiter.api.Test;
+import org.snakeyaml.engine.v2.api.Load;
+import org.snakeyaml.engine.v2.api.LoadSettings;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SplitTest {
+
+    private static Resource dummyResource() {
+        return new Resource() {
+            @Override
+            public String getScheme() {
+                return "mem";
+            }
+
+            @Override
+            public String getLocation() {
+                return "test.yaml";
+            }
+
+            @Override
+            public boolean exists() {
+                return true;
+            }
+
+            @Override
+            public InputStream getInputStream() {
+                return new ByteArrayInputStream(new byte[0]);
+            }
+        };
+    }
+
+    @Test
+    void split() {
+        LoadSettings settings = LoadSettings.builder().build();
+
+        YamlDeserializationContext ctr = new YamlDeserializationContext(settings);
+        ctr.setCamelContext(new DefaultCamelContext());
+        ctr.setResource(dummyResource());
+        ctr.addResolver(new CustomResolver(new BeansDeserializer()));
+        ctr.addResolver(new ModelDeserializersResolver());
+
+        Load load = new Load(settings, ctr);
+
+        @SuppressWarnings("unchecked")
+        List<Object> result = (List<Object>) load.loadFromString("""
+                - split:
+                    simple: test
+                    steps:
+                      - to:
+                          uri: to1
+                      - to:
+                          uri: to2
+                """);
+
+        assertThat(result).isNotNull();
+        assertThat(result.size()).isEqualTo(1);
+
+        SplitDefinition split = (SplitDefinition) result.get(0);
+        assertThat(split.getOutputs().size()).isEqualTo(2);
+        assertThat(split.getExpression()).isNotNull();
+        assertThat(split.getExpression().getLanguage()).isEqualTo("simple");
+        assertThat(split.getExpression().getExpression()).isEqualTo("test");
+    }
+
+    @Test
+    void splitWithExpressionBlock() {
+        LoadSettings settings = LoadSettings.builder().build();
+
+        YamlDeserializationContext ctr = new YamlDeserializationContext(settings);
+        ctr.setCamelContext(new DefaultCamelContext());
+        ctr.setResource(dummyResource());
+        ctr.addResolver(new CustomResolver(new BeansDeserializer()));
+        ctr.addResolver(new ModelDeserializersResolver());
+
+        Load load = new Load(settings, ctr);
+
+        @SuppressWarnings("unchecked")
+        List<Object> result = (List<Object>) load.loadFromString("""
+                - split:
+                    expression:
+                      simple: test
+                    steps:
+                      - to:
+                          uri: to1
+                      - to:
+                          uri: to2
+                """);
+
+        assertThat(result).isNotNull();
+        assertThat(result.size()).isEqualTo(1);
+
+        SplitDefinition split = (SplitDefinition) result.get(0);
+        assertThat(split.getOutputs().size()).isEqualTo(2);
+        assertThat(split.getExpression()).isNotNull();
+        assertThat(split.getExpression().getLanguage()).isEqualTo("simple");
+        assertThat(split.getExpression().getExpression()).isEqualTo("test");
+    }
+}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
index 62dd2a5b5315..7ad71a1d79d6 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
@@ -36,12 +36,6 @@
         <firstVersion>3.9.0</firstVersion>
         <title>YAML DSL</title>
         <label>dsl</label>
-        <sourcecheckExcludes>
-            **/*.groovy
-        </sourcecheckExcludes>
-        <sourcecheckExcludesComma>
-            ${sourcecheckExcludes},
-        </sourcecheckExcludesComma>
         <annotations>
             routes.language=yaml
         </annotations>
@@ -73,23 +67,6 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <version>${spock-version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.groovy</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.junit.platform</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-main</artifactId>
@@ -206,19 +183,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.groovy</groupId>
-            <artifactId>groovy</artifactId>
-            <version>${groovy-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.groovy</groupId>
-            <artifactId>groovy-test-junit5</artifactId>
-            <version>${groovy-version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
@@ -340,22 +304,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.gmavenplus</groupId>
-                <artifactId>gmavenplus-plugin</artifactId>
-                <version>${gmavenplus-plugin-version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>addTestSources</goal>
-                            <goal>compileTests</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <invokeDynamic>true</invokeDynamic>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/AggregateTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/AggregateTest.groovy
deleted file mode 100644
index 23f90ebaeee8..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/AggregateTest.groovy
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.FailedToCreateRouteException
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.common.YamlDeserializationMode
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-
-class AggregateTest extends YamlTestSupport {
-    @Override
-    def doSetup() {
-        context.start()
-    }
-
-    def 'aggregate'() {
-        setup:
-            loadRoutes '''
-                - beans:
-                  - name: myAggregatorStrategy
-                    type: org.apache.camel.processor.aggregate.UseLatestAggregationStrategy
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - aggregate:
-                          aggregationStrategy: "myAggregatorStrategy"
-                          completionSize: 2
-                          correlationExpression:
-                            simple: "${header.StockSymbol}"
-                          steps:  
-                            - to: "mock:route"
-            '''
-
-            withMock('mock:route') {
-                expectedBodiesReceived '2', '4'
-            }
-
-        when:
-            withTemplate {
-                to('direct:route').withBody('1').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('2').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('3').withHeader('StockSymbol', 2).send()
-                to('direct:route').withBody('4').withHeader('StockSymbol', 2).send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def 'aggregate (flow)'() {
-        setup:
-            loadRoutes '''
-                - beans:
-                  - name: myAggregatorStrategy
-                    type: org.apache.camel.processor.aggregate.UseLatestAggregationStrategy
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - aggregate:
-                          aggregationStrategy: "myAggregatorStrategy"
-                          completionSize: 2
-                          correlationExpression:
-                            simple: "${header.StockSymbol}"
-                      - to: "mock:route"
-            '''
-
-            withMock('mock:route') {
-                expectedBodiesReceived '2', '4'
-            }
-
-        when:
-            withTemplate {
-                to('direct:route').withBody('1').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('2').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('3').withHeader('StockSymbol', 2).send()
-                to('direct:route').withBody('4').withHeader('StockSymbol', 2).send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def 'aggregate (strategy-ref class)'() {
-        setup:
-        loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - aggregate:
-                          aggregationStrategy: "#class:org.apache.camel.processor.aggregate.UseLatestAggregationStrategy"
-                          completionSize: 2
-                          correlationExpression:
-                            simple: "${header.StockSymbol}"
-                          steps:  
-                            - to: "mock:route"
-            '''
-
-        withMock('mock:route') {
-            expectedBodiesReceived '2', '4'
-        }
-
-        when:
-        withTemplate {
-            to('direct:route').withBody('1').withHeader('StockSymbol', 1).send()
-            to('direct:route').withBody('2').withHeader('StockSymbol', 1).send()
-            to('direct:route').withBody('3').withHeader('StockSymbol', 2).send()
-            to('direct:route').withBody('4').withHeader('StockSymbol', 2).send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    // CAMEL-24709: a #class: whose class does not exist says which built-in strategy was likely meant
-    def 'aggregate (strategy-ref class not found)'() {
-        when:
-        loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - aggregate:
-                          aggregationStrategy: "#class:com.foo.UseLatestAggregationStrategy"
-                          completionSize: 2
-                          correlationExpression:
-                            simple: "${header.StockSymbol}"
-                          steps:
-                            - to: "mock:route"
-            '''
-
-        then:
-        def e = thrown(FailedToCreateRouteException)
-        def msg = e.message + '\n' + e.cause?.message
-        msg.contains('No bean could be found in the registry for: #class:com.foo.UseLatestAggregationStrategy of type: org.apache.camel.AggregationStrategy')
-        msg.contains('did you mean org.apache.camel.processor.aggregate.UseLatestAggregationStrategy (org.apache.camel.AggregationStrategy)?')
-    }
-
-    def 'aggregate (strategy-ref unknown class lists the built-in strategies)'() {
-        when:
-        loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - aggregate:
-                          aggregationStrategy: "#class:com.foo.MyStrategy"
-                          completionSize: 2
-                          correlationExpression:
-                            simple: "${header.StockSymbol}"
-                          steps:
-                            - to: "mock:route"
-            '''
-
-        then:
-        def e = thrown(FailedToCreateRouteException)
-        def msg = e.message + '\n' + e.cause?.message
-        msg.contains('the built-in AggregationStrategy beans are')
-        msg.contains('UseLatestAggregationStrategy (org.apache.camel.processor.aggregate.UseLatestAggregationStrategy)')
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/BeansTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/BeansTest.groovy
deleted file mode 100644
index 8369214033e1..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/BeansTest.groovy
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.dsl.yaml.support.model.MyBean
-import org.apache.camel.dsl.yaml.support.model.MyBeanBuilder
-import org.apache.camel.dsl.yaml.support.model.MyBuiltBean
-import org.apache.camel.dsl.yaml.support.model.MyCtrBean
-import org.apache.camel.dsl.yaml.support.model.MyDestroyBean
-import org.apache.camel.dsl.yaml.support.model.MyFacBean
-import org.apache.camel.dsl.yaml.support.model.MyFacHelper
-import org.apache.camel.dsl.yaml.support.model.MyUppercaseProcessor
-
-class BeansTest extends YamlTestSupport {
-
-    def "beans"() {
-        when:
-            loadRoutes """
-                - beans:
-                  - name: myNested
-                    type: ${MyBean.class.name}
-                    properties:
-                      field1: 'f1'
-                      field2: 'f2'
-                      nested:
-                        foo: 'nf1'
-                        bar: 'nf2'
-                  - name: myProps
-                    type: ${MyBean.class.name}
-                    properties:
-                      field1: 'f1_p'
-                      field2: 'f2_p'
-                      nested.foo: 'nf1_p'
-                      nested.bar: 'nf2_p'
-            """
-
-        then:
-            with(context.registry.lookupByName('myNested'), MyBean) {
-                it.field1 == 'f1'
-                it.field2 == 'f2'
-                it.nested.foo == 'nf1'
-                it.nested.bar == 'nf2'
-            }
-            with(context.registry.lookupByName('myProps'), MyBean) {
-                it.field1 == 'f1_p'
-                it.field2 == 'f2_p'
-                it.nested.foo == 'nf1_p'
-                it.nested.bar == 'nf2_p'
-            }
-    }
-
-    def "beans with placeholders"() {
-        when:
-            context.propertiesComponent.setInitialProperties([
-                'p1': 'f1',
-                'p2': 'f2',
-                'p3': 'f3',
-            ] as Properties)
-
-            loadRoutes """
-                - beans:
-                  - name: myNested
-                    type: ${MyBean.class.name}
-                    properties:
-                      field1: '{{p1}}'
-                      nested:
-                        foo: '{{p2}}'
-                  - name: myProps
-                    type: ${MyBean.class.name}
-                    properties:
-                      nested.foo: '{{p3}}'
-            """
-        then:
-            with(context.registry.lookupByName('myNested'), MyBean) {
-                it.field1 == 'f1'
-                it.nested.foo == 'f2'
-            }
-            with(context.registry.lookupByName('myProps'), MyBean) {
-                it.nested.foo == 'f3'
-            }
-    }
-
-    def "beans with constructor"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myCtr
-                    type: ${MyCtrBean.class.name}
-                    constructors:
-                      0: 'f1'
-                      1: 'f2'
-                    properties:
-                      age: 42 
-            """
-
-        then:
-        with(context.registry.lookupByName('myCtr'), MyCtrBean) {
-            it.field1 == 'f1'
-            it.field2 == 'f2'
-            it.age == 42
-        }
-    }
-
-    def "beans with constructor sorted"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myCtr
-                    type: ${MyCtrBean.class.name}
-                    constructors:
-                      1: 'f2'
-                      0: 'f1'
-                    properties:
-                      age: 43 
-            """
-
-        then:
-        with(context.registry.lookupByName('myCtr'), MyCtrBean) {
-            it.field1 == 'f1'
-            it.field2 == 'f2'
-            it.age == 43
-        }
-    }
-
-    def "beans with factory"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myFac
-                    type: ${MyFacBean.class.name}
-                    factoryMethod: createBean
-                    constructors:
-                      0: 'fac1'
-                      1: 'fac2'
-                    properties:
-                      age: 43 
-            """
-
-        then:
-        with(context.registry.lookupByName('myFac'), MyFacBean) {
-            it.field1 == 'fac1'
-            it.field2 == 'fac2'
-            it.age == 43
-        }
-    }
-
-    def "beans with factory helper"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myFac
-                    type: ${MyFacBean.class.name}
-                    factoryBean: ${MyFacHelper.class.name}
-                    factoryMethod: createBean
-                    constructors:
-                      0: 'fac1'
-                      1: 'fac2'
-                    properties:
-                      age: 43 
-            """
-
-        then:
-        with(context.registry.lookupByName('myFac'), MyFacBean) {
-            it.field1 == 'fac1'
-            it.field2 == 'fac2'
-            it.age == 43
-        }
-    }
-
-    def "beans with init destroy"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myBean
-                    type: ${MyDestroyBean.class.name}
-                    initMethod: initMe
-                    destroyMethod: destroyMe
-                    constructors:
-                      0: 'fac1'
-                      1: 'fac2'
-                    properties:
-                      age: 43 
-            """
-
-        then:
-
-        MyDestroyBean.initCalled.get() == true
-        MyDestroyBean.destroyCalled.get() == false
-
-        with(context.registry.lookupByName('myBean'), MyDestroyBean) {
-            it.field1 == 'fac1'
-            it.field2 == 'fac2'
-            it.age == 43
-        }
-
-        context.stop()
-
-        MyDestroyBean.initCalled.get() == true
-        MyDestroyBean.destroyCalled.get() == true
-    }
-
-    def "beans with script"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myBean
-                    type: ${MyBean.class.name}
-                    scriptLanguage: groovy
-                    script: "var b = new ${MyBean.class.name}(); b.field1 = 'script1'; b.field2 = 'script2'; return b"
-            """
-
-        then:
-        with(context.registry.lookupByName('myBean'), MyBean) {
-            it.field1 == 'script1'
-            it.field2 == 'script2'
-        }
-    }
-
-    def "beans with script without type"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myBean
-                    scriptLanguage: groovy
-                    script: "var b = new ${MyBean.class.name}(); b.field1 = 'script1'; b.field2 = 'script2'; return b"
-            """
-
-        then:
-        with(context.registry.lookupByName('myBean'), MyBean) {
-            it.field1 == 'script1'
-            it.field2 == 'script2'
-        }
-    }
-
-    def "beans with script property placeholder default"() {
-        when:
-        context.getPropertiesComponent().addInitialProperty("cheese", "gauda")
-        context.getPropertiesComponent().addInitialProperty("cake", "strawberry")
-        loadRoutes """
-                - beans:
-                  - name: myBean
-                    type: ${MyBean.class.name}
-                    scriptLanguage: groovy
-                    script: "var b = new ${MyBean.class.name}(); b.field1 = '{{cheese}}'; b.field2 = '{{cake}}'; return b"
-            """
-
-        then:
-        with(context.registry.lookupByName('myBean'), MyBean) {
-            it.field1 == 'gauda'
-            it.field2 == 'strawberry'
-        }
-    }
-
-    def "beans with script property placeholder true"() {
-        when:
-        context.getPropertiesComponent().addInitialProperty("cheese", "gauda")
-        context.getPropertiesComponent().addInitialProperty("cake", "strawberry")
-        loadRoutes """
-                - beans:
-                  - name: myBean
-                    type: ${MyBean.class.name}
-                    scriptLanguage: groovy
-                    scriptPropertyPlaceholders: true
-                    script: "var b = new ${MyBean.class.name}(); b.field1 = '{{cheese}}'; b.field2 = '{{cake}}'; return b"
-            """
-
-        then:
-        with(context.registry.lookupByName('myBean'), MyBean) {
-            it.field1 == 'gauda'
-            it.field2 == 'strawberry'
-        }
-    }
-
-    def "beans with script property placeholder false"() {
-        when:
-        context.getPropertiesComponent().addInitialProperty("cheese", "gauda")
-        context.getPropertiesComponent().addInitialProperty("cake", "strawberry")
-        loadRoutes """
-                - beans:
-                  - name: myBean
-                    type: ${MyBean.class.name}
-                    scriptLanguage: groovy
-                    scriptPropertyPlaceholders: false
-                    script: "var b = new ${MyBean.class.name}(); b.field1 = '{{cheese}}'; b.field2 = '{{cake}}'; return b"
-            """
-
-        then:
-        with(context.registry.lookupByName('myBean'), MyBean) {
-            it.field1 == '{{cheese}}'
-            it.field2 == '{{cake}}'
-        }
-    }
-
-    def "beans with builder class"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myBean
-                    type: ${MyBean.class.name}
-                    builderClass: ${MyBeanBuilder.class.name}
-                    builderMethod: createTheBean
-                    properties:
-                      field1: builder1 
-                      field2: builder2 
-            """
-
-        then:
-        with(context.registry.lookupByName('myBean'), MyBean) {
-            it.field1 == 'builder1'
-            it.field2 == 'builder2'
-        }
-    }
-
-    // CAMEL-24820: a type with no public constructor but a builder() needs no builderClass and builderMethod
-    def "beans with inferred builder"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: chatModel
-                    type: ${MyBuiltBean.class.name}
-                    properties:
-                      baseUrl: http://localhost:11434
-                      modelName: qwen2.5
-                      timeout: 2m
-                      label: support
-            """
-
-        then:
-        with(context.registry.lookupByName('chatModel'), MyBuiltBean) {
-            it.baseUrl == 'http://localhost:11434'
-            it.modelName == 'qwen2.5'
-            it.timeout == java.time.Duration.ofMinutes(2)
-            // label is not a builder property but has a setter on the bean
-            it.label == 'support'
-        }
-    }
-
-    def "beans with inferred builder and unknown property fails with the property name"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: chatModel
-                    type: ${MyBuiltBean.class.name}
-                    properties:
-                      model: qwen2.5
-            """
-
-        then:
-        def e = thrown(Exception)
-        def msg = messages(e)
-        msg.contains('model=qwen2.5')
-        // (a Groovy class also has a metaClass property, which the runtime lists as any other setter)
-        msg.contains("The bean is created through its builder ${MyBuiltBean.Builder.class.name}, which accepts: baseUrl, ")
-        msg.contains("modelName, timeout; the created bean accepts: label")
-    }
-
-    // CAMEL-24709: a class that was not found names the built-in bean that was likely meant, from the bean metadata on the classpath
-    def "beans class not found in wrong package says did you mean"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myAgg
-                    type: com.foo.UseLatestAggregationStrategy
-            """
-
-        then:
-        def e = thrown(Exception)
-        def msg = messages(e)
-        msg.contains('Error creating bean: myAgg of type: #class:com.foo.UseLatestAggregationStrategy')
-        msg.contains('class com.foo.UseLatestAggregationStrategy was not found')
-        msg.contains('did you mean org.apache.camel.processor.aggregate.UseLatestAggregationStrategy (org.apache.camel.AggregationStrategy)?')
-        msg.contains('write: type: org.apache.camel.processor.aggregate.UseLatestAggregationStrategy')
-    }
-
-    def "beans class not found without package says did you mean"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myRepo
-                    type: MemoryAggregationRepository
-            """
-
-        then:
-        def e = thrown(Exception)
-        def msg = messages(e)
-        msg.contains('class MemoryAggregationRepository was not found')
-        msg.contains('did you mean org.apache.camel.processor.aggregate.MemoryAggregationRepository (org.apache.camel.spi.AggregationRepository)?')
-    }
-
-    def "beans class not found that is not a built-in bean keeps the generic hint"() {
-        when:
-        loadRoutes """
-                - beans:
-                  - name: myBean
-                    type: com.foo.MyBean
-            """
-
-        then:
-        def e = thrown(Exception)
-        def msg = messages(e)
-        msg.contains('class com.foo.MyBean was not found (check the package name; a class from another library needs its dependency added)')
-        !msg.contains('did you mean')
-    }
-
-    private static String messages(Throwable e) {
-        def sb = new StringBuilder()
-        for (Throwable t = e; t != null; t = t.cause) {
-            sb.append(t.message).append('\n')
-        }
-        return sb.toString()
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ChoiceCamelExtTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ChoiceCamelExtTest.groovy
deleted file mode 100644
index 8a1a08d53190..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ChoiceCamelExtTest.groovy
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.ChoiceDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.WhenDefinition
-
-class ChoiceCamelExtTest extends YamlTestSupport {
-
-    def "choice definition"() {
-        when:
-            loadRoutesExt("camel.yaml", '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - simple: "${body.size()} == 1"
-                              steps:
-                                - to: "log:when-a"
-                            - expression:
-                                simple: "${body.size()} == 2"
-                              steps:
-                                - to: "log:when-b"
-                          otherwise:
-                            steps:
-                              - to: "log:otherwise"
-            ''')
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0].outputs[0], ChoiceDefinition) {
-                with(whenClauses[0], WhenDefinition) {
-                    expression.language == 'simple'
-                    expression.expression == '${body.size()} == 1'
-                    with(outputs[0], ToDefinition) {
-                        endpointUri == 'log:when-a'
-                    }
-                }
-                with(whenClauses[1], WhenDefinition) {
-                    expression.language == 'simple'
-                    expression.expression == '${body.size()} == 2'
-                    with(outputs[0], ToDefinition) {
-                        endpointUri == 'log:when-b'
-                    }
-                }
-                with(otherwise.outputs[0], ToDefinition) {
-                    endpointUri == 'log:otherwise'
-                }
-            }
-    }
-
-    def "choice in precondition mode"() {
-        when:
-        loadRoutesExt("camel.yaml", '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:
-                          precondition: true
-                          when:
-                            - simple: "{{?red}}"
-                              steps:
-                                - to: "mock:red"
-                            - simple: "{{?blue}}"
-                              steps:
-                                - to: "mock:blue"
-                          otherwise:
-                            steps:
-                              - to: "mock:other"    
-            ''')
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0].outputs[0], ChoiceDefinition) {
-            with(whenClauses[0], WhenDefinition) {
-                expression.language == 'simple'
-                expression.expression == '{{?red}}'
-                with(outputs[0], ToDefinition) {
-                    endpointUri == 'mock:red'
-                }
-            }
-            with(whenClauses[1], WhenDefinition) {
-                expression.language == 'simple'
-                expression.expression == '{{?blue}}'
-                with(outputs[0], ToDefinition) {
-                    endpointUri == 'mock:blue'
-                }
-            }
-            with(otherwise.outputs[0], ToDefinition) {
-                endpointUri == 'mock:other'
-            }
-        }
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ChoiceTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ChoiceTest.groovy
deleted file mode 100644
index 4ae8a5f882af..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ChoiceTest.groovy
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.ChoiceDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.WhenDefinition
-
-class ChoiceTest extends YamlTestSupport {
-
-    def "choice definition"() {
-        when:
-            loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - simple: "${body.size()} == 1"
-                              steps:
-                                - to: "log:when-a"
-                            - expression:
-                                simple: "${body.size()} == 2"
-                              steps:
-                                - to: "log:when-b"
-                          otherwise:
-                            steps:
-                              - to: "log:otherwise"
-            '''
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0].outputs[0], ChoiceDefinition) {
-                with(whenClauses[0], WhenDefinition) {
-                    expression.language == 'simple'
-                    expression.expression == '${body.size()} == 1'
-                    with(outputs[0], ToDefinition) {
-                        endpointUri == 'log:when-a'
-                    }
-                }
-                with(whenClauses[1], WhenDefinition) {
-                    expression.language == 'simple'
-                    expression.expression == '${body.size()} == 2'
-                    with(outputs[0], ToDefinition) {
-                        endpointUri == 'log:when-b'
-                    }
-                }
-                with(otherwise.outputs[0], ToDefinition) {
-                    endpointUri == 'log:otherwise'
-                }
-            }
-    }
-
-    def "choice in precondition mode"() {
-        when:
-        loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:
-                          precondition: true
-                          when:
-                            - simple: "{{?red}}"
-                              steps:
-                                - to: "mock:red"
-                            - simple: "{{?blue}}"
-                              steps:
-                                - to: "mock:blue"
-                          otherwise:
-                            steps:
-                              - to: "mock:other"    
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0].outputs[0], ChoiceDefinition) {
-            with(whenClauses[0], WhenDefinition) {
-                expression.language == 'simple'
-                expression.expression == '{{?red}}'
-                with(outputs[0], ToDefinition) {
-                    endpointUri == 'mock:red'
-                }
-            }
-            with(whenClauses[1], WhenDefinition) {
-                expression.language == 'simple'
-                expression.expression == '{{?blue}}'
-                with(outputs[0], ToDefinition) {
-                    endpointUri == 'mock:blue'
-                }
-            }
-            with(otherwise.outputs[0], ToDefinition) {
-                endpointUri == 'mock:other'
-            }
-        }
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/CircuitBreakerTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/CircuitBreakerTest.groovy
deleted file mode 100644
index 6c1e8421d4ee..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/CircuitBreakerTest.groovy
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.CircuitBreakerDefinition
-import org.apache.camel.model.LogDefinition
-import org.apache.camel.model.RouteDefinition
-import org.apache.camel.model.ToDefinition
-import org.junit.jupiter.api.Assertions
-
-class CircuitBreakerTest extends YamlTestSupport {
-
-    def "circuitBreaker"() {
-        when:
-        loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - circuitBreaker:   
-                         steps:
-                           - log: "test"                           
-                         configuration: "my-config"
-                         resilience4jConfiguration:
-                           failureRateThreshold: 10
-                         onFallback:
-                           fallbackViaNetwork: true
-            '''
-        then:
-        with(context.routeDefinitions[0], RouteDefinition) {
-            input.endpointUri == 'direct:start'
-
-            with(outputs[0], CircuitBreakerDefinition) {
-                configuration == 'my-config'
-
-                resilience4jConfiguration != null
-                resilience4jConfiguration.failureRateThreshold == '10'
-
-                onFallback != null
-                onFallback.fallbackViaNetwork == "true"
-
-                with(outputs[0], LogDefinition) {
-                    message == "test"
-                }
-            }
-        }
-    }
-
-    def "circuitBreaker inheritErrorHandler placeholder"() {
-        when:
-        // YamlTestSupport validates against the raw schema (without the placeholder leniency of YamlValidator),
-        // which types inheritErrorHandler as boolean; the runtime resolves the placeholder when the route starts
-        // and YamlValidatorSchemaGroupsTest covers that the validator accepts it (CAMEL-24696)
-        loadRoutesNoValidate '''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - circuitBreaker:
-                         inheritErrorHandler: "{{myInherit}}"
-                         steps:
-                           - log: "test"
-            '''
-        then:
-        with(context.routeDefinitions[0], RouteDefinition) {
-            with(outputs[0], CircuitBreakerDefinition) {
-                inheritErrorHandler == '{{myInherit}}'
-            }
-        }
-    }
-
-    def "circuitBreaker with onFallback steps"() {
-        when:
-        loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - circuitBreaker: 
-                         steps:
-                           - to: "log:cb"
-                         onFallback:
-                             steps:
-                               - to: "log:fb" 
-            '''
-        then:
-        with(context.routeDefinitions[0], RouteDefinition) {
-            input.endpointUri == 'direct:start'
-
-            with(outputs[0], CircuitBreakerDefinition) {
-                outputs.size() == 1
-                with(outputs[0], ToDefinition) {
-                    endpointUri == "log:cb"
-                }
-                onFallback.outputs.size() == 1
-                with(onFallback.outputs[0], ToDefinition) {
-                    endpointUri == "log:fb"
-                }
-            }
-        }
-    }
-
-    // CAMEL-24700: the order of the keys must not matter
-    def "circuitBreaker with onFallback before steps"() {
-        when:
-        loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - circuitBreaker: 
-                         onFallback:
-                             steps:
-                               - to: "log:fb" 
-                         steps:
-                           - to: "log:cb"
-            '''
-        then:
-        with(context.routeDefinitions[0], RouteDefinition) {
-            input.endpointUri == 'direct:start'
-
-            with(outputs[0], CircuitBreakerDefinition) {
-                outputs.size() == 1
-                with(outputs[0], ToDefinition) {
-                    endpointUri == "log:cb"
-                }
-                onFallback.outputs.size() == 1
-                with(onFallback.outputs[0], ToDefinition) {
-                    endpointUri == "log:fb"
-                }
-            }
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ConvertHeaderTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ConvertHeaderTest.groovy
deleted file mode 100644
index 913b963c7a15..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ConvertHeaderTest.groovy
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.ConvertHeaderDefinition
-import org.junit.jupiter.api.Assertions
-
-class ConvertHeaderTest extends YamlTestSupport {
-
-    def "convert-header-to"() {
-        setup:
-            loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - convertHeaderTo:
-                          name: foo  
-                          type: "java.lang.String"
-                          charset: "UTF8"
-                      - to: "mock:result"
-            '''
-
-            withMock('mock:result') {
-                expectedHeaderReceived("foo", 'test')
-            }
-        when:
-            context.start()
-
-            withTemplate {
-                to('direct:start').withHeader("foo", 'test'.bytes).send()
-            }
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0].outputs[0], ConvertHeaderDefinition) {
-                name == 'foo'
-                type == 'java.lang.String'
-                charset == 'UTF8'
-            }
-
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "convert-header-another-to"() {
-        setup:
-        loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - convertHeaderTo:
-                          name: foo
-                          toName: bar  
-                          type: "java.lang.String"
-                          charset: "UTF8"
-                      - to: "mock:result"
-            '''
-
-        withMock('mock:result') {
-            expectedHeaderReceived("bar", 'test')
-        }
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withHeader("foo", 'test'.bytes).send()
-        }
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0].outputs[0], ConvertHeaderDefinition) {
-            name == 'foo'
-            toName == 'bar'
-            type == 'java.lang.String'
-            charset == 'UTF8'
-        }
-
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ConvertVariableTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ConvertVariableTest.groovy
deleted file mode 100644
index 922ded12cc0e..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ConvertVariableTest.groovy
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.ConvertVariableDefinition
-import org.junit.jupiter.api.Assertions
-
-class ConvertVariableTest extends YamlTestSupport {
-
-    def "convert-header-to"() {
-        setup:
-            loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - convertVariableTo:
-                          name: foo  
-                          type: "java.lang.String"
-                          charset: "UTF8"
-                      - to: "mock:result"
-            '''
-
-            withMock('mock:result') {
-                expectedVariableReceived("foo", 'Hello World')
-            }
-        when:
-            context.start()
-
-            withTemplate {
-                withVariable("foo", "Hello World")
-                to('direct:start').send()
-            }
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0].outputs[0], ConvertVariableDefinition) {
-                name == 'foo'
-                type == 'java.lang.String'
-                charset == 'UTF8'
-            }
-
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "convert-variable-another-to"() {
-        setup:
-        loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - convertVariableTo:
-                          name: foo
-                          toName: bar
-                          type: "java.lang.String"
-                          charset: "UTF8"
-                      - to: "mock:result"
-            '''
-
-        withMock('mock:result') {
-            expectedVariableReceived("foo", 'test')
-        }
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withVariable("foo", 'test'.bytes).send()
-        }
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0].outputs[0], ConvertVariableDefinition) {
-            name == 'foo'
-            toName == 'bar'
-            type == 'java.lang.String'
-            charset == 'UTF8'
-        }
-
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/DelayTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/DelayTest.groovy
deleted file mode 100644
index 1af1f0919433..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/DelayTest.groovy
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.DelayDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class DelayTest extends YamlTestSupport {
-
-    def "delay definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], DelayDefinition) {
-                asyncDelayed == 'true'
-                callerRunsWhenRejected == null
-                with(expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - delay:  
-                              simple: "${body}"
-                              async-delayed: true
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - delay: 
-                              expression: 
-                                simple: "${body}"
-                              async-delayed: true
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-camelCase', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - delay: 
-                              expression: 
-                                simple: "${body}"
-                              asyncDelayed: true
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/DynamicRouterTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/DynamicRouterTest.groovy
deleted file mode 100644
index 76e7ddc2da32..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/DynamicRouterTest.groovy
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.DynamicRouterDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class DynamicRouterTest extends YamlTestSupport {
-
-    def "dynamicRouter definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], DynamicRouterDefinition) {
-                with(expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - dynamicRouter:  
-                              simple: "${body}"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - dynamicRouter: 
-                              expression: 
-                                simple: "${body}"
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EndpointsTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EndpointsTest.groovy
deleted file mode 100644
index 774525c5d97d..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EndpointsTest.groovy
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.dsl.yaml
-
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-
-class EndpointsTest extends YamlTestSupport {
-
-    /*
-    def "endpoints dsl (#resource.location)"(Resource resource) {
-        setup:
-            context.propertiesComponent.initialProperties = [
-                'direct.id': 'myDirect',
-                'direct.timeout': '1234s',
-                'seda.id': 'mySeda',
-                'telegram.token': 'myToken+'
-            ] as Properties
-
-        when:
-            context.routesLoader.loadRoutes(resource)
-            context.start()
-
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0], RouteDefinition) {
-                input.endpointUri == 'direct:{{direct.id}}?timeout=#property:direct.timeout'
-
-                with (outputs[0], ToDefinition) {
-                    endpointUri == 'seda:{{seda.id}}'
-                }
-                with (outputs[1], ToDefinition) {
-                    endpointUri == 'telegram:bots?authorizationToken=RAW({{telegram.token}})'
-                }
-            }
-
-            with (context.endpoints.find {it instanceof DirectEndpoint}, DirectEndpoint) {
-                timeout == 1_234_000
-            }
-            with (context.endpoints.find {it instanceof SedaEndpoint}, SedaEndpoint) {
-                 endpointUri == 'seda://mySeda'
-            }
-            with (context.endpoints.find { it instanceof TelegramEndpoint }, TelegramEndpoint) {
-                endpointUri == 'telegram://bots?authorizationToken=RAW(myToken+)'
-                configuration.authorizationToken == 'myToken+'
-            }
-
-        where:
-            resource << [
-                Resource.fromString('route.yaml', '''
-                    - route:
-                        from:
-                          direct:
-                            name: "{{direct.id}}"
-                            timeout: "#property:direct.timeout"
-                        steps:
-                          - seda: "{{seda.id}}"
-                          - telegram:
-                              type: "bots"
-                              authorization-token: "{{telegram.token}}"
-                '''.stripIndent()),
-                Resource.fromString('route-raw.yaml', '''
-                    - route:
-                        from:
-                          direct:
-                            name: "{{direct.id}}"
-                            timeout: "#property:direct.timeout"
-                        steps:
-                          - seda: "{{seda.id}}"
-                          - telegram:
-                              type: "bots"
-                              authorization-token: "RAW({{telegram.token}})"
-                '''.stripIndent()),
-                Resource.fromString('from.yaml', '''
-                    - from:
-                        direct:
-                          name: "{{direct.id}}"
-                          timeout: "#property:direct.timeout"
-                        steps:
-                          - seda: "{{seda.id}}"
-                          - telegram:
-                              type: "bots"
-                              authorization-token: "{{telegram.token}}"
-                '''.stripIndent()),
-                Resource.fromString('from-raw.yaml', '''
-                    - from:
-                        direct:
-                          name: "{{direct.id}}"
-                          timeout: "#property:direct.timeout"
-                        steps:
-                          - seda: "{{seda.id}}"
-                          - telegram:
-                              type: "bots"
-                              authorization-token: "RAW({{telegram.token}})"
-                '''.stripIndent())
-            ]
-    }
-    */
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EnrichTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EnrichTest.groovy
deleted file mode 100644
index 55fdc0ae4a39..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EnrichTest.groovy
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.EnrichDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class EnrichTest extends YamlTestSupport {
-
-    def "enrich definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], EnrichDefinition) {
-                with(expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - enrich:  
-                              simple: "${body}"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - enrich: 
-                              expression: 
-                                simple: "${body}"
-                          - to: "mock:result"
-                    ''')
-           ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EnrichVariableTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EnrichVariableTest.groovy
deleted file mode 100644
index 3a889dfa05db..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EnrichVariableTest.groovy
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-
-class EnrichVariableTest extends YamlTestSupport {
-
-    def "enrichVariable send"() {
-        setup:
-            loadRoutes '''
-                - route:
-                    from:
-                      uri: direct:send
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - enrich:
-                            expression: 
-                              constant: "direct:foo"
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:receive
-                      steps:
-                        - enrich:
-                            expression: 
-                              constant: "direct:foo"
-                            variableReceive: bye
-                        - to:
-                            uri: mock:after
-                        - setBody:
-                            simple:
-                              expression: "${variable:bye}"
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:sendAndReceive
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - enrich:
-                            expression: 
-                              constant: "direct:foo"
-                            variableReceive: bye
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:foo
-                      steps:
-                        - transform:
-                            simple:
-                              expression: "Bye ${body}"
-            '''
-
-            withMock('mock:before') {
-                expectedBodiesReceived 'World'
-                expectedVariableReceived("hello", "Camel")
-            }
-            withMock('mock:result') {
-                expectedBodiesReceived 'Bye Camel'
-                expectedVariableReceived("hello", "Camel")
-            }
-
-        when:
-            context.start()
-
-            withTemplate {
-                to('direct:send').withBody('World').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-
-    def "enrichVariable receive"() {
-        setup:
-        loadRoutes '''
-                - route:
-                    from:
-                      uri: direct:send
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - enrich:
-                            expression: 
-                              constant: "direct:foo"
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:receive
-                      steps:
-                        - enrich:
-                            expression: 
-                              constant: "direct:foo"
-                            variableReceive: bye
-                        - to:
-                            uri: mock:after
-                        - setBody:
-                            simple:
-                              expression: "${variable:bye}"
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:sendAndReceive
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - enrich:
-                            expression: 
-                              constant: "direct:foo"
-                            variableReceive: bye
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:foo
-                      steps:
-                        - transform:
-                            simple:
-                              expression: "Bye ${body}"
-            '''
-
-        withMock('mock:after') {
-            expectedBodiesReceived 'World'
-            expectedVariableReceived("bye", "Bye World")
-        }
-        withMock('mock:result') {
-            expectedBodiesReceived 'Bye World'
-            expectedVariableReceived("bye", "Bye World")
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:receive').withBody('World').send()
-        }
-
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "enrichVariable sendAndReceive"() {
-        setup:
-        loadRoutes '''
-                - route:
-                    from:
-                      uri: direct:send
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - enrich:
-                            expression: 
-                              constant: "direct:foo"
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:receive
-                      steps:
-                        - enrich:
-                            expression: 
-                              constant: "direct:foo"
-                            variableReceive: bye
-                        - to:
-                            uri: mock:after
-                        - setBody:
-                            simple:
-                              expression: "${variable:bye}"
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:sendAndReceive
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - enrich:
-                            expression: 
-                              constant: "direct:foo"
-                            variableReceive: bye
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:foo
-                      steps:
-                        - transform:
-                            simple:
-                              expression: "Bye ${body}"
-            '''
-
-        withMock('mock:before') {
-            expectedBodiesReceived 'World'
-            expectedVariableReceived("hello", "Camel")
-        }
-        withMock('mock:result') {
-            expectedBodiesReceived 'World'
-            expectedVariableReceived("bye", "Bye Camel")
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:sendAndReceive').withBody('World').send()
-        }
-
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ErrorHandlerTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ErrorHandlerTest.groovy
deleted file mode 100644
index 39cdaba9fda8..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ErrorHandlerTest.groovy
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.model.MyFailingProcessor
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition
-import org.apache.camel.model.errorhandler.DefaultErrorHandlerDefinition
-import org.apache.camel.model.errorhandler.NoErrorHandlerDefinition
-import org.apache.camel.model.errorhandler.RefErrorHandlerDefinition
-import org.apache.camel.model.errorhandler.SpringTransactionErrorHandlerDefinition
-import org.junit.jupiter.api.Assertions
-
-class ErrorHandlerTest extends YamlTestSupport {
-
-    def "errorHandler (ref with bean)"() {
-        setup:
-            loadRoutes """
-                - beans:
-                  - name: myFailingProcessor
-                    type: ${MyFailingProcessor.name}
-                  - name: myErrorHandler
-                    type: org.apache.camel.model.errorhandler.DeadLetterChannelDefinition
-                    properties:
-                      dead-letter-uri: "mock:on-error"
-                      redelivery-delay: 0
-                - errorHandler:
-                    refErrorHandler: 
-                      ref: "myErrorHandler"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - process:
-                          ref: "myFailingProcessor"
-            """
-
-            withMock('mock:on-error') {
-                expectedMessageCount = 1
-            }
-
-        when:
-            context.start()
-
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-            }
-        then:
-            context.getCamelContextExtension().getErrorHandlerFactory() instanceof RefErrorHandlerDefinition
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "errorHandler (ref)"() {
-        setup:
-            loadRoutes """
-                - errorHandler:
-                    refErrorHandler:
-                      ref: "myErrorHandler"
-            """
-        when:
-            context.start()
-        then:
-            with(context.getCamelContextExtension().getErrorHandlerFactory(), RefErrorHandlerDefinition) {
-                ref == 'myErrorHandler'
-            }
-    }
-
-    def "errorHandler (ref inlined)"() {
-        setup:
-        loadRoutes """
-                - errorHandler:
-                    refErrorHandler: "myErrorHandler"
-            """
-        when:
-        context.start()
-        then:
-        with(context.getCamelContextExtension().getErrorHandlerFactory(), RefErrorHandlerDefinition) {
-            ref == 'myErrorHandler'
-        }
-    }
-
-    def "errorHandler (deadLetterChannel)"() {
-        setup:
-            loadRoutes """
-                - errorHandler:
-                    deadLetterChannel: 
-                      deadLetterUri: "mock:on-error"
-                      redeliveryPolicy:
-                        maximumRedeliveries: 3
-            """
-        when:
-            context.start()
-        then:
-            with(context.getCamelContextExtension().getErrorHandlerFactory(), DeadLetterChannelDefinition) {
-                deadLetterUri == 'mock:on-error'
-                redeliveryPolicy.maximumRedeliveries == "3"
-            }
-    }
-
-    def "errorHandler (defaultErrorHandler)"() {
-        setup:
-        loadRoutes """
-                - errorHandler:
-                    defaultErrorHandler:
-                      useOriginalMessage: true 
-                      redeliveryPolicy:
-                        maximumRedeliveries: 2
-            """
-        when:
-        context.start()
-        then:
-        with(context.getCamelContextExtension().getErrorHandlerFactory(), DefaultErrorHandlerDefinition) {
-            useOriginalMessage == "true"
-            redeliveryPolicy.maximumRedeliveries == "2"
-        }
-    }
-
-    def "errorHandler (no)"() {
-        setup:
-            loadRoutes """
-                - errorHandler:
-                    noErrorHandler: {}
-            """
-        when:
-            context.start()
-        then:
-            context.getCamelContextExtension().getErrorHandlerFactory() instanceof NoErrorHandlerDefinition
-    }
-
-    def "errorHandler (redelivery policy ref)"() {
-        setup:
-        loadRoutes """
-                - beans:
-                  - name: myFailingProcessor
-                    type: ${MyFailingProcessor.name}
-                  - name: myPolicy
-                    type: org.apache.camel.processor.errorhandler.RedeliveryPolicy
-                    properties:
-                      maximumRedeliveries: 3
-                      logStackTrace: true
-                - errorHandler:
-                    defaultErrorHandler:
-                      useOriginalMessage: true 
-                      redeliveryPolicyRef: myPolicy
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - process:
-                          ref: "myFailingProcessor"
-            """
-
-        when:
-        context.start()
-        then:
-        with(context.getCamelContextExtension().getErrorHandlerFactory(), DefaultErrorHandlerDefinition) {
-            useOriginalMessage == "true"
-            hasRedeliveryPolicy() == false
-            redeliveryPolicyRef == "myPolicy"
-        }
-    }
-
-    def "errorHandler (springTransactionErrorHandler)"() {
-        setup:
-            loadRoutesNoValidate """
-                - errorHandler:
-                    springTransactionErrorHandler:
-                      transactedPolicyRef: "myTxPolicy"
-            """
-        when:
-            context.start()
-        then:
-            with(context.getCamelContextExtension().getErrorHandlerFactory(), SpringTransactionErrorHandlerDefinition) {
-                transactedPolicyRef == 'myTxPolicy'
-            }
-    }
-
-    def "Error: duplicate errorHandler"() {
-        when:
-        var route = """
-                - errorHandler:
-                    defaultErrorHandler:
-                      useOriginalMessage: true 
-                      redeliveryPolicy:
-                        maximumRedeliveries: 2
-                    deadLetterChannel: 
-                      deadLetterUri: "mock:on-error"
-                      redeliveryPolicy:
-                        maximumRedeliveries: 3
-            """
-        then:
-        try {
-            loadRoutes(route)
-            Assertions.fail("Should have thrown exception")
-        } catch(e) {
-            assert e.message.contains("2 are valid")
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ExpressionTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ExpressionTest.groovy
deleted file mode 100644
index 0ea5d4eb91db..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ExpressionTest.groovy
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.ChoiceDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.WhenDefinition
-import org.junit.jupiter.api.Assertions
-
-class ExpressionTest extends YamlTestSupport {
-
-    def "Error: duplicate inline expressions"() {
-        when:
-        var route = '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - simple: "${body.size()} == 1"
-                              jq: ".size == 1"
-                              steps:
-                                - to: "log:when-a"
-            '''
-        then:
-        try {
-            loadRoutes(route)
-            Assertions.fail("Should have thrown exception")
-        } catch (IllegalArgumentException e) {
-            Assertions.assertTrue(e.getMessage().contains("2 are valid"), e.getMessage())
-        }
-    }
-
-    def "Error: duplicate explicit expressions"() {
-        when:
-        var route = '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - expression:
-                                simple: "${body.size()} == 1"
-                                jq: ".size == 1"
-                              steps:
-                                - to: "log:when-a"
-            '''
-        then:
-        try {
-            loadRoutes(route)
-            Assertions.fail("Should have thrown exception")
-        } catch (IllegalArgumentException e) {
-            Assertions.assertTrue(e.getMessage().contains("2 are valid"), e.getMessage())
-        }
-    }
-
-    def "Error: inline and explicit expressions"() {
-        when:
-        var route = '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - simple: "${body.size()} == 1"
-                              expression:
-                                jq: ".size == 1"
-                              steps:
-                                - to: "log:when-a"
-            '''
-        then:
-        try {
-            loadRoutes(route)
-            Assertions.fail("Should have thrown exception")
-        } catch (IllegalArgumentException e) {
-            Assertions.assertTrue(e.getMessage().contains("2 are valid"), e.getMessage())
-        }
-    }
-
-    def "Error: inline not existing"() {
-        when:
-        var route = '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - notsimple: "${body.size()} == 1"
-                              steps:
-                                - to: "log:when-a"
-            '''
-        then:
-        try {
-            loadRoutes(route)
-            Assertions.fail("Should have thrown exception")
-        } catch (Exception e) {
-            Assertions.assertTrue(e.getMessage().contains("additional properties"), e.getMessage())
-        }
-    }
-
-    def "Error: explicit not existing"() {
-        when:
-        var route = '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - expression:
-                                notsimple: "${body.size()} == 1"
-                              steps:
-                                - to: "log:when-a"
-            '''
-        then:
-        try {
-            loadRoutes(route)
-            Assertions.fail("Should have thrown exception")
-        } catch (Exception e) {
-            Assertions.assertTrue(e.getMessage().contains("0 are valid"), e.getMessage())
-        }
-    }
-
-    // CAMEL-24707: an expression node without its expression is rejected when the file is loaded, not when the
-    // route is created (the schema marks the expression required; sort is the only node where it is optional)
-    def "no expression"() {
-        when:
-        var route = '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - steps:
-                                - to: "log:when-a"
-            '''
-        then:
-        try {
-            loadRoutes(route)
-            Assertions.fail("Should have thrown exception")
-        } catch (Exception e) {
-            Assertions.assertTrue(e.getMessage().contains("when/0"), e.getMessage())
-        }
-    }
-
-    def "sort without expression is allowed"() {
-        when:
-        loadRoutes('''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - sort:
-                          comparator: "#myComparator"
-                      - to: "log:sorted"
-            ''')
-        then:
-        context.routeDefinitions.size() == 1
-    }
-
-    // CAMEL-24752: an unknown expression id says which built-in language was likely meant
-    def "Error: explicit not existing says did you mean"() {
-        when:
-        loadRoutesNoValidate('''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - setBody:
-                          expression:
-                            simpel: "${body}"
-            ''')
-        then:
-        def e = thrown(Exception)
-        def messages = []
-        for (Throwable t = e; t != null; t = t.cause) {
-            messages << t.message
-        }
-        messages.any { it != null && it.contains("Unknown expression with id: simpel (not a built-in Camel language; did you mean 'simple'?)") }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FilterTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FilterTest.groovy
deleted file mode 100644
index 4f51eca3ea08..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FilterTest.groovy
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.FilterDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class FilterTest extends YamlTestSupport {
-
-    def "filter definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], FilterDefinition) {
-                with(expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-                with(outputs[0], ToDefinition) {
-                    endpointUri == 'mock:filter'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - filter:  
-                              simple: "${body}"
-                              steps:
-                                - to: "mock:filter"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - filter: 
-                              expression: 
-                                simple: "${body}"
-                              steps:
-                                - to: "mock:filter"
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-
-    def "filter"() {
-        setup:
-            loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - filter:
-                          simple: "${body.startsWith(\\"a\\")}"
-                          steps:
-                            - to: "mock:filter"
-                      - to: "mock:route"
-            '''
-
-            withMock('mock:route') {
-                expectedMessageCount 2
-                expectedBodiesReceived 'a', 'b'
-            }
-            withMock('mock:filter') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'a'
-            }
-
-        when:
-            context.start()
-
-            withTemplate {
-                to('direct:route').withBody('a').send()
-                to('direct:route').withBody('b').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "filter (flow)"() {
-        setup:
-            loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - filter:
-                          simple: "${body.startsWith(\\"a\\")}"
-                      - to: "mock:filter"
-            '''
-
-            withMock('mock:filter') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'a'
-            }
-
-        when:
-            context.start()
-
-            withTemplate {
-                to('direct:route').withBody('a').send()
-                to('direct:route').withBody('b').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FromVariableTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FromVariableTest.groovy
deleted file mode 100644
index 841751929f3e..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FromVariableTest.groovy
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.junit.jupiter.api.Assertions
-
-class FromVariableTest extends YamlTestSupport {
-
-    def "fromVariable"() {
-        setup:
-            loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    variableReceive: "myKey"
-                    steps:
-                      - setHeader:
-                          name: foo
-                          constant: "456"
-                      - setHeader:
-                          name: bar
-                          constant: "Murphy"
-                      - transform:
-                          simple: "Bye ${body}"
-                      - to: "mock:foo"
-                      - setBody:
-                          simple: "${variable:myKey}"
-                      - to: "mock:result"
-            '''
-
-            withMock('mock:foo') {
-                expectedBodiesReceived 'Bye '
-                whenAnyExchangeReceived { e -> {
-                    Map m = e.getVariable("header:myKey", Map.class)
-                    Assertions.assertNotNull(m)
-                    Assertions.assertEquals(1, m.size())
-                    Assertions.assertEquals(123, m.get("foo"))
-                }}
-            }
-            withMock('mock:result') {
-                expectedBodiesReceived 'World'
-            }
-
-        when:
-            context.start()
-
-            withTemplate {
-                to('direct:start').withBody('World').withHeader("foo", 123).send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "routeFromVariable"() {
-        setup:
-        loadRoutes '''
-              - route:
-                  from:
-                    uri: "direct:start"
-                    variableReceive: "myKey"
-                    steps:
-                      - setHeader:
-                          name: foo
-                          constant: "456"
-                      - setHeader:
-                          name: bar
-                          constant: "Murphy"
-                      - transform:
-                          simple: "Bye ${body}"
-                      - to: "mock:foo"
-                      - setBody:
-                          simple: "${variable:myKey}"
-                      - to: "mock:result"
-            '''
-
-        withMock('mock:foo') {
-            expectedBodiesReceived 'Bye '
-            whenAnyExchangeReceived { e -> {
-                Map m = e.getVariable("header:myKey", Map.class)
-                Assertions.assertNotNull(m)
-                Assertions.assertEquals(1, m.size())
-                Assertions.assertEquals(123, m.get("foo"))
-            }}
-        }
-        withMock('mock:result') {
-            expectedBodiesReceived 'World'
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('World').withHeader("foo", 123).send()
-        }
-
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/JSonPathSuppressTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/JSonPathSuppressTest.groovy
deleted file mode 100644
index e46e58458cf6..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/JSonPathSuppressTest.groovy
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.ChoiceDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.WhenDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class JSonPathSuppressTest extends YamlTestSupport {
-
-    def "jsonpath-suppress definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-        with(context.routeDefinitions[0].outputs[0], ChoiceDefinition) {
-            with(whenClauses[0], WhenDefinition) {
-                expression.language == 'jsonpath'
-                expression.expression == 'person.middlename'
-                with(outputs[0], ToDefinition) {
-                    endpointUri == 'mock:middle'
-                }
-            }
-            with(otherwise.outputs[0], ToDefinition) {
-                endpointUri == 'mock:other'
-            }
-        }
-        where:
-            resource << [
-                asResource('expression', '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - jsonpath: "person.middlename"
-                              steps:
-                                - to: "mock:middle"
-                          otherwise:
-                            steps:
-                              - to: "mock:other"
-            '''),
-                asResource('expression-block', '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                            - expression:
-                                jsonpath: "person.middlename"
-                              steps:
-                                - to: "mock:middle"
-                          otherwise:
-                            steps:
-                              - to: "mock:other"
-                    ''')
-            ]
-    }
-
-    def "supress-test-middle"() {
-        setup:
-        loadRoutes """
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                          - jsonpath: 
-                              expression: "person.middlename"
-                              suppressExceptions: true
-                            steps:
-                            - to: "mock:middle"
-                          otherwise:
-                            steps:
-                              - to: "mock:other"
-            """
-
-        withMock('mock:middle') {
-            expectedMessageCount(1)
-        }
-        withMock('mock:other') {
-            expectedMessageCount(0)
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody("{\"person\" : {\"firstname\" : \"foo\", \"middlename\" : \"foo2\", \"lastname\" : \"bar\"}}").send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "supress-test-no-middle"() {
-        setup:
-        loadRoutes """
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                          - jsonpath: 
-                              expression: "person.middlename"
-                              suppressExceptions: true
-                            steps:
-                            - to: "mock:middle"
-                          otherwise:
-                            steps:
-                              - to: "mock:other"
-            """
-
-        withMock('mock:middle') {
-            expectedMessageCount(0)
-        }
-        withMock('mock:other') {
-            expectedMessageCount(1)
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody("{\"person\" : {\"firstname\" : \"foo\", \"lastname\" : \"bar\"}}").send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "supress-test-last"() {
-        setup:
-        loadRoutes """
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - choice:  
-                          when:
-                          - jsonpath: 
-                              expression: "person.middlename"
-                              suppressExceptions: true
-                            steps:
-                            - to: "mock:middle"
-                          - jsonpath: 
-                              expression: "person.lastname"
-                              suppressExceptions: true
-                            steps:
-                            - to: "mock:last"
-                          otherwise:
-                            steps:
-                              - to: "mock:other"
-            """
-
-        withMock('mock:middle') {
-            expectedMessageCount(0)
-        }
-        withMock('mock:last') {
-            expectedMessageCount(1)
-        }
-        withMock('mock:other') {
-            expectedMessageCount(0)
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody("{\"person\" : {\"firstname\" : \"foo\", \"lastname\" : \"bar\"}}").send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy
deleted file mode 100644
index 6bb97540ec6e..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.common.YamlDeserializationMode
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.dsl.yaml.support.model.MySetBody
-import org.apache.camel.dsl.yaml.support.model.MyUppercaseProcessor
-import org.apache.camel.model.KameletDefinition
-import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy
-import org.apache.camel.spi.Resource
-
-class KameletTest extends YamlTestSupport {
-    @Override
-    def doSetup() {
-        context.start()
-    }
-
-    def "kamelet (#resource)"(Tuple<Resource> resource) {
-        setup:
-            addTemplate('setPayload') {
-                from('kamelet:source')
-                    .setBody().simple('${body}: {{payload}}')
-            }
-
-            loadRoutes(resource[0] as Resource)
-
-            withMock('mock:kamelet') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'a: 1'
-            }
-        when:
-            withTemplate {
-                to('direct:start').withBody('a').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-
-        where:
-            resource << [
-                new Tuple<Resource>(
-                        asResource('inline', '''
-                        - from:
-                            uri: "direct:start"
-                            steps:
-                              - kamelet: "setPayload?payload=1"
-                              - to: "mock:kamelet"
-                        ''')),
-                new Tuple<Resource>(
-                        asResource('name', '''
-                        - from:
-                            uri: "direct:start"
-                            steps:
-                              - kamelet: 
-                                  name: "setPayload?payload=1"
-                              - to: "mock:kamelet"
-                        ''')),
-                new Tuple<Resource>(
-                        asResource('properties', '''
-                            - from:
-                                uri: "direct:start"
-                                steps:
-                                  - kamelet: 
-                                      name: "setPayload"
-                                      parameters:
-                                        payload: 1
-                                  - to: "mock:kamelet"
-                            '''))
-            ]
-    }
-
-    def "kamelet (aggregation)"() {
-        setup:
-            addTemplate('aggregate') {
-                from('kamelet:source')
-                        .aggregate()
-                            .simple('${header.StockSymbol}')
-                            .aggregationStrategy(new UseLatestAggregationStrategy())
-                            .completionSize("{{size}}")
-                            .to("kamelet:sink")
-            }
-
-            loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - kamelet: 
-                          name: aggregate?size=2
-                          steps:
-                            - to: "mock:result"
-            '''
-
-            withMock('mock:result') {
-                expectedBodiesReceived '2', '4'
-            }
-
-        when:
-            withTemplate {
-                to('direct:route').withBody('1').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('2').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('3').withHeader('StockSymbol', 2).send()
-                to('direct:route').withBody('4').withHeader('StockSymbol', 2).send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-
-    def "kamelet (filter with flow)"() {
-        setup:
-            addTemplate('simple-filter') {
-                from('kamelet:source')
-                    .filter().simple('${header.foo} == "a"')
-                    .to("kamelet:sink")
-            }
-
-            loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - kamelet: 
-                          name: "simple-filter"
-                      - to: 
-                          uri: "mock:result"
-            '''
-
-            withMock('mock:result') {
-                expectedBodiesReceived '1', '3'
-            }
-
-        when:
-            withTemplate {
-                to('direct:route').withBody('1').withHeader('foo', 'a').send()
-                to('direct:route').withBody('2').withHeader('foo', 'b').send()
-                to('direct:route').withBody('3').withHeader('foo', 'a').send()
-                to('direct:route').withBody('4').withHeader('foo', 'c').send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "kamelet (aggregation with flow)"() {
-        setup:
-            addTemplate('aggregate') {
-                from('kamelet:source')
-                        .aggregate()
-                        .simple('${header.StockSymbol}')
-                        .aggregationStrategy(new UseLatestAggregationStrategy())
-                        .completionSize("{{size}}")
-                        .to("kamelet:sink")
-            }
-
-            loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - kamelet: aggregate?size=2
-                      - to: "mock:result"
-            '''
-
-            withMock('mock:result') {
-                expectedBodiesReceived '2', '4'
-            }
-
-        when:
-            withTemplate {
-                to('direct:route').withBody('1').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('2').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('3').withHeader('StockSymbol', 2).send()
-                to('direct:route').withBody('4').withHeader('StockSymbol', 2).send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "kamelet (definition with local bean)"() {
-        setup:
-            loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    beans:
-                      - name: "myProcessor"
-                        type: "#class:${MyUppercaseProcessor.class.name}"
-                    from:
-                      uri: "kamelet:source"
-                      steps:
-                        - process:
-                            ref: "{{myProcessor}}"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - to: "kamelet:myTemplate"
-                      - to: "mock:result"
-            """
-
-            withMock('mock:result') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'HELLO'
-            }
-        when:
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "kamelet (definition with local bean and properties)"() {
-        setup:
-            loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    beans:
-                      - name: "myProcessor"
-                        type: "#class:${MySetBody.class.name}"
-                        properties:
-                          payload: "test-payload"
-                    from:
-                      uri: "kamelet:source"
-                      steps:
-                        - process:
-                            ref: "{{myProcessor}}"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - to: "kamelet:myTemplate"
-                      - to: "mock:result"
-            """
-
-            withMock('mock:result') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'test-payload'
-            }
-        when:
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "kamelet (definition with local bean and property)"() {
-        setup:
-            loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    beans:
-                      - name: "myProcessor"
-                        type: "#class:${MySetBody.class.name}"
-                        properties:
-                          payload: "test-payload"
-                    from:
-                      uri: "kamelet:source"
-                      steps:
-                        - process:
-                            ref: "{{myProcessor}}"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - to: "kamelet:myTemplate"
-                      - to: "mock:result"
-            """
-
-            withMock('mock:result') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'test-payload'
-            }
-        when:
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "kamelet (definition with local bean via bean ref)"() {
-        setup:
-            loadRoutes '''
-                - routeTemplate:
-                    id: "myTemplate"
-                    beans:
-                      - name: "myCounter"
-                        type: java.util.concurrent.atomic.AtomicInteger
-                    from:
-                      uri: "kamelet:source"
-                      steps:
-                        - bean:
-                            ref: "{{myCounter}}"
-                            method: "getAndIncrement"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - to: "kamelet:myTemplate"
-                      - to: "mock:result"
-            '''
-
-            withMock('mock:result') {
-                expectedMessageCount 1
-                expectedBodiesReceived '0'
-            }
-        when:
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "kamelet (definition with default parameters)"() {
-        setup:
-            loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"  
-                    parameters:
-                      - name: "myParameter"
-                        defaultValue: "myDefaultValue"
-                        description: "myParameterDescription"
-                    from: 
-                      uri: "kamelet:source"
-                      steps:
-                        - setBody: 
-                            constant: "{{myParameter}}"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - to: "kamelet:myTemplate"
-                      - to: "mock:result" 
-            """
-
-            withMock('mock:result') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'myDefaultValue'
-            }
-        when:
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "kamelet (definition with parameters)"() {
-        setup:
-            loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"  
-                    parameters:
-                      - name: "myParameter"
-                        defaultValue: "myDefaultValue"
-                        description: "myParameterDescription"
-                    from: 
-                      uri: "kamelet:source"
-                      steps:
-                        - setBody: 
-                            constant: "{{myParameter}}"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - to: "kamelet:myTemplate?myParameter=test"
-                      - to: "mock:result" 
-            """
-
-            withMock('mock:result') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'test'
-            }
-        when:
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "kamelet (properties not url encoded)"() {
-        setup:
-            addTemplate('setPayloadWithType') {
-                from('kamelet:source')
-                    .setBody().simple('{{contentType}}')
-                    .to("kamelet:sink")
-            }
-
-            loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - kamelet:
-                          name: "setPayloadWithType"
-                          parameters:
-                            contentType: "application/json"
-                      - to: "mock:result"
-            '''
-
-            withMock('mock:result') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'application/json'
-            }
-        when:
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "kamelet (note property)"() {
-        setup:
-            addTemplate('setPayload') {
-                from('kamelet:source')
-                    .setBody().simple('${body}: {{payload}}')
-            }
-
-            loadRoutesNoValidate '''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - kamelet:
-                          name: "setPayload"
-                          description: "calls setPayload template"
-                          note: "a developer note"
-                          parameters:
-                            payload: 1
-                      - to: "mock:kamelet"
-            '''
-
-            withMock('mock:kamelet') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'a: 1'
-            }
-        when:
-            withTemplate {
-                to('direct:start').withBody('a').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-
-            with(context.routeDefinitions[0].outputs[0], KameletDefinition) {
-                description == 'calls setPayload template'
-                note == 'a developer note'
-            }
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
deleted file mode 100644
index 8b604088f069..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.ChoiceDefinition
-import org.apache.camel.model.FromDefinition
-import org.apache.camel.model.LogDefinition
-import org.apache.camel.model.RouteDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.support.PluginHelper
-
-class LineNumberTest extends YamlTestSupport {
-
-    def "line number definition"() {
-        when:
-            loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - log:
-                         loggingLevel: "ERROR"
-                         message: "test"
-                         logName: "yaml"
-                      - to: "direct:result"
-            '''
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0].input, FromDefinition) {
-                uri == "direct:start"
-                lineNumber == 2
-            }
-            with(context.routeDefinitions[0].outputs[0], LogDefinition) {
-                loggingLevel == 'ERROR'
-                message == 'test'
-                logName == 'yaml'
-                lineNumber == 5
-            }
-            with(context.routeDefinitions[0].outputs[1], ToDefinition) {
-                uri == "direct:result"
-                lineNumber == 9
-            }
-    }
-
-    def "line number route"() {
-        when:
-        loadRoutes '''
-                - route:
-                    from:
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            input.lineNumber == 4
-            input.endpointUri == 'direct:info'
-
-            with (outputs[0], LogDefinition) {
-                lineNumber == 6
-                message == 'message'
-            }
-        }
-    }
-
-    def "line number file"() {
-        setup:
-        def rloc = 'classpath:/stuff/my-route.yaml'
-        def rdsl = PluginHelper.getResourceLoader(context).resolveResource(rloc)
-        when:
-        loadRoutes rdsl
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0].input, FromDefinition) {
-            uri == "quartz:foo?cron={{myCron}}"
-            lineNumber == 21
-        }
-        with(context.routeDefinitions[0].outputs[0], LogDefinition) {
-            message == 'Start'
-            lineNumber == 23
-        }
-        with(context.routeDefinitions[0].outputs[1], ToDefinition) {
-            uri == "bean:myBean?method=hello"
-            lineNumber == 24
-        }
-        with(context.routeDefinitions[0].outputs[3], ToDefinition) {
-            uri == "bean:myBean?method=bye"
-            lineNumber == 26
-        }
-        with(context.routeDefinitions[0].outputs[4], LogDefinition) {
-            message == '${body}'
-            lineNumber == 27
-        }
-        with(context.routeDefinitions[0].outputs[5], ChoiceDefinition) {
-            lineNumber == 28
-        }
-        with(context.routeDefinitions[0].outputs[6], LogDefinition) {
-            message == '${header.textProp}'
-            lineNumber == 40
-        }
-    }
-
-    def "line number file with comments"() {
-        setup:
-        def rloc = 'classpath:/stuff/my-route-comment.yaml'
-        def rdsl = PluginHelper.getResourceLoader(context).resolveResource(rloc)
-        when:
-        loadRoutes rdsl
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0].input, FromDefinition) {
-            uri == "quartz:foo?cron={{myCron}}"
-            lineNumber == 23
-        }
-        with(context.routeDefinitions[0].outputs[0], LogDefinition) {
-            message == 'Start'
-            lineNumber == 26
-        }
-        with(context.routeDefinitions[0].outputs[1], ToDefinition) {
-            uri == "bean:myBean?method=hello"
-            lineNumber == 27
-        }
-        with(context.routeDefinitions[0].outputs[3], ToDefinition) {
-            uri == "bean:myBean?method=bye"
-            lineNumber == 31
-        }
-        with(context.routeDefinitions[0].outputs[4], LogDefinition) {
-            message == '${body}'
-            lineNumber == 32
-        }
-        with(context.routeDefinitions[0].outputs[5], ChoiceDefinition) {
-            lineNumber == 34 // TODO: should be 32
-        }
-        with(context.routeDefinitions[0].outputs[6], LogDefinition) {
-            message == '${header.textProp}'
-            lineNumber == 50
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy
deleted file mode 100644
index 3929bb5aee02..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.model.LoadBalanceDefinition
-import org.apache.camel.model.RouteDefinition
-import org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition
-import org.junit.jupiter.api.Assertions
-
-class LoadBalanceTest extends YamlTestSupport {
-
-    def "loadBalance"() {
-        setup:
-            loadRoutes '''
-                - from:
-                   uri: "direct:start"
-                   steps:
-                     - loadBalance:
-                         weightedLoadBalancer:
-                           distributionRatio: "2,1"
-                           roundRobin: false
-                         steps:
-                           - to: "mock:x"
-                           - to: "mock:y"
-            '''
-
-            withMock('mock:x') {
-                expectedMessageCount = 2
-            }
-            withMock('mock:y') {
-                expectedMessageCount = 1
-            }
-
-        when:
-            context.start()
-
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-                to('direct:start').withBody('hello').send()
-                to('direct:start').withBody('hello').send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "failoverLoadBalancer inheritErrorHandler placeholder"() {
-        when:
-            // YamlTestSupport validates against the raw schema (without the placeholder leniency of YamlValidator),
-            // which types inheritErrorHandler as boolean; the runtime resolves the placeholder when the route starts
-            // and YamlValidatorSchemaGroupsTest covers that the validator accepts it (CAMEL-24696)
-            loadRoutesNoValidate '''
-                - from:
-                   uri: "direct:start"
-                   steps:
-                     - loadBalance:
-                         failoverLoadBalancer:
-                           inheritErrorHandler: "{{myInherit}}"
-                           maximumFailoverAttempts: "3"
-                         steps:
-                           - to: "mock:x"
-                           - to: "mock:y"
-            '''
-        then:
-            with(context.routeDefinitions[0], RouteDefinition) {
-                with(outputs[0], LoadBalanceDefinition) {
-                    with(loadBalancerType, FailoverLoadBalancerDefinition) {
-                        inheritErrorHandler == '{{myInherit}}'
-                        maximumFailoverAttempts == '3'
-                    }
-                }
-            }
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoopTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoopTest.groovy
deleted file mode 100644
index 1369857dc23b..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoopTest.groovy
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.LoopDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class LoopTest extends YamlTestSupport {
-
-    def "loop definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], LoopDefinition) {
-                with(expression, ExpressionDefinition) {
-                    language == 'constant'
-                    expression == '3'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - loop: 
-                             constant: "3"
-                             do-while: true
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - loop: 
-                              expression: 
-                                constant: "3"
-                              do-while: true
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-
-    def "loop (flow)"() {
-        setup:
-            loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:    
-                      - loop:
-                         copy: true 
-                         constant: "3"
-                      - to: "mock:result"
-            '''
-
-            withMock('mock:result') {
-                expectedMessageCount 3
-            }
-        when:
-            context.start()
-
-            withTemplate {
-                to('direct:route').withBody('a').send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalTest.groovy
deleted file mode 100644
index 18b80c7b0bdb..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalTest.groovy
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.MarshalDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class MarshalTest extends YamlTestSupport {
-
-    def "marshal definition (#resource.location, #expected)"(Resource resource, String expected) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], MarshalDefinition) {
-                with(dataFormatType) {
-                    dataFormatName == expected
-                }
-            }
-        where:
-            resource << [
-                asResource('data-format', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - marshal:
-                             json: 
-                               library: Gson
-                          - to: "mock:result"
-                    '''),
-                asResource('data-format-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - marshal:
-                             dataFormatType:
-                               json: 
-                                 library: Gson
-                          - to: "mock:result"
-                    '''),
-                asResource('data-format', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - marshal:
-                             json: {}
-                          - to: "mock:result"
-                    '''),
-                asResource('data-format-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - marshal:
-                             dataFormatType:
-                               json: {}
-                          - to: "mock:result"
-                    '''),
-                asResource('data-format-library-case', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - marshal:
-                             json: 
-                               library: gson
-                          - to: "mock:result"
-                    ''')
-            ]
-
-            expected << [
-                'gson', 'gson', 'jackson', 'jackson', 'gson'
-            ]
-    }
-
-    def "Error: duplicate dataformat"() {
-        when:
-        var route = '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - marshal:
-                             json: 
-                               library: Gson
-                             jacksonXml: {}
-                          - to: "mock:result"
-            '''
-        then:
-        try {
-            loadRoutes(route)
-            Assertions.fail("Should have thrown exception")
-        } catch (IllegalArgumentException e) {
-            Assertions.assertTrue(e.getMessage().contains("2 are valid"), e.getMessage())
-        }
-    }
-
-    def "Error: no dataformat"() {
-        when:
-        var route = '''
-                    - from:
-                        uri: "direct:start"
-                        steps:
-                          - marshal: {}
-                          - to: "mock:result"
-            '''
-        then:
-        try {
-            loadRoutes(route)
-            Assertions.fail("Should have thrown exception")
-        } catch (IllegalArgumentException e) {
-            Assertions.assertTrue(e.getMessage().contains("0 are valid"), e.getMessage())
-        }
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalVariableTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalVariableTest.groovy
deleted file mode 100644
index b07efd6f068a..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalVariableTest.groovy
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.Exchange
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.spi.DataFormat
-import org.apache.camel.support.service.ServiceSupport
-
-class MarshalVariableTest extends YamlTestSupport {
-
-    def "marshalVariable send"() {
-        setup:
-            loadRoutes '''
-                - route:
-                    from:
-                      uri: direct:send
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - marshal:
-                            custom: myDF
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:receive
-                      steps:
-                        - marshal:
-                            custom: myDF
-                            variableReceive: bye
-                        - to:
-                            uri: mock:after
-                        - setBody:
-                            simple:
-                              expression: "${variable:bye}"
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:sendAndReceive
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - marshal:
-                            custom: myDF
-                            variableReceive: bye
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-            '''
-
-            withMock('mock:before') {
-                expectedBodiesReceived 'World'
-                expectedVariableReceived("hello", "Camel")
-            }
-            withMock('mock:result') {
-                expectedBodiesReceived 'Bye Camel'
-                expectedVariableReceived("hello", "Camel")
-            }
-
-        when:
-            context.registry.bind("myDF", new MyByeDataFormat())
-            context.start()
-
-            withTemplate {
-                to('direct:send').withBody('World').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-
-    def "marshalVariable receive"() {
-        setup:
-        loadRoutes '''
-                - route:
-                    from:
-                      uri: direct:send
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - marshal:
-                            custom: myDF
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:receive
-                      steps:
-                        - marshal:
-                            custom: myDF
-                            variableReceive: bye
-                        - to:
-                            uri: mock:after
-                        - setBody:
-                            simple:
-                              expression: "${variable:bye}"
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:sendAndReceive
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - marshal:
-                            custom: myDF
-                            variableReceive: bye
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:foo
-                      steps:
-                        - transform:
-                            simple:
-                              expression: "Bye ${body}"
-            '''
-
-        withMock('mock:after') {
-            expectedBodiesReceived 'World'
-            expectedVariableReceived("bye", "Bye World")
-        }
-        withMock('mock:result') {
-            expectedBodiesReceived 'Bye World'
-            expectedVariableReceived("bye", "Bye World")
-        }
-
-        when:
-        context.registry.bind("myDF", new MyByeDataFormat())
-        context.start()
-
-        withTemplate {
-            to('direct:receive').withBody('World').send()
-        }
-
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "marshalVariable sendAndReceive"() {
-        setup:
-        loadRoutes '''
-                - route:
-                    from:
-                      uri: direct:send
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - marshal:
-                            custom: myDF
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:receive
-                      steps:
-                        - marshal:
-                            custom: myDF
-                            variableReceive: bye
-                        - to:
-                            uri: mock:after
-                        - setBody:
-                            simple:
-                              expression: "${variable:bye}"
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:sendAndReceive
-                      steps:
-                        - setVariable:
-                            name: hello
-                            simple:
-                              expression: Camel
-                        - to:
-                            uri: mock:before
-                        - marshal:
-                            custom: myDF
-                            variableReceive: bye
-                            variableSend: hello
-                        - to:
-                            uri: mock:result
-                - route:
-                    from:
-                      uri: direct:foo
-                      steps:
-                        - transform:
-                            simple:
-                              expression: "Bye ${body}"
-            '''
-
-        withMock('mock:before') {
-            expectedBodiesReceived 'World'
-            expectedVariableReceived("hello", "Camel")
-        }
-        withMock('mock:result') {
-            expectedBodiesReceived 'World'
-            expectedVariableReceived("bye", "Bye Camel")
-        }
-
-        when:
-        context.registry.bind("myDF", new MyByeDataFormat())
-        context.start()
-
-        withTemplate {
-            to('direct:sendAndReceive').withBody('World').send()
-        }
-
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    static class MyByeDataFormat extends ServiceSupport implements DataFormat {
-
-        @Override
-        void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception {
-            String line = "Bye " + graph.toString()
-            stream.write(line.getBytes())
-        }
-
-        @Override
-        Object unmarshal(Exchange exchange, InputStream stream) throws Exception {
-            // noop
-            return null
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/NoteTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/NoteTest.groovy
deleted file mode 100644
index f2c1a66585ee..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/NoteTest.groovy
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.RouteDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class NoteTest extends YamlTestSupport {
-
-    def "note definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], ToDefinition) {
-                endpointUri == 'direct:start'
-                description == 'some description here'
-                note == 'some note here'
-            }
-            with(context.routeDefinitions[0], RouteDefinition) {
-                if (it.id == 'cheese') {
-                    description == 'some route description here'
-                    note == 'some route note here'
-                } else {
-                    description == null
-                    note == null
-                }
-            }
-        where:
-            resource << [
-                asResource('route', '''
-                    - route:
-                        id: cheese
-                        note: "some route note here"
-                        description: "some route description here"
-                        from:
-                          uri: "direct:start"
-                          steps:
-                            - to: 
-                                uri: "direct:start"
-                                note: "some note here"
-                                description: "some description here"
-                    '''),
-                asResource('uri', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - to: 
-                              uri: "direct:start"
-                              note: "some note here"
-                              description: "some description here"
-                    '''),
-                asResource('properties', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - to: 
-                              uri: "direct"
-                              note: "some note here"
-                              description: "some description here"
-                              parameters:
-                                name: "start"
-                    '''),
-                asResource('properties-out-of-order', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - to: 
-                              parameters:
-                                name: "start"
-                              note: "some note here"
-                              description: "some description here"
-                              uri: "direct"
-                    '''),
-            ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/OnExceptionTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/OnExceptionTest.groovy
deleted file mode 100644
index 1b8140870efc..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/OnExceptionTest.groovy
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.model.MyException
-import org.apache.camel.dsl.yaml.support.model.MyFailingProcessor
-import org.apache.camel.support.ResourceHelper
-import org.junit.jupiter.api.Assertions
-
-class OnExceptionTest extends YamlTestSupport {
-    def "onException"() {
-        setup:
-            loadRoutes """
-                - beans:
-                  - name: myFailingProcessor
-                    type: ${MyFailingProcessor.name}
-                - onException:
-                    handled:
-                      constant: "true"
-                    exception:
-                      - ${MyException.name}
-                    steps:
-                      - transform:
-                          constant: "Sorry"
-                      - to: "mock:on-exception"  
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - process: 
-                          ref: "myFailingProcessor"            
-            """
-
-            withMock('mock:on-exception') {
-                expectedBodiesReceived 'Sorry'
-            }
-
-        when:
-            context.start()
-
-            withTemplate {
-                to('direct:start').withBody('hello').send()
-            }
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    // CAMEL-24702: handled is an expression; a plain value must fail with a message that says what to write
-    def "onException handled as plain value fails with a helpful message"() {
-        when:
-            loadRoutes([ResourceHelper.fromString("route-0.yaml", '''
-                - onException:
-                    handled: true
-                    exception:
-                      - java.lang.Exception
-                    steps:
-                      - to: "mock:on-exception"
-            '''.stripIndent())], false)
-        then:
-            def e = thrown(Exception)
-            def messages = []
-            for (Throwable t = e; t != null; t = t.cause) {
-                messages << t.message
-            }
-            messages.any { it != null && it.contains('an expression is expected here, not a plain value (true)') && it.contains('constant: {expression: "true"}') }
-    }
-
-
-    // CAMEL-24702: an unsupported field names the node and the field; bean as a language says method:
-    def "setBody with bean as a field fails with a message naming the field"() {
-        when:
-            loadRoutes([ResourceHelper.fromString("route-1.yaml", '''
-                - from:
-                    uri: timer:tick
-                    steps:
-                      - setBody:
-                          bean: myBean
-            '''.stripIndent())], false)
-        then:
-            def e = thrown(Exception)
-            def messages = []
-            for (Throwable t = e; t != null; t = t.cause) {
-                messages << t.message
-            }
-            messages.any { it != null && it.contains('Error constructing YAML node id: setBody: unsupported field: bean') && it.contains('expression: {method: {ref: myBean, method: process}}') }
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderTest.groovy
deleted file mode 100644
index 5087d7c2b0b4..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderTest.groovy
+++ /dev/null
@@ -1,857 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.KameletDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.TransformDataTypeDefinition
-import org.junit.jupiter.api.Assertions
-
-class PipeLoaderTest extends YamlTestSupport {
-    @Override
-    def doSetup() {
-        context.start()
-    }
-
-    def "Pipe from kamelet to kamelet with pipe.yaml extension"() {
-        when:
-            loadBindingsExt("pipe.yaml", '''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-            ''')
-        then:
-            context.routeDefinitions.size() == 3
-
-            with (context.routeDefinitions[0]) {
-                routeId == 'timer-event-source'
-                input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-                input.lineNumber == 7
-                outputs.size() == 1
-                with (outputs[0], ToDefinition) {
-                    endpointUri == 'kamelet:log-sink'
-                    lineNumber == 14
-                }
-            }
-    }
-
-    def "Pipe from uri to kamelet"() {
-        when:
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    uri: timer:foo
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-            ''')
-        then:
-        context.routeDefinitions.size() == 2
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'timer:foo'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'kamelet:log-sink'
-            }
-        }
-    }
-
-    def "Pipe from uri to uri"() {
-        when:
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    uri: timer:foo
-                  sink:
-                    uri: log:bar
-            ''')
-        then:
-        context.routeDefinitions.size() == 1
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'timer:foo'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'log:bar'
-            }
-        }
-    }
-
-    def "Pipe steps"() {
-        when:
-        loadBindings('''
-            apiVersion: camel.apache.org/v1
-            kind: Pipe
-            metadata:
-              name: steps-pipe
-            spec:
-              source:
-                ref:
-                  kind: Kamelet
-                  apiVersion: camel.apache.org/v1
-                  name: timer-source
-                properties:
-                  message: "Camel"
-              steps:
-              - ref:
-                  kind: Kamelet
-                  apiVersion: camel.apache.org/v1
-                  name: prefix-action
-                properties:
-                  prefix: "Apache"
-              - ref:
-                  kind: Kamelet
-                  apiVersion: camel.apache.org/v1
-                  name: prefix-action
-                properties:
-                  prefix: "Hello"
-              sink:
-                uri: log:info
-                ''')
-        then:
-        context.routeDefinitions.size() == 4
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'steps-pipe'
-            input.endpointUri == 'kamelet:timer-source?message=Camel'
-            input.lineNumber == 7
-            outputs.size() == 3
-            with (outputs[0], KameletDefinition) {
-                name == 'prefix-action?prefix=Apache'
-                lineNumber == 14
-            }
-            with (outputs[1], KameletDefinition) {
-                name == 'prefix-action?prefix=Hello'
-                lineNumber == 20
-            }
-            with (outputs[2], ToDefinition) {
-                endpointUri == 'log:info'
-                lineNumber == 27
-            }
-        }
-    }
-
-    def "Pipe steps kamelet uri"() {
-        when:
-        loadBindings('''
-            apiVersion: camel.apache.org/v1
-            kind: Pipe
-            metadata:
-              name: steps-pipe
-            spec:
-              source:
-                ref:
-                  kind: Kamelet
-                  apiVersion: camel.apache.org/v1
-                  name: timer-source
-                properties:
-                  message: "Camel"
-              steps:
-              - ref:
-                  kind: Kamelet
-                  apiVersion: camel.apache.org/v1
-                  name: prefix-action
-                properties:
-                  prefix: "Apache"
-              - uri: mock:dummy
-              sink:
-                uri: log:info
-                ''')
-        then:
-        context.routeDefinitions.size() == 3
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'steps-pipe'
-            input.endpointUri == 'kamelet:timer-source?message=Camel'
-            outputs.size() == 3
-            with (outputs[0], KameletDefinition) {
-                name == 'prefix-action?prefix=Apache'
-            }
-            with (outputs[1], ToDefinition) {
-                endpointUri == 'mock:dummy'
-            }
-            with (outputs[2], ToDefinition) {
-                endpointUri == 'log:info'
-            }
-        }
-    }
-
-    def "Pipe steps uri uri"() {
-        when:
-        loadBindings('''
-            apiVersion: camel.apache.org/v1
-            kind: Pipe
-            metadata:
-              name: steps-pipe
-            spec:
-              source:
-                ref:
-                  kind: Kamelet
-                  apiVersion: camel.apache.org/v1
-                  name: timer-source
-                properties:
-                  message: "Camel"
-              steps:
-              - uri: mock:dummy
-              - uri: kamelet:prefix-action?prefix=Apache
-              - uri: mock:dummy2
-                properties:
-                  reportGroup: 5
-              sink:
-                uri: log:info
-                ''')
-        then:
-        context.routeDefinitions.size() == 3
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'steps-pipe'
-            input.endpointUri == 'kamelet:timer-source?message=Camel'
-            outputs.size() == 4
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'mock:dummy'
-            }
-            with (outputs[1], KameletDefinition) {
-                name == 'prefix-action?prefix=Apache'
-            }
-            with (outputs[2], ToDefinition) {
-                endpointUri == 'mock:dummy2?reportGroup=5'
-            }
-            with (outputs[3], ToDefinition) {
-                endpointUri == 'log:info'
-            }
-        }
-    }
-
-    def "Pipe from kamelet to strimzi"() {
-        when:
-
-        // stub kafka for testing as it requires to setup connection to a real kafka broker
-        context.removeComponent("kafka")
-        context.addComponent("kafka", context.getComponent("stub"))
-
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: KafkaTopic
-                      apiVersion: kafka.strimzi.io/v1beta2
-                      name: my-topic
-            ''')
-        then:
-        context.routeDefinitions.size() == 2
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'kafka:my-topic'
-            }
-        }
-    }
-
-    // TODO: Fix me later
-    /*
-    def "Pipe with error handler"() {
-        when:
-
-        // stub kafka for testing as it requires to setup connection to a real kafka broker
-        context.addComponent("kafka", context.getComponent("stub"))
-
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-                  errorHandler:
-                    sink:
-                      endpoint:
-                        ref:
-                          kind: Kamelet
-                          apiVersion: camel.apache.org/v1
-                          name: error-handler
-                        properties:
-                          log-message: "ERROR!"
-                          kafka-brokers: my-broker
-                          kafka-topic: my-first-test
-                          kafka-service-account-id: scott
-                          kafka-service-account-secret: tiger
-                      parameters:
-                        maximumRedeliveries: 1
-                        redeliveryDelay: 2000
-                    ''')
-        then:
-        context.routeDefinitions.size() == 4
-
-        with (context.routeDefinitions[0]) {
-            errorHandlerFactory != null
-            errorHandlerFactory instanceof DeadLetterChannelDefinition
-            var eh = errorHandlerFactory as DeadLetterChannelDefinition
-            eh.deadLetterUri == 'kamelet:error-handler?kafkaTopic=my-first-test&logMessage=ERROR!&kafkaServiceAccountId=scott&kafkaBrokers=my-broker&kafkaServiceAccountSecret=tiger'
-            eh.redeliveryPolicy.maximumRedeliveries == "1"
-            eh.redeliveryPolicy.redeliveryDelay == "2000"
-            routeId == 'timer-event-source'
-            input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'kamelet:log-sink'
-            }
-        }
-    }*/
-
-    def "Pipe from kamelet to knative channel"() {
-        when:
-
-        // stub knative for testing as it requires to setup connection to a real knative broker
-        context.removeComponent("knative")
-        context.addComponent("knative", context.getComponent("stub"))
-
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: InMemoryChannel
-                      apiVersion: messaging.knative.dev/v1
-                      name: my-messages
-            ''')
-        then:
-        context.routeDefinitions.size() == 2
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'knative:channel/my-messages'
-            }
-        }
-    }
-
-    def "Pipe from knative channel to kamelet"() {
-        when:
-
-        // stub knative for testing as it requires to setup connection to a real knative broker
-        context.removeComponent("knative")
-        context.addComponent("knative", context.getComponent("stub"))
-
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: knative-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: InMemoryChannel
-                      apiVersion: messaging.knative.dev/v1
-                      name: my-messages
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-                    properties:
-                      showHeaders: true
-            ''')
-        then:
-        context.routeDefinitions.size() == 2
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'knative-event-source'
-            input.endpointUri == 'knative:channel/my-messages'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'kamelet:log-sink?showHeaders=true'
-            }
-        }
-    }
-
-    def "Pipe from kamelet to knative broker"() {
-        when:
-
-        // stub knative for testing as it requires to setup connection to a real knative broker
-        context.removeComponent("knative")
-        context.addComponent("knative", context.getComponent("stub"))
-
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: Broker
-                      apiVersion: eventing.knative.dev/v1
-                      name: foo-broker
-                    properties:
-                      type: org.apache.camel.event.messages
-            ''')
-        then:
-        context.routeDefinitions.size() == 2
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'knative:event/org.apache.camel.event.messages?kind=Broker&name=foo-broker'
-            }
-        }
-    }
-
-    def "Pipe from knative broker to kamelet"() {
-        when:
-
-        // stub knative for testing as it requires to setup connection to a real knative broker
-        context.removeComponent("knative")
-        context.addComponent("knative", context.getComponent("stub"))
-
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: knative-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Broker
-                      apiVersion: eventing.knative.dev/v1
-                      name: foo-broker
-                    properties:
-                      type: org.apache.camel.event.messages
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-                    properties:
-                      showHeaders: true
-            ''')
-        then:
-        context.routeDefinitions.size() == 2
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'knative-event-source'
-            input.endpointUri == 'knative:event/org.apache.camel.event.messages?kind=Broker&name=foo-broker'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'kamelet:log-sink?showHeaders=true'
-            }
-        }
-    }
-
-    def "kamelet start route"() {
-        when:
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: route-timer-source
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-            ''')
-        then:
-        context.routeDefinitions.size() == 3
-
-        // global stream caching enabled
-        context.isStreamCaching() == true
-
-        with (context.routeDefinitions[1]) {
-            template == true
-            // stream-cache is disabled in the kamelet
-            streamCache == "false"
-            messageHistory == "true"
-        }
-    }
-
-    def "Pipe no sink"() {
-        when:
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    properties:
-                      message: "Hello world!"
-                  steps:
-                  - ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-action
-            ''')
-        then:
-        context.routeDefinitions.size() == 3
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-            input.lineNumber == 7
-            outputs.size() == 1
-            with (outputs[0], KameletDefinition) {
-                name == 'log-action'
-                lineNumber == 14
-            }
-        }
-    }
-
-    def "Pipe with input/output data types"() {
-        when:
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    dataTypes:
-                      in:
-                        format: text/plain
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-                    dataTypes:
-                      out:
-                        format: application/octet-stream
-            ''')
-        then:
-        context.routeDefinitions.size() == 3
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-            input.lineNumber == 7
-            inputType.urn == 'text/plain'
-            outputType.urn == 'application/octet-stream'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'kamelet:log-sink'
-                lineNumber == 17
-            }
-        }
-    }
-
-    def "Pipe with input/output data types and schemes"() {
-        when:
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    dataTypes:
-                      in:
-                        scheme: camel
-                        format: text/plain
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-                    dataTypes:
-                      out:
-                        scheme: camel
-                        format: application/octet-stream
-            ''')
-        then:
-        context.routeDefinitions.size() == 3
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-            input.lineNumber == 7
-            inputType.urn == 'camel:text/plain'
-            outputType.urn == 'camel:application/octet-stream'
-            outputs.size() == 1
-            with (outputs[0], ToDefinition) {
-                endpointUri == 'kamelet:log-sink'
-                lineNumber == 18
-            }
-        }
-    }
-
-    def "Pipe with data type transformation"() {
-        when:
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    dataTypes:
-                      out:
-                        format: application/octet-stream
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-                    dataTypes:
-                      in:
-                        format: text/plain
-            ''')
-        then:
-        context.routeDefinitions.size() == 3
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-            input.lineNumber == 7
-            outputs.size() == 3
-            with (outputs[0], TransformDataTypeDefinition) {
-                toType == 'application/octet-stream'
-                lineNumber == -1
-            }
-            with (outputs[1], TransformDataTypeDefinition) {
-                toType == 'text/plain'
-                lineNumber == -1
-            }
-            with (outputs[2], ToDefinition) {
-                endpointUri == 'kamelet:log-sink'
-                lineNumber == 17
-            }
-        }
-    }
-
-    def "Pipe with data type scheme transformation"() {
-        when:
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: timer-event-source
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    dataTypes:
-                      out:
-                        scheme: camel
-                        format: application/octet-stream
-                    properties:
-                      message: "Hello world!"
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-                    dataTypes:
-                      in:
-                        scheme: camel
-                        format: text/plain
-            ''')
-        then:
-        context.routeDefinitions.size() == 3
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'timer-event-source'
-            input.endpointUri == 'kamelet:timer-source?message=Hello world!'
-            input.lineNumber == 7
-            outputs.size() == 3
-            with (outputs[0], TransformDataTypeDefinition) {
-                toType == 'camel:application/octet-stream'
-                lineNumber == -1
-            }
-            with (outputs[1], TransformDataTypeDefinition) {
-                toType == 'camel:text/plain'
-                lineNumber == -1
-            }
-            with (outputs[2], ToDefinition) {
-                endpointUri == 'kamelet:log-sink'
-                lineNumber == 18
-            }
-        }
-    }
-
-    def "Pipe kamelet property with placeholder should not be URL-encoded"() {
-        setup:
-        context.propertiesComponent.setInitialProperties(['my.message': 'Hello Camel'] as Properties)
-
-        when:
-        loadBindings('''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: placeholder-pipe
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    properties:
-                      message: "{{my.message}}"
-                  sink:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: log-sink
-        ''')
-        then:
-        context.routeDefinitions.size() == 3
-
-        with (context.routeDefinitions[0]) {
-            routeId == 'placeholder-pipe'
-            // CAMEL-23284: verify placeholder is preserved and NOT URL-encoded to %7B%7B...%7D%7D
-            input.endpointUri == 'kamelet:timer-source?message={{my.message}}'
-            !input.endpointUri.contains('%7B')
-            !input.endpointUri.contains('%7D')
-        }
-    }
-
-    def "Error: Pipe with unsupported ref kind"() {
-        when:
-        var pipe = '''
-                apiVersion: camel.apache.org/v1
-                kind: Pipe
-                metadata:
-                  name: bad-ref-pipe
-                spec:
-                  source:
-                    ref:
-                      kind: Kamelet
-                      apiVersion: camel.apache.org/v1
-                      name: timer-source
-                    properties:
-                      message: "Hello"
-                  sink:
-                    ref:
-                      kind: UnknownKind
-                      apiVersion: unknown/v1
-                      name: bad-sink
-            '''
-        then:
-        try {
-            loadBindings(pipe)
-            Assertions.fail("Should have thrown exception")
-        } catch (e) {
-            assert e.message.contains("Unsupported Pipe ref kind")
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PollEnrichTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PollEnrichTest.groovy
deleted file mode 100644
index f119bbad0092..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PollEnrichTest.groovy
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.PollEnrichDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class PollEnrichTest extends YamlTestSupport {
-
-    def "pollEnrich definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], PollEnrichDefinition) {
-                aggregationStrategy == 'myStrategy'
-
-                with(expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - pollEnrich:  
-                              simple: "${body}"
-                              aggregationStrategy: "myStrategy"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - pollEnrich: 
-                              expression: 
-                                simple: "${body}"
-                              aggregationStrategy: "myStrategy"
-                          - to: "mock:result"
-                    ''')
-           ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PollTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PollTest.groovy
deleted file mode 100644
index 6af29499a439..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PollTest.groovy
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class PollTest extends YamlTestSupport {
-
-    def "poll definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0]) {
-                endpointUri == 'seda:foo'
-            }
-        where:
-            resource << [
-                asResource('uri', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - poll:  
-                              uri: "seda:foo"
-                          - to: "mock:result"
-                    '''),
-                asResource('timeout', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - poll:  
-                              uri: "seda:foo"
-                              timeout: 1234
-                          - to: "mock:result"
-                    '''),
-                asResource('properties', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - poll:  
-                              uri: "seda"
-                              parameters:
-                                name: "foo"
-                          - to: "mock:result"
-                    ''')
-           ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RecipientListTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RecipientListTest.groovy
deleted file mode 100644
index d0b7c95de066..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RecipientListTest.groovy
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.RecipientListDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class RecipientListTest extends YamlTestSupport {
-
-    def "recipient-list definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], RecipientListDefinition) {
-                stopOnException == 'true'
-                parallelProcessing == 'true'
-
-                with(expression, ExpressionDefinition) {
-                    language == 'constant'
-                    expression == 'direct:a,direct:b'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - recipientList:
-                              constant: "direct:a,direct:b"
-                              stopOnException: true
-                              parallelProcessing: true
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - recipientList:
-                              expression:  
-                                constant: "direct:a,direct:b"
-                              stopOnException: true
-                              parallelProcessing: true
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveHeaderTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveHeaderTest.groovy
deleted file mode 100644
index fdef7a24ef39..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveHeaderTest.groovy
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.RemoveHeaderDefinition
-import org.apache.camel.model.RemoveHeadersDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class RemoveHeaderTest extends YamlTestSupport {
-
-    def "removeHeader definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], RemoveHeaderDefinition) {
-                name == 'test'
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - removeHeader:
-                              name: test
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - removeHeader:
-                              name: test
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-
-    def "removeHeaders definition"() {
-        when:
-            loadRoutes'''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - removeHeaders:
-                          pattern: toRemove
-                          excludePattern: toExclude
-                      - to: "mock:result"
-            '''
-        then:
-            with(context.routeDefinitions[0].outputs[0], RemoveHeadersDefinition) {
-                pattern == 'toRemove'
-                excludePattern == 'toExclude'
-            }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemovePropertyTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemovePropertyTest.groovy
deleted file mode 100644
index a3442a17cb0c..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemovePropertyTest.groovy
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.RemovePropertiesDefinition
-import org.apache.camel.model.RemovePropertyDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class RemovePropertyTest extends YamlTestSupport {
-
-    def "removeProperty definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], RemovePropertyDefinition) {
-                name == 'test'
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - removeProperty:
-                              name: test
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - removeProperty:
-                              name: test
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-
-    def "removeProperties definition"() {
-        when:
-            loadRoutes'''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - removeProperties:
-                          pattern: toRemove
-                          excludePattern: toExclude
-                      - to: "mock:result"
-            '''
-        then:
-            with(context.routeDefinitions[0].outputs[0], RemovePropertiesDefinition) {
-                pattern == 'toRemove'
-                excludePattern == 'toExclude'
-            }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveVariableTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveVariableTest.groovy
deleted file mode 100644
index 22567291a37c..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveVariableTest.groovy
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.RemoveVariableDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class RemoveVariableTest extends YamlTestSupport {
-
-    def "removeVariable definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], RemoveVariableDefinition) {
-                name == 'test'
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - removeVariable:
-                              name: test
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - removeVariable:
-                              name: test
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ResequenceTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ResequenceTest.groovy
deleted file mode 100644
index ff8022c1260a..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ResequenceTest.groovy
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.ResequenceDefinition
-import org.apache.camel.model.config.StreamResequencerConfig
-import org.apache.camel.model.language.SimpleExpression
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class ResequenceTest extends YamlTestSupport {
-
-    def "resequence definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], ResequenceDefinition) {
-                with (expression, SimpleExpression) {
-                    language == 'simple'
-                    expression == '${in.header.seqnum}'
-                }
-                with (streamConfig, StreamResequencerConfig) {
-                    capacity == '5000'
-                    timeout == '4000'
-                }
-
-                outputs.size() == 2
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - resequence:
-                              simple: "${in.header.seqnum}"
-                              streamConfig:
-                                capacity: 5000
-                                timeout: 4000  
-                              steps:
-                                - to: "direct:a"
-                                - to: "direct:b"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - resequence:
-                              expression:
-                                simple: "${in.header.seqnum}"
-                              streamConfig:
-                                capacity: 5000
-                                timeout: 4000  
-                              steps:
-                                - to: "direct:a"
-                                - to: "direct:b"
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy
deleted file mode 100644
index 4f54638230b2..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.MockRestConsumerFactory
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.dsl.yaml.support.model.MyBean
-import org.apache.camel.dsl.yaml.support.model.MyFooBar
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.rest.GetDefinition
-import org.apache.camel.model.rest.ParamDefinition
-import org.apache.camel.model.rest.PostDefinition
-import org.apache.camel.model.rest.RestDefinition
-import org.apache.camel.model.rest.VerbDefinition
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class RestTest extends YamlTestSupport {
-
-    def "load rest configuration"() {
-        when:
-            loadRoutes """
-                - beans:
-                  - name: myRestConsumerFactory
-                    type: ${MockRestConsumerFactory.name}
-                - restConfiguration:
-                    component: "servlet"
-                    contextPath: "/foo"
-                    dataFormatProperty:
-                      - key: "contentTypeHeader"
-                        value: "false"
-            """
-        then:
-            context.restConfiguration.component == 'servlet'
-            context.restConfiguration.contextPath == '/foo'
-            context.restConfiguration.dataFormatProperties["contentTypeHeader"] == "false"
-    }
-
-    def "load rest (to)"() {
-        when:
-            loadRoutes """
-                - beans:
-                  - name: myRestConsumerFactory
-                    type: ${MockRestConsumerFactory.name}
-                - rest:
-                    get:
-                      - path: "/foo"
-                        type: ${MyFooBar.name}
-                        outType: ${MyBean.name}
-                        to: "direct:bar"
-                - from:
-                    uri: 'direct:bar'
-                    steps:
-                      - to: 'mock:bar'          
-            """
-        then:
-            context.restDefinitions.size() == 1
-
-            with(context.restDefinitions[0], RestDefinition) {
-                verbs.size() == 1
-
-                with(verbs[0], VerbDefinition) {
-                    path == '/foo'
-                    type == MyFooBar.name
-                    outType == MyBean.name
-
-                    with(to, ToDefinition) {
-                        endpointUri == 'direct:bar'
-                    }
-                }
-            }
-    }
-
-    def "load rest (route)"() {
-        when:
-            loadRoutes """
-                - beans:
-                  - name: myRestConsumerFactory
-                    type: ${MockRestConsumerFactory.name}
-                - rest:
-                    get:
-                     -  path: "/foo"
-                        type: ${MyFooBar.name}
-                        outType: ${MyBean.name}
-                        to: "direct:bar"
-                - from:
-                    uri: 'direct:bar'
-                    steps:
-                      - to: 'mock:bar'
-            """
-        then:
-            context.restDefinitions.size() == 1
-
-            with(context.restDefinitions[0], RestDefinition) {
-                verbs.size() == 1
-
-                with(verbs[0], VerbDefinition) {
-                    path == '/foo'
-                    type == MyFooBar.name
-                    outType == MyBean.name
-                    with (to, ToDefinition) {
-                        endpointUri  == 'direct:bar'
-                    }
-                }
-            }
-    }
-
-    def "load rest (verb alias)"() {
-        when:
-            loadRoutes """
-                - beans:
-                  - name: myRestConsumerFactory
-                    type: ${MockRestConsumerFactory.name}
-                - rest:
-                    post:
-                      - path: "/foo"
-                        id: "foolish"
-                        type: ${MyFooBar.name}
-                        outType: ${MyBean.name}
-                        to: "direct:foo"
-                      - path: "/baz"
-                        id: "bazzy"
-                        to: "direct:baz"
-                    get:
-                      - path: "/getFoo"
-                        to: "direct:getFoo"
-                - from:
-                    uri: 'direct:bar'
-                    steps:
-                      - to: 'mock:bar'          
-            """
-        then:
-            context.restDefinitions.size() == 1
-
-            with(context.restDefinitions[0], RestDefinition) {
-                verbs.size() == 3
-
-                with(verbs[0], PostDefinition) {
-                    path == '/foo'
-                    type == MyFooBar.name
-                    outType == MyBean.name
-
-                    with(to, ToDefinition) {
-                        endpointUri == 'direct:foo'
-                    }
-                }
-                with(verbs[1], PostDefinition) {
-                    path == '/baz'
-                    with(to, ToDefinition) {
-                        endpointUri == 'direct:baz'
-                    }
-                }
-                with(verbs[2], GetDefinition) {
-                    path == '/getFoo'
-                    with(to, ToDefinition) {
-                        endpointUri == 'direct:getFoo'
-                    }
-                }
-            }
-    }
-
-    def "load rest (full)"() {
-        setup:
-            def rloc = 'classpath:/routes/rest-dsl.yaml'
-            def rdsl = PluginHelper.getResourceLoader(context).resolveResource(rloc)
-        when:
-            loadRoutes rdsl
-        then:
-            context.restDefinitions != null
-            !context.restDefinitions.isEmpty()
-    }
-
-    def "load rest (generated)"() {
-        setup:
-            def rloc = 'classpath:/rest-dsl/generated-rest-dsl.yaml'
-            def rdsl = PluginHelper.getResourceLoader(context).resolveResource(rloc)
-        when:
-            loadRoutes(rdsl)
-        then:
-            context.restDefinitions != null
-            !context.restDefinitions.isEmpty()
-    }
-
-    def "load rest (allowableValues)"() {
-        setup:
-            def rloc = 'classpath:/routes/rest-allowable-values-dsl.yaml'
-            def rdsl = PluginHelper.getResourceLoader(context).resolveResource(rloc)
-        when:
-            loadRoutes rdsl
-        then:
-            context.restDefinitions != null
-            !context.restDefinitions.isEmpty()
-
-            with(context.restDefinitions[0].verbs[0].params[0], ParamDefinition) {
-                allowableValues.size() == 3
-                allowableValues[0].value == 'available'
-                allowableValues[1].value == 'pending'
-                allowableValues[2].value == 'sold'
-            }
-    }
-
-    def "load rest enableCORS"() {
-        when:
-        loadRoutes """
-                - rest:
-                    get:
-                      - path: "/foo"
-                        type: ${MyFooBar.name}
-                        outType: ${MyBean.name}
-                        enableCORS: true
-                        to: "direct:bar"
-                - from:
-                    uri: 'direct:bar'
-                    steps:
-                      - to: 'mock:bar'          
-            """
-        then:
-        context.restDefinitions.size() == 1
-
-        with(context.restDefinitions[0], RestDefinition) {
-            verbs.size() == 1
-
-            with(verbs[0], VerbDefinition) {
-                path == '/foo'
-                type == MyFooBar.name
-                outType == MyBean.name
-                enableCORS == "true"
-
-                with(to, ToDefinition) {
-                    endpointUri == 'direct:bar'
-                }
-            }
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteConfigurationTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteConfigurationTest.groovy
deleted file mode 100644
index 3e237f9024af..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteConfigurationTest.groovy
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.Exchange
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.dsl.yaml.support.model.MyException
-import org.apache.camel.dsl.yaml.support.model.MyFailingProcessor
-import org.apache.camel.model.RouteConfigurationDefinition
-import org.junit.jupiter.api.Assertions
-
-import static org.apache.camel.util.PropertiesHelper.asProperties
-
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class RouteConfigurationTest extends YamlTestSupport {
-    def "routeConfiguration"() {
-        setup:
-        loadRoutes """
-                - beans:
-                  - name: myFailingProcessor
-                    type: ${MyFailingProcessor.name}
-                - routeConfiguration:
-                    onException:
-                      - onException:
-                          handled:
-                            constant: "true"
-                          exception:
-                            - ${MyException.name}
-                          steps:
-                            - transform:
-                                constant: "Sorry"
-                            - to: "mock:on-exception"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - process: 
-                          ref: "myFailingProcessor"
-            """
-
-        withMock('mock:on-exception') {
-            expectedBodiesReceived 'Sorry'
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "routeConfiguration onCompletion"() {
-        setup:
-        loadRoutes """
-                - routeConfiguration:
-                    onCompletion:
-                      - onCompletion:
-                          steps:
-                            - transform:
-                                constant: "Completed"
-                            - to: "mock:on-completion"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - log: "hello"
-            """
-
-        withMock('mock:on-completion') {
-            expectedBodiesReceived 'Completed'
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "routeConfiguration-precondition"() {
-        setup:
-        context.getPropertiesComponent().setInitialProperties(asProperties("activate", "true"))
-        loadRoutes """
-                - beans:
-                  - name: myFailingProcessor
-                    type: ${MyFailingProcessor.name}
-                - routeConfiguration:
-                    precondition: "{{!activate}}"
-                    onException:
-                      - onException:
-                          handled:
-                            constant: "true"
-                          exception:
-                            - ${MyException.name}
-                          steps:
-                            - transform:
-                                constant: "Not Activated"
-                            - to: "mock:on-exception"
-                - routeConfiguration:
-                    precondition: "{{activate}}"
-                    onException:
-                      - onException:
-                          handled:
-                            constant: "true"
-                          exception:
-                            - ${MyException.name}
-                          steps:
-                            - transform:
-                                constant: "Activated"
-                            - to: "mock:on-exception"
-                    onCompletion:
-                      - onCompletion:
-                          steps:
-                            - transform:
-                                constant: "Completed"
-                            - to: "mock:on-completion"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - process: 
-                          ref: "myFailingProcessor"
-            """
-
-        withMock('mock:on-exception') {
-            expectedBodiesReceived 'Activated'
-        }
-
-        withMock('mock:on-completion') {
-            expectedBodiesReceived 'Completed'
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-        context.getRouteConfigurationDefinitions().size() == 1
-
-        with(context.getRouteConfigurationDefinitions().get(0), RouteConfigurationDefinition) {
-            precondition == '{{activate}}'
-        }
-    }
-
-    def "routeConfiguration-separate"() {
-        setup:
-        // global configurations
-        loadRoutes """
-                - beans:
-                  - name: myFailingProcessor
-                    type: ${MyFailingProcessor.name}
-                - routeConfiguration:
-                    onException:
-                      - onException:
-                          handled:
-                            constant: "true"
-                          exception:
-                            - ${MyException.name}
-                          steps:
-                            - transform:
-                                constant: "Sorry"
-                            - to: "mock:on-exception"
-            """
-        // routes
-        loadRoutes """
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - process: 
-                          ref: "myFailingProcessor"
-                - from:
-                    uri: "direct:start2"
-                    steps:
-                      - process: 
-                          ref: "myFailingProcessor"
-            """
-
-        withMock('mock:on-exception') {
-            expectedBodiesReceived 'Sorry', 'Sorry'
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-            to('direct:start2').withBody('hello2').send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "routeConfigurationId"() {
-        setup:
-        // global configurations
-        loadRoutes """
-                - beans:
-                  - name: myFailingProcessor
-                    type: ${MyFailingProcessor.name}
-                - routeConfiguration:
-                    id: handleError
-                    onException:
-                      - onException:
-                          handled:
-                            constant: "true"
-                          exception:
-                            - ${MyException.name}
-                          steps:
-                            - transform:
-                                constant: "Sorry"
-                            - to: "mock:on-exception"
-            """
-        // routes
-        loadRoutes """
-                - route:
-                    routeConfigurationId: handleError 
-                    from:
-                      uri: "direct:start"
-                      steps:
-                        - process: 
-                            ref: "myFailingProcessor"
-                - route:
-                    from:
-                      uri: "direct:start2"
-                      steps:
-                        - process: 
-                            ref: "myFailingProcessor"
-            """
-
-        withMock('mock:on-exception') {
-            expectedBodiesReceived 'Sorry'
-        }
-
-        when:
-        context.start()
-
-        Exchange out1
-        Exchange out2
-        withTemplate {
-            out1 = to('direct:start').withBody('hello').send()
-            out2 = to('direct:start2').withBody('hello2').send()
-        }
-
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-
-        Assertions.assertFalse(out1.isFailed())
-        Assertions.assertTrue(out2.isFailed())
-    }
-
-    def "routeConfiguration-errorHandler"() {
-        setup:
-        // global configurations
-        loadRoutes """
-                - beans:
-                  - name: myFailingProcessor
-                    type: ${MyFailingProcessor.name}
-                - routeConfiguration:
-                    errorHandler:
-                      deadLetterChannel:
-                        deadLetterUri: "mock:on-error"
-            """
-        // routes
-        loadRoutes """
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - process:
-                          ref: "myFailingProcessor"
-                - from:
-                    uri: "direct:start2"
-                    steps:
-                      - process:
-                          ref: "myFailingProcessor"
-            """
-
-        withMock('mock:on-error') {
-            expectedBodiesReceived 'hello', 'hello2'
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-            to('direct:start2').withBody('hello2').send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "routeConfiguration intercept"() {
-        setup:
-        loadRoutesNoValidate """
-                - routeConfiguration:
-                    intercept:
-                      - intercept:
-                          steps:
-                            - transform:
-                                constant: "intercepted"
-                            - to: "mock:intercepted"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - log: "hello"
-            """
-
-        withMock('mock:intercepted') {
-            expectedBodiesReceived 'intercepted'
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "routeConfiguration interceptFrom"() {
-        setup:
-        loadRoutesNoValidate """
-                - routeConfiguration:
-                    interceptFrom:
-                      - interceptFrom:
-                          uri: "direct:start"
-                          steps:
-                            - transform:
-                                constant: "intercepted"
-                            - to: "mock:intercepted"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - log: "hello"
-            """
-
-        withMock('mock:intercepted') {
-            expectedBodiesReceived 'intercepted'
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "routeConfiguration interceptSendToEndpoint"() {
-        setup:
-        loadRoutesNoValidate """
-                - routeConfiguration:
-                    interceptSendToEndpoint:
-                      - interceptSendToEndpoint:
-                          uri: "direct:start"
-                          steps:
-                            - transform:
-                                constant: "intercepted"
-                            - to: "mock:intercepted"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - log: "hello"
-            """
-
-        withMock('mock:intercepted') {
-            expectedBodiesReceived 'intercepted'
-        }
-
-        when:
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-        }
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "routeConfiguration note"() {
-        when:
-        loadRoutesNoValidate """
-                - routeConfiguration:
-                    id: myConfig
-                    description: my route config
-                    note: a developer note
-                    onException:
-                      - onException:
-                          handled:
-                            constant: "true"
-                          exception:
-                            - ${MyException.name}
-                          steps:
-                            - transform:
-                                constant: "Sorry"
-                            - to: "mock:on-exception"
-            """
-        then:
-        context.routeConfigurationDefinitions.size() == 1
-
-        with(context.routeConfigurationDefinitions[0], RouteConfigurationDefinition) {
-            id == 'myConfig'
-            description == 'my route config'
-            note == 'a developer note'
-        }
-    }
-
-    def "routeConfiguration has line number"() {
-        when:
-        Resource res = asResource('route-config-line',
-            '''
-                - routeConfiguration:
-                    id: myConfig
-                    onException:
-                      - onException:
-                          handled:
-                            constant: "true"
-                          exception:
-                            - java.lang.Exception
-                          steps:
-                            - to: "mock:on-exception"
-            '''
-        )
-        PluginHelper.getRoutesLoader(context).loadRoutes(res)
-
-        then:
-        context.routeConfigurationDefinitions.size() == 1
-
-        with(context.routeConfigurationDefinitions[0], RouteConfigurationDefinition) {
-            id == 'myConfig'
-            lineNumber >= 0
-            location != null
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteReloadNewFileTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteReloadNewFileTest.groovy
deleted file mode 100644
index f0955596e36f..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteReloadNewFileTest.groovy
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.ServiceStatus
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.support.ResourceHelper
-import org.apache.camel.support.RouteWatcherReloadStrategy
-
-import java.nio.file.Files
-import java.nio.file.Path
-
-/**
- * CAMEL-24866: a new route file next to a file with several routes reloads without a duplicate route id: the existing
- * file is one source, whatever the number of routes it holds.
- */
-class RouteReloadNewFileTest extends YamlTestSupport {
-
-    Path dir
-    Path shop
-
-    @Override
-    def doSetup() {
-        dir = Files.createTempDirectory("camel-reload")
-        shop = dir.resolve("shop.camel.yaml")
-        Files.writeString(shop, '''
-            - route:
-                id: orders
-                from:
-                  uri: direct:orders
-                  steps:
-                    - to:
-                        uri: mock:orders
-            - route:
-                id: report
-                from:
-                  uri: direct:report
-                  steps:
-                    - to:
-                        uri: mock:report
-            - route:
-                id: setup
-                from:
-                  uri: direct:setup
-                  steps:
-                    - to:
-                        uri: mock:setup
-            ''')
-        context.start()
-        loadRoutes(ResourceHelper.resolveResource(context, "file:" + shop))
-    }
-
-    def cleanup() {
-        dir.toFile().deleteDir()
-    }
-
-    def 'a new file reloads next to a file with several routes'() {
-        setup:
-            def strategy = new RouteWatcherReloadStrategy(dir.toString())
-            strategy.setCamelContext(context)
-            strategy.setPattern("*.yaml")
-            // the strategy is not started (no file watcher in the test): its reload callback is driven by hand
-            strategy.doStart()
-            assert context.routes.size() == 3
-        when: 'a second file is added'
-            def hello = dir.resolve("hello.camel.yaml")
-            Files.writeString(hello, '''
-                - route:
-                    id: hello
-                    from:
-                      uri: direct:hello
-                      steps:
-                        - to:
-                            uri: mock:hello
-                ''')
-            strategy.getResourceReload().onReload(hello.toString(), ResourceHelper.resolveResource(context, "file:" + hello))
-        then: 'the three routes of the first file and the new one run'
-            context.routes.size() == 4
-            ["orders", "report", "setup", "hello"].every { context.getRouteController().getRouteStatus(it) == ServiceStatus.Started }
-        cleanup:
-            strategy.doStop()
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteReloadRollbackTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteReloadRollbackTest.groovy
deleted file mode 100644
index 20e84f5ea3e0..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteReloadRollbackTest.groovy
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.ServiceStatus
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.ResourceHelper
-import org.apache.camel.support.RouteWatcherReloadStrategy
-
-import java.nio.file.Files
-import java.nio.file.Path
-
-/**
- * CAMEL-24860: a reload that fails (a route file saved with a mistake) restores the routes that ran before, instead
- * of leaving the application without routes until the next successful save. CAMEL-24899: a project whose routes are
- * all in one file goes back to the content that last loaded, which is kept in memory.
- * <p>
- * The mistake the tests save is always the same one, and it is a real one (CAMEL-24850): the endpoint of pollEnrich
- * is an expression, so {@code pollEnrich: {uri: "file:./order.json"}} has no uri property to bind and the loader
- * rejects the file with "pollEnrich: unsupported field: uri". It is the right kind of mistake here because it fails
- * while the routes are built, not while the YAML is parsed, which is what a reload has to survive. The form that
- * works is {@code pollEnrich: {expression: {constant: {expression: "file:./order.json"}}}}.
- */
-class RouteReloadRollbackTest extends YamlTestSupport {
-
-    Path dir
-    Path good
-    Path bad
-
-    @Override
-    def doSetup() {
-        dir = Files.createTempDirectory("camel-reload")
-        good = dir.resolve("good.camel.yaml")
-        bad = dir.resolve("bad.camel.yaml")
-        Files.writeString(good, '''
-            - route:
-                id: good
-                from:
-                  uri: direct:good
-                  steps:
-                    - to:
-                        uri: mock:good
-            ''')
-        Files.writeString(bad, '''
-            - route:
-                id: bad
-                from:
-                  uri: direct:bad
-                  steps:
-                    - to:
-                        uri: mock:bad
-            ''')
-        context.start()
-        loadRoutes(ResourceHelper.resolveResource(context, "file:" + good), ResourceHelper.resolveResource(context, "file:" + bad))
-    }
-
-    def cleanup() {
-        dir.toFile().deleteDir()
-    }
-
-    def 'the only route file keeps its previous version when the save is broken'() {
-        setup:
-            def solo = Files.createTempDirectory("camel-reload-solo")
-            def only = solo.resolve("only.camel.yaml")
-            Files.writeString(only, """
-                - route:
-                    id: only
-                    from:
-                      uri: direct:only
-                      steps:
-                        - to:
-                            uri: mock:only
-                """)
-            def context2 = new org.apache.camel.impl.DefaultCamelContext()
-            context2.start()
-            org.apache.camel.support.PluginHelper.getRoutesLoader(context2)
-                    .loadRoutes(ResourceHelper.resolveResource(context2, "file:" + only))
-            def strategy = new RouteWatcherReloadStrategy(solo.toString())
-            strategy.setCamelContext(context2)
-            strategy.setPattern("*.yaml")
-            strategy.doStart()
-            // one successful reload, so the content that runs is remembered
-            strategy.getResourceReload().onReload(only.toString(), ResourceHelper.resolveResource(context2, "file:" + only))
-            assert context2.getRouteController().getRouteStatus("only") == ServiceStatus.Started
-        when: 'the only route file is saved with a mistake (pollEnrich takes an expression, not a uri)'
-            Files.writeString(only, """
-                - route:
-                    id: only
-                    from:
-                      uri: direct:only
-                      steps:
-                        - pollEnrich:
-                            uri: file:./order.json
-                """)
-            def failure = null
-            try {
-                strategy.getResourceReload().onReload(only.toString(), ResourceHelper.resolveResource(context2, "file:" + only))
-            } catch (Exception e) {
-                failure = e
-            }
-        then: 'the reload fails and the version that ran before is still running'
-            failure != null
-            context2.getRouteController().getRouteStatus("only") == ServiceStatus.Started
-        when: 'the file is fixed'
-            Files.writeString(only, """
-                - route:
-                    id: only
-                    from:
-                      uri: direct:only
-                      steps:
-                        - to:
-                            uri: mock:fixed
-                """)
-            strategy.getResourceReload().onReload(only.toString(), ResourceHelper.resolveResource(context2, "file:" + only))
-        then: 'the fixed version runs, not the remembered one: the message lands in mock:fixed'
-            context2.getRouteController().getRouteStatus("only") == ServiceStatus.Started
-            context2.getRoutes().size() == 1
-            def fixed = context2.getEndpoint("mock:fixed", MockEndpoint)
-            fixed.expectedMessageCount(1)
-            def stale = context2.getEndpoint("mock:only", MockEndpoint)
-            stale.expectedMessageCount(0)
-            context2.createProducerTemplate().sendBody("direct:only", "x")
-            MockEndpoint.assertIsSatisfied(context2)
-        cleanup:
-            strategy.doStop()
-            context2.stop()
-            solo.toFile().deleteDir()
-    }
-
-    def 'everything removed forgets the remembered content, a deleted file is not put back'() {
-        setup:
-            def gone = Files.createTempDirectory("camel-reload-gone")
-            def file = gone.resolve("gone.camel.yaml")
-            Files.writeString(file, """
-                - route:
-                    id: gone
-                    from:
-                      uri: direct:gone
-                      steps:
-                        - to:
-                            uri: mock:gone
-                """)
-            def ctx = new org.apache.camel.impl.DefaultCamelContext()
-            ctx.start()
-            def strategy = new RouteWatcherReloadStrategy(gone.toString())
-            strategy.setCamelContext(ctx)
-            strategy.setPattern("*.yaml")
-            strategy.doStart()
-            strategy.getResourceReload().onReload(file.toString(), ResourceHelper.resolveResource(ctx, "file:" + file))
-            assert ctx.getRouteController().getRouteStatus("gone") == ServiceStatus.Started
-        when: 'every route file is removed (the on-demand strategy asks for that when the directory is empty)'
-            strategy.onRouteReload(null, true)
-        then: 'no routes run'
-            ctx.routes.isEmpty()
-        when: 'the file comes back with a mistake (pollEnrich takes an expression, not a uri)'
-            Files.writeString(file, """
-                - route:
-                    id: gone
-                    from:
-                      uri: direct:gone
-                      steps:
-                        - pollEnrich:
-                            uri: file:./order.json
-                """)
-            def failure = null
-            try {
-                strategy.getResourceReload().onReload(file.toString(), ResourceHelper.resolveResource(ctx, "file:" + file))
-            } catch (Exception e) {
-                failure = e
-            }
-        then: 'the reload fails and the removed route is not put back from memory'
-            failure != null
-            ctx.routes.isEmpty()
-        cleanup:
-            strategy.doStop()
-            ctx.stop()
-            gone.toFile().deleteDir()
-    }
-
-    def 'a failed reload restores the previous routes'() {
-        setup:
-            def strategy = new RouteWatcherReloadStrategy(dir.toString())
-            strategy.setCamelContext(context)
-            strategy.setPattern("*.yaml")
-            // the strategy is not started (no file watcher in the test): its reload callback is driven by hand
-            strategy.doStart()
-            assert context.getRouteController().getRouteStatus("good") == ServiceStatus.Started
-            assert context.getRouteController().getRouteStatus("bad") == ServiceStatus.Started
-        when: 'the second file is saved with a mistake (pollEnrich takes an expression, not a uri)'
-            Files.writeString(bad, '''
-                - route:
-                    id: bad
-                    from:
-                      uri: direct:bad
-                      steps:
-                        - pollEnrich:
-                            uri: file:./order.json
-                ''')
-            def failure = null
-            try {
-                strategy.getResourceReload().onReload(bad.toString(), ResourceHelper.resolveResource(context, "file:" + bad))
-            } catch (Exception e) {
-                failure = e
-            }
-        then: 'the reload fails, and the route of the other file runs again'
-            failure != null
-            context.getRouteController().getRouteStatus("good") == ServiceStatus.Started
-            context.getRoute("bad") == null
-        when: 'the file is fixed'
-            Files.writeString(bad, '''
-                - route:
-                    id: bad
-                    from:
-                      uri: direct:bad
-                      steps:
-                        - to:
-                            uri: mock:bad
-                ''')
-            strategy.getResourceReload().onReload(bad.toString(), ResourceHelper.resolveResource(context, "file:" + bad))
-        then: 'both run'
-            context.getRouteController().getRouteStatus("good") == ServiceStatus.Started
-            context.getRouteController().getRouteStatus("bad") == ServiceStatus.Started
-        cleanup:
-            strategy.doStop()
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy
deleted file mode 100644
index 5079010281be..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.dsl.yaml.support.model.MyBeanBuilder
-import org.apache.camel.dsl.yaml.support.model.MySetBody
-import org.apache.camel.dsl.yaml.support.model.MyUppercaseProcessor
-import org.apache.camel.impl.engine.DefaultRoute
-import org.apache.camel.model.LogDefinition
-import org.apache.camel.model.RouteTemplateDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class RouteTemplateTest extends YamlTestSupport {
-    def "create template"() {
-        when:
-        loadRoutes '''
-                - routeTemplate:
-                    id: "myTemplate"
-                    from:
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeTemplateDefinitions.size() == 1
-
-        with(context.routeTemplateDefinitions[0], RouteTemplateDefinition) {
-            id == 'myTemplate'
-
-            route.input.endpointUri == 'direct:info'
-            with(route.outputs[0], LogDefinition) {
-                message == 'message'
-            }
-        }
-    }
-
-    def "create template with beans (#resource.location)"(Resource resource) {
-        setup:
-        PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-
-        withMock('mock:result') {
-            expectedMessageCount 1
-            expectedBodiesReceived 'HELLO'
-        }
-        when:
-        context.addRouteFromTemplate('myId', 'myTemplate', ['directName': 'myId'])
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-        }
-        then:
-        context.routeTemplateDefinitions.size() == 1
-
-        with(context.routeTemplateDefinitions[0], RouteTemplateDefinition) {
-            id == 'myTemplate'
-            templateBeans.size() == 1
-        }
-
-        MockEndpoint.assertIsSatisfied(context)
-        where:
-        resource << [
-                asResource('beans', """
-                        - routeTemplate:
-                            id: "myTemplate"
-                            beans:
-                              - name: "myProcessor"
-                                type: "#class:${MyUppercaseProcessor.class.name}"
-                            from:
-                              uri: "direct:{{directName}}"
-                              steps:
-                                - process:
-                                    ref: "{{myProcessor}}"
-                        - from:
-                            uri: "direct:start"
-                            steps:
-                              - to: "direct:myId"
-                              - to: "mock:result"
-                    """),
-                asResource('script', """
-                        - routeTemplate:
-                            id: "myTemplate"
-                            beans:
-                              - name: "myProcessor"
-                                type: "${MyUppercaseProcessor.class.name}"
-                                scriptLanguage: "groovy"
-                                script: "new ${MyUppercaseProcessor.class.name}()"
-                            from:
-                              uri: "direct:{{directName}}"
-                              steps:
-                                - process:
-                                    ref: "{{myProcessor}}"
-                        - from:
-                            uri: "direct:start"
-                            steps:
-                              - to: "direct:myId"
-                              - to: "mock:result"
-                    """),
-                asResource('script-block', """
-                        - routeTemplate:
-                            id: "myTemplate"
-                            beans:
-                              - name: "myProcessor"
-                                type: "org.apache.camel.Processor"
-                                scriptLanguage: "groovy"
-                                script: |
-                                    new ${MyUppercaseProcessor.class.name}()
-                            from:
-                              uri: "direct:{{directName}}"
-                              steps:
-                                - process:
-                                    ref: "{{myProcessor}}"
-                        - from:
-                            uri: "direct:start"
-                            steps:
-                              - to: "direct:myId"
-                              - to: "mock:result"
-                    """),
-                asResource('script-without-type', """
-                        - routeTemplate:
-                            id: "myTemplate"
-                            beans:
-                              - name: "myProcessor"
-                                scriptLanguage: "groovy"
-                                script: "new ${MyUppercaseProcessor.class.name}()"
-                            from:
-                              uri: "direct:{{directName}}"
-                              steps:
-                                - process:
-                                    ref: "{{myProcessor}}"
-                        - from:
-                            uri: "direct:start"
-                            steps:
-                              - to: "direct:myId"
-                              - to: "mock:result"
-                    """)
-        ]
-    }
-
-    def "create template with bean and properties"() {
-        setup:
-        loadRoutes """                
-                - routeTemplate:
-                    id: "myTemplate"
-                    beans:
-                      - name: "myProcessor"
-                        type: "#class:${MySetBody.class.name}"
-                        properties:
-                          payload: "test-payload"
-                    from:
-                      uri: "direct:{{directName}}"
-                      steps:
-                        - process:
-                            ref: "{{myProcessor}}"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - to: "direct:myId"
-                      - to: "mock:result"
-            """
-
-        withMock('mock:result') {
-            expectedMessageCount 1
-            expectedBodiesReceived 'test-payload'
-        }
-        when:
-        context.addRouteFromTemplate('myId', 'myTemplate', ['directName': 'myId'])
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-        }
-        then:
-        context.routeTemplateDefinitions.size() == 1
-
-        with(context.routeTemplateDefinitions[0], RouteTemplateDefinition) {
-            id == 'myTemplate'
-            templateBeans.size() == 1
-        }
-
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "create template with builder bean without type"() {
-        setup:
-        loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    beans:
-                      - name: "myBean"
-                        builderClass: "${MyBeanBuilder.class.name}"
-                        builderMethod: "createTheBean"
-                        properties:
-                          field1: "builder-hello"
-                    from:
-                      uri: "direct:{{directName}}"
-                      steps:
-                        - to: "bean:{{myBean}}?method=getField1"
-                - from:
-                    uri: "direct:start"
-                    steps:
-                      - to: "direct:myId"
-                      - to: "mock:result"
-            """
-
-        withMock('mock:result') {
-            expectedMessageCount 1
-            expectedBodiesReceived 'builder-hello'
-        }
-        when:
-        context.addRouteFromTemplate('myId', 'myTemplate', ['directName': 'myId'])
-        context.start()
-
-        withTemplate {
-            to('direct:start').withBody('hello').send()
-        }
-        then:
-        with(context.routeTemplateDefinitions[0], RouteTemplateDefinition) {
-            id == 'myTemplate'
-            templateBeans.size() == 1
-            templateBeans[0].type == null
-        }
-
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "create template with properties"() {
-        when:
-        loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    parameters:
-                      - name: "foo"
-                        defaultValue: "myDefaultFoo"
-                        description: "myFooDescription"
-                      - name: "bar"
-                        description: "myBarDescription"
-                    from:
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            """
-        then:
-        context.routeTemplateDefinitions.size() == 1
-
-        with(context.routeTemplateDefinitions[0], RouteTemplateDefinition) {
-            id == 'myTemplate'
-            configurer == null
-
-            templateParameters.any {
-                it.name == 'foo' && it.defaultValue == 'myDefaultFoo' && it.description == 'myFooDescription'
-            }
-            templateParameters.any {
-                it.name == 'bar' && it.defaultValue == null && it.description == 'myBarDescription'
-            }
-
-            route.input.endpointUri == 'direct:info'
-            with(route.outputs[0], LogDefinition) {
-                message == 'message'
-            }
-        }
-    }
-
-    def "create template with optional properties"() {
-        when:
-        loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    parameters:
-                      - name: "foo"
-                      - name: "bar"
-                        required: false
-                    from:
-                      uri: "direct:{{foo}}"
-                      steps:
-                        - to: "mock:result?retainFirst={{?bar}}"
-            """
-        then:
-        context.routeTemplateDefinitions.size() == 1
-
-        with(context.routeTemplateDefinitions[0], RouteTemplateDefinition) {
-            id == 'myTemplate'
-            configurer == null
-
-            templateParameters.any {
-                it.name == 'foo' && it.defaultValue == null && it.isRequired()
-            }
-            templateParameters.any {
-                it.name == 'bar' && it.defaultValue == null && !it.isRequired()
-            }
-
-            route.input.endpointUri == 'direct:{{foo}}'
-            with(route.outputs[0], ToDefinition) {
-                uri == 'mock:result?retainFirst={{?bar}}'
-            }
-        }
-
-        context.start()
-
-        context.addRouteFromTemplate("myRoute1", "myTemplate", [foo: "start", bar: "1"])
-        Assertions.assertNull(context.hasEndpoint("mock:result"))
-        Assertions.assertNotNull(context.hasEndpoint("mock:result?retainFirst=1"))
-        MockEndpoint mock = context.getEndpoint("mock:result?retainFirst=1", MockEndpoint)
-        mock.expectedBodiesReceived("Hello World")
-        context.createProducerTemplate().sendBody("direct:start", "Hello World")
-        mock.assertIsSatisfied()
-        mock.reset()
-
-        context.addRouteFromTemplate("myRoute2", "myTemplate", [foo: "start2"])
-        MockEndpoint mock2 = context.getEndpoint("mock:result", MockEndpoint)
-        mock2.expectedBodiesReceived("Bye World")
-        context.createProducerTemplate().sendBody("direct:start2", "Bye World")
-        mock2.assertIsSatisfied()
-    }
-
-    def "create template with java"() {
-        setup:
-            loadRoutes """                
-                    - routeTemplate:
-                        id: "myTemplate"
-                        beans:
-                          - name: "myAgg"
-                            type: "org.apache.camel.AggregationStrategy"
-                            scriptLanguage: "java"
-                            script: "(e1, e2) -> { return e2.getMessage().getBody(); }"
-                        from:
-                          uri: "direct:route"
-                          steps:
-                            - aggregate:
-                                aggregationStrategy: "{{myAgg}}"
-                                completionSize: 2
-                                correlationExpression:
-                                  header: "StockSymbol"
-                                steps:  
-                                  - to: "mock:result"
-                """
-            withMock('mock:result') {
-                expectedMessageCount 2
-                expectedBodiesReceived '101', '199'
-            }
-        when:
-            context.addRouteFromTemplate('myId', 'myTemplate', [:])
-            context.start()
-
-            withTemplate {
-                to('direct:route').withBody('99').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('101').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('200').withHeader('StockSymbol', 2).send()
-                to('direct:route').withBody('199').withHeader('StockSymbol', 2).send()
-            }
-        then:
-            context.routeTemplateDefinitions.size() == 1
-
-            with(context.routeTemplateDefinitions[0], RouteTemplateDefinition) {
-                id == 'myTemplate'
-                templateBeans.size() == 1
-            }
-
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "create template with groovy"() {
-        setup:
-            loadRoutes """                
-                    - routeTemplate:
-                        id: "myTemplate"
-                        beans:
-                          - name: "myAgg"
-                            type: "org.apache.camel.AggregationStrategy"
-                            scriptLanguage: "groovy"
-                            script: "class MaxAgg { int agg(int s1, int s2) { return Math.max(s1, s2) }}; new MaxAgg()"
-                        from:
-                          uri: "direct:route"
-                          steps:
-                            - aggregate:
-                                aggregationStrategy: "{{myAgg}}"
-                                completionSize: 2
-                                correlationExpression:
-                                  header: "StockSymbol"
-                                steps:  
-                                  - to: "mock:result"
-                """
-            withMock('mock:result') {
-                expectedMessageCount 2
-                expectedBodiesReceived '101', '200'
-            }
-        when:
-            context.addRouteFromTemplate('myId', 'myTemplate', [:])
-            context.start()
-
-            withTemplate {
-                to('direct:route').withBody('99').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('101').withHeader('StockSymbol', 1).send()
-                to('direct:route').withBody('200').withHeader('StockSymbol', 2).send()
-                to('direct:route').withBody('199').withHeader('StockSymbol', 2).send()
-            }
-        then:
-            context.routeTemplateDefinitions.size() == 1
-
-            with(context.routeTemplateDefinitions[0], RouteTemplateDefinition) {
-                id == 'myTemplate'
-                templateBeans.size() == 1
-            }
-
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "create routeTemplate with route"() {
-        setup:
-        loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    parameters:
-                      - name: "foo"
-                      - name: "bar"
-                    route:
-                      streamCache: false
-                      messageHistory: true
-                      logMask: true
-                      from:
-                        uri: "direct:{{foo}}"
-                        steps:
-                          - to: "mock:{{bar}}"
-            """
-        when:
-            context.addRouteFromTemplate('myId', 'myTemplate', [foo: "start", bar: "result"])
-            context.start()
-
-        then:
-            with(context.routes[0], DefaultRoute) {
-                it.isStreamCaching() == false
-                it.isMessageHistory() == true
-                it.isLogMask() == true
-            }
-    }
-
-    def "create routeTemplate with prefix"() {
-        setup:
-        loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    parameters:
-                      - name: "foo"
-                      - name: "bar"
-                    from:
-                      uri: "direct:{{foo}}"
-                      steps:
-                      - choice:  
-                          when:
-                            - header: "foo"
-                              steps:
-                                - log:
-                                    id: "myLog"
-                                    message: "Hello World"
-                          otherwise:
-                            steps:
-                              - to:
-                                  uri: "mock:{{bar}}"
-                                  id: "end"
-            """
-        when:
-        Map<String, Object> parameters = new HashMap<>()
-        parameters.put("foo", "one")
-        parameters.put("bar", "cheese")
-        context.addRouteFromTemplate("first", "myTemplate", "aaa", parameters)
-
-        parameters.put("foo", "two")
-        parameters.put("bar", "cake")
-        context.addRouteFromTemplate("second", "myTemplate", "bbb", parameters)
-        context.start()
-
-        then:
-        Assertions.assertEquals(3, context.getRoute("first").filter("aaa*").size())
-        Assertions.assertEquals(3, context.getRoute("second").filter("bbb*").size())
-    }
-
-    def "create template with optional endpoint uri not provided"() {
-        when:
-        loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    parameters:
-                      - name: "foo"
-                      - name: "optionalUri"
-                        required: false
-                    from:
-                      uri: "direct:{{foo}}"
-                      steps:
-                        - to: "{{?optionalUri}}"
-                        - to: "mock:result"
-            """
-
-        context.addRouteFromTemplate("myRoute1", "myTemplate", [foo: "start"])
-        context.start()
-
-        then:
-        MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint)
-        mock.expectedBodiesReceived("Hello World")
-        context.createProducerTemplate().sendBody("direct:start", "Hello World")
-        mock.assertIsSatisfied()
-    }
-
-    def "create template with optional endpoint uri provided"() {
-        when:
-        loadRoutes """
-                - routeTemplate:
-                    id: "myTemplate"
-                    parameters:
-                      - name: "foo"
-                      - name: "optionalUri"
-                        required: false
-                    from:
-                      uri: "direct:{{foo}}"
-                      steps:
-                        - to: "{{?optionalUri}}"
-                        - to: "mock:result"
-            """
-
-        context.addRouteFromTemplate("myRoute1", "myTemplate", [foo: "start", optionalUri: "mock:middle"])
-        context.start()
-
-        then:
-        MockEndpoint middle = context.getEndpoint("mock:middle", MockEndpoint)
-        middle.expectedBodiesReceived("Hello World")
-        MockEndpoint result = context.getEndpoint("mock:result", MockEndpoint)
-        result.expectedBodiesReceived("Hello World")
-        context.createProducerTemplate().sendBody("direct:start", "Hello World")
-        middle.assertIsSatisfied()
-        result.assertIsSatisfied()
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
deleted file mode 100644
index 4d3547114189..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.LogDefinition
-import org.apache.camel.model.RouteDefinition
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition
-import org.apache.camel.model.errorhandler.RefErrorHandlerDefinition
-import org.junit.jupiter.api.Assertions
-
-class RoutesTest extends YamlTestSupport {
-
-    def "load from"() {
-        when:
-            loadRoutes '''
-                - from:
-                    uri: "direct:info"
-                    steps:
-                      - log: "message"
-            '''
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0], RouteDefinition) {
-                input.endpointUri == 'direct:info'
-
-                with (outputs[0], LogDefinition) {
-                    message == 'message'
-                }
-            }
-    }
-
-    def "load from description"() {
-        when:
-        loadRoutes '''
-                - from:
-                    id: from-demo
-                    description: from something cool
-                    uri: "direct:info"
-                    steps:
-                      - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            input.id == 'from-demo'
-            input.description == 'from something cool'
-            input.endpointUri == 'direct:info'
-
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-        }
-    }
-
-    def "load from with parameters"() {
-        when:
-            loadRoutes '''
-                - from:
-                    uri: "direct:info"
-                    parameters:
-                      timeout: 1234    
-                    steps:
-                      - log: "message"
-            '''
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0], RouteDefinition) {
-                input.endpointUri == 'direct:info?timeout=1234'
-
-                with (outputs[0], LogDefinition) {
-                    message == 'message'
-                }
-            }
-    }
-
-    def "load multi from "() {
-        when:
-            loadRoutes '''
-                - from:
-                    uri: "direct:1"
-                    steps:
-                      - log: "1"
-                - from:
-                    uri: "direct:2"
-                    steps:
-                      - log: "2"
-            '''
-        then:
-            context.routeDefinitions.size() == 2
-
-            with(context.routeDefinitions[0], RouteDefinition) {
-                input.endpointUri == 'direct:1'
-
-                with (outputs[0], LogDefinition) {
-                    message == '1'
-                }
-            }
-            with(context.routeDefinitions[1], RouteDefinition) {
-                input.endpointUri == 'direct:2'
-
-                with (outputs[0], LogDefinition) {
-                    message == '2'
-                }
-            }
-    }
-
-    def "load route"() {
-        when:
-            loadRoutes '''
-                - route:
-                    from:
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0], RouteDefinition) {
-                input.endpointUri == 'direct:info'
-
-                with (outputs[0], LogDefinition) {
-                    message == 'message'
-                }
-            }
-    }
-
-    def "load route with parameters"() {
-        when:
-            loadRoutes '''
-                - route:
-                    from:
-                      uri: "direct:info"
-                      parameters:
-                        timeout: 1234
-                      steps:
-                        - log: "message"
-            '''
-        then:
-            context.routeDefinitions.size() == 1
-
-            with(context.routeDefinitions[0], RouteDefinition) {
-                input.endpointUri == 'direct:info?timeout=1234'
-
-                with (outputs[0], LogDefinition) {
-                    message == 'message'
-                }
-            }
-    }
-
-    def "load route with error handler ref"() {
-        when:
-        loadRoutes '''
-                - route:
-                    errorHandlerRef: "myErrorHandler"
-                    from: 
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            input.endpointUri == 'direct:info'
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-            errorHandlerFactorySet
-            errorHandlerFactory.class == RefErrorHandlerDefinition.class
-            with (errorHandlerFactory, RefErrorHandlerDefinition) {
-                ref == "myErrorHandler"
-            }
-        }
-    }
-
-    def "load route with error handler"() {
-        when:
-        loadRoutes '''
-                - route:
-                    errorHandler: 
-                      refErrorHandler: 
-                        ref: "myErrorHandler"
-                    from: 
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            input.endpointUri == 'direct:info'
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-            errorHandlerFactorySet
-            errorHandlerFactory.class == RefErrorHandlerDefinition.class
-            with (errorHandlerFactory, RefErrorHandlerDefinition) {
-                ref == "myErrorHandler"
-            }
-        }
-    }
-
-    def "load route with error handler properties"() {
-        when:
-        loadRoutes '''
-                - route:
-                    errorHandler: 
-                      deadLetterChannel: 
-                        deadLetterUri: "mock:on-error"
-                        redeliveryPolicy:
-                          maximumRedeliveries: 3
-                    from: 
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            input.endpointUri == 'direct:info'
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-            errorHandlerFactorySet
-            errorHandlerFactory.class == DeadLetterChannelDefinition.class
-            with (errorHandlerFactory, DeadLetterChannelDefinition) {
-                deadLetterUri == 'mock:on-error'
-                redeliveryPolicy.maximumRedeliveries == "3"
-            }
-        }
-    }
-
-    def "load route with input/output types"() {
-        when:
-        loadRoutes '''
-                - route:
-                    inputType: 
-                      urn: "plain/text"
-                    outputType: 
-                      urn: "application/octet-stream"
-                    from: 
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            inputType.urn == 'plain/text'
-            outputType.urn == 'application/octet-stream'
-
-            input.endpointUri == 'direct:info'
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-        }
-    }
-
-    def "load route inlined camelCase"() {
-        when:
-        loadRoutes '''
-                - route:
-                    id: demo-route
-                    streamCache: true
-                    autoStartup: false
-                    startupOrder: 123
-                    routePolicyRef: "myPolicy"
-                    shutdownRoute: "Defer"
-                    shutdownRunningTask: "CompleteAllTasks"
-                    delayer: "200"
-                    from:
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            routeId == 'demo-route'
-            streamCache == 'true'
-            autoStartup == 'false'
-            startupOrder == 123
-            routePolicyRef == 'myPolicy'
-            shutdownRoute == "Defer"
-            shutdownRunningTask == "CompleteAllTasks"
-            delayer == '200'
-            input.endpointUri == 'direct:info'
-
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-        }
-    }
-
-    def "load route description"() {
-        when:
-        loadRoutes '''
-                - route:
-                    id: demo-route
-                    description: something cool
-                    from:
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            routeId == 'demo-route'
-            description == 'something cool'
-            input.endpointUri == 'direct:info'
-
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-        }
-    }
-
-    def "load route description with precondition"() {
-        when:
-        loadRoutes '''
-                - route:
-                    id: demo-route
-                    description: something cool
-                    precondition: "{{?red}}"
-                    from:
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            routeId == 'demo-route'
-            description == 'something cool'
-            input.endpointUri == 'direct:info'
-            precondition == '{{?red}}'
-
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-        }
-    }
-
-    def "load from note"() {
-        when:
-        loadRoutes '''
-                - from:
-                    id: from-demo
-                    description: from something cool
-                    note: a developer note
-                    uri: "direct:info"
-                    steps:
-                      - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            input.id == 'from-demo'
-            input.description == 'from something cool'
-            input.note == 'a developer note'
-            input.endpointUri == 'direct:info'
-
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-        }
-    }
-
-    def "load route with from description"() {
-        when:
-        loadRoutes '''
-                - route:
-                    id: demo-route
-                    description: something cool
-                    from:
-                      id: from-demo
-                      description: from something cool
-                      uri: "direct:info"
-                      steps:
-                        - log: "message"
-            '''
-        then:
-        context.routeDefinitions.size() == 1
-
-        with(context.routeDefinitions[0], RouteDefinition) {
-            routeId == 'demo-route'
-            description == 'something cool'
-
-            input.id == 'from-demo'
-            input.description == 'from something cool'
-            input.endpointUri == 'direct:info'
-
-            with (outputs[0], LogDefinition) {
-                message == 'message'
-            }
-        }
-    }
-
-    def "load route with node-prefix-id"() {
-        when:
-        loadRoutes '''
-                - route:
-                    id: foo
-                    nodePrefixId: aaa
-                    from:
-                      uri: "direct:foo"
-                      steps:
-                        - to:
-                            id: "myFoo"
-                            uri: "mock:foo"
-                        - to: "seda:foo"
-                - route:
-                    id: bar
-                    nodePrefixId: bbb
-                    from:
-                      uri: "direct:bar"
-                      steps:
-                        - to:
-                            id: "myBar"
-                            uri: "mock:bar"
-                        - to: "seda:bar"
-            '''
-        then:
-        context.routeDefinitions.size() == 2
-        context.start()
-
-        Assertions.assertEquals(2, context.getRoute("foo").filter("aaa*").size())
-        Assertions.assertEquals(2, context.getRoute("bar").filter("bbb*").size())
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutingSlipTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutingSlipTest.groovy
deleted file mode 100644
index 8ce4efd58974..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutingSlipTest.groovy
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.RoutingSlipDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class RoutingSlipTest extends YamlTestSupport {
-
-    def "routing-slip definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], RoutingSlipDefinition) {
-                uriDelimiter == '|'
-
-                with (expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - routingSlip:
-                              simple: "${body}"
-                              uriDelimiter: "|"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - routingSlip:
-                              expression:
-                                simple: "${body}"
-                              uriDelimiter: "|"
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SSLContextParametersTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SSLContextParametersTest.groovy
deleted file mode 100644
index 44a5587b7bb8..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SSLContextParametersTest.groovy
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.support.jsse.SSLContextParameters
-
-class SSLContextParametersTest extends YamlTestSupport {
-
-    def "load ssl context parameters"() {
-        when:
-            loadRoutesNoValidate """
-                - sslContextParameters:
-                    id: mySSL
-                    keyStore: server.p12
-                    keystorePassword: changeit
-                    trustStore: truststore.p12
-                    trustStorePassword: changeit
-                - from:
-                    uri: "direct:ssl"
-                    steps:
-                      - to: "mock:ssl"
-            """
-        then:
-            // verify SSL context parameters were registered in registry
-            def sslParams = context.registry.lookupByNameAndType('mySSL', SSLContextParameters)
-            sslParams != null
-
-            // verify it was also set as the global default
-            context.getSSLContextParameters() != null
-
-            // verify key store configuration
-            sslParams.keyManagers != null
-            sslParams.keyManagers.keyStore != null
-            sslParams.keyManagers.keyStore.resource == 'server.p12'
-            sslParams.keyManagers.keyPassword == 'changeit'
-
-            // verify trust store configuration
-            sslParams.trustManagers != null
-            sslParams.trustManagers.keyStore != null
-            sslParams.trustManagers.keyStore.resource == 'truststore.p12'
-            sslParams.trustManagers.keyStore.password == 'changeit'
-    }
-
-    def "load ssl context parameters with advanced options"() {
-        when:
-            loadRoutesNoValidate """
-                - sslContextParameters:
-                    id: myAdvancedSSL
-                    keyStore: server.p12
-                    keystorePassword: changeit
-                    secureSocketProtocol: TLSv1.3
-                    certAlias: myAlias
-                    clientAuthentication: WANT
-                - from:
-                    uri: "direct:ssl"
-                    steps:
-                      - to: "mock:ssl"
-            """
-        then:
-            def sslParams = context.registry.lookupByNameAndType('myAdvancedSSL', SSLContextParameters)
-            sslParams != null
-            sslParams.secureSocketProtocol == 'TLSv1.3'
-            sslParams.certAlias == 'myAlias'
-            sslParams.serverParameters != null
-            sslParams.serverParameters.clientAuthentication == 'WANT'
-    }
-
-    def "load ssl context parameters with trust all certificates"() {
-        when:
-            loadRoutesNoValidate """
-                - sslContextParameters:
-                    id: myTrustAllSSL
-                    trustAllCertificates: "true"
-                - from:
-                    uri: "direct:ssl"
-                    steps:
-                      - to: "mock:ssl"
-            """
-        then:
-            def sslParams = context.registry.lookupByNameAndType('myTrustAllSSL', SSLContextParameters)
-            sslParams != null
-            // trust managers should be configured with trust-all
-            sslParams.trustManagers != null
-            // key managers should be null since no keyStore was provided
-            sslParams.keyManagers == null
-    }
-
-    def "load ssl context parameters without id sets global default"() {
-        when:
-            loadRoutesNoValidate """
-                - sslContextParameters:
-                    keyStore: server.p12
-                    keystorePassword: changeit
-                - from:
-                    uri: "direct:ssl"
-                    steps:
-                      - to: "mock:ssl"
-            """
-        then:
-            // verify global default is set even without id
-            context.getSSLContextParameters() != null
-            context.getSSLContextParameters().keyManagers != null
-            context.getSSLContextParameters().keyManagers.keyStore.resource == 'server.p12'
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SagaTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SagaTest.groovy
deleted file mode 100644
index a8c8dd6376f7..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SagaTest.groovy
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.SagaDefinition
-import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.language.JqExpression
-import org.apache.camel.model.language.SimpleExpression
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class SagaTest extends YamlTestSupport {
-
-    def "saga (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], SagaDefinition) {
-                propagation == "MANDATORY"
-                completionMode == "MANUAL"
-                compensation == "direct:compensation"
-                completion == "direct:completion"
-                // saga spans the entire route so steps are inserted before any saga specific step
-                // https://issues.apache.org/jira/browse/CAMEL-17129
-                with(outputs[0], ToDefinition) {
-                    endpointUri == 'mock:result'
-                }
-                with(outputs[1], ToDefinition) {
-                    endpointUri == 'direct:something'
-                }
-                options.size() == 2
-                options[0].key == "o1"
-                options[0].expression instanceof JqExpression
-                options[0].expression.expression == '.foo'
-                options[1].key == "o2"
-                options[1].expression instanceof SimpleExpression
-                options[1].expression.expression == '${body}'
-            }
-        where:
-            resource << [
-                asResource('full-parameters-id', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - saga:  
-                             propagation: "MANDATORY"
-                             completionMode: "MANUAL"
-                             compensation: direct:compensation 
-                             completion: direct:completion
-                             steps:
-                               - to: "direct:something"
-                             option:
-                               - key: o1
-                                 jq: ".foo" 
-                               - key: o2
-                                 expression:
-                                   simple:
-                                     id: key2
-                                     expression: "${body}"        
-                          - to: "mock:result"
-                    '''),
-                asResource('short', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - saga: 
-                             propagation: "MANDATORY"
-                             completionMode: "MANUAL"
-                             compensation: "direct:compensation"
-                             completion: "direct:completion"
-                             steps:
-                               - to: "direct:something"    
-                             option:
-                               - key: o1
-                                 jq: ".foo" 
-                               - key: o2
-                                 expression:
-                                   simple: "${body}"        
-                          - to: "mock:result"
-                    ''')
-           ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ScriptTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ScriptTest.groovy
deleted file mode 100644
index 6dff353c2ce3..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ScriptTest.groovy
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.ScriptDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class ScriptTest extends YamlTestSupport {
-
-    def "script definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], ScriptDefinition) {
-                with (expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - script:
-                              simple: "${body}"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - script:
-                              expression:
-                                simple: "${body}"
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetBodyTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetBodyTest.groovy
deleted file mode 100644
index 80b8aa3536dd..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetBodyTest.groovy
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.SetBodyDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-
-class SetBodyTest extends YamlTestSupport {
-
-    def "setBody definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], SetBodyDefinition) {
-                with (expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setBody:
-                              simple: "${body}"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setBody:
-                              expression:
-                                simple: "${body}"
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeaderTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeaderTest.groovy
deleted file mode 100644
index 007634b395e1..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeaderTest.groovy
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.SetHeaderDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.model.language.SimpleExpression
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class SetHeaderTest extends YamlTestSupport {
-
-    def "setHeader definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-        with(context.routeDefinitions[0].outputs[0], SetHeaderDefinition) {
-            name == 'test'
-
-            with(expression, ExpressionDefinition) {
-                language == 'simple'
-                expression == '${body}'
-            }
-        }
-        where:
-        resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setHeader:
-                              name: test
-                              simple: "${body}"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setHeader:
-                              name: test
-                              expression:
-                                simple: "${body}"
-                          - to: "mock:result"
-                    ''')
-        ]
-    }
-
-    def "setHeader resultType"() {
-        when:
-        loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - setHeader:
-                          name: test
-                          simple:
-                            expression: "${body}"
-                            resultType: "long" 
-                      - to: "mock:result"
-            '''
-        then:
-        with(context.routeDefinitions[0].outputs[0], SetHeaderDefinition) {
-            name == 'test'
-
-            with(expression, SimpleExpression) {
-                language == 'simple'
-                expression == '${body}'
-                resultTypeName == 'long'
-            }
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeadersTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeadersTest.groovy
deleted file mode 100644
index 586156c660aa..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeadersTest.groovy
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.SetHeadersDefinition
-import org.apache.camel.model.SetHeaderDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.model.language.SimpleExpression
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class SetHeadersTest extends YamlTestSupport {
-
-    def "setHeaders definition"() {
-        when:
-        loadRoutes '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setHeaders:
-                              headers:
-                                - name: testbody
-                                  simple: "${body}"
-                                - name: testconstant
-                                  constant: ABC
-                          - to: "mock:result"
-                    '''
-        then:
-        with(context.routeDefinitions[0].outputs[0], SetHeadersDefinition) {
-            with(it.headers[0], SetHeaderDefinition) {
-                name == 'testbody'
-                with(expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-            with(it.headers[1], SetHeaderDefinition) {
-                name == 'testconstant'
-                with(expression, ExpressionDefinition) {
-                    language == 'constant'
-                    expression == "ABC"
-                }
-            }
-        }
-    }
-    
-        def "setHeaders resultType"() {
-        when:
-        loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - setHeaders:
-                          headers:
-                            - name: foo
-                              simple: "${body}"
-                            - name: bar
-                              simple:
-                                expression: "${header.foo} > 10"
-                                resultType: "boolean"      
-                      - to: "mock:result"
-            '''
-        then:
-        with(context.routeDefinitions[0].outputs[0], SetHeadersDefinition) {
-            with(it.headers[1], SetHeaderDefinition) {
-                name == 'bar'
-                with(expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${header.foo} > 10'
-                    resultTypeName == 'boolean'
-                }
-            }
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetPropertyTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetPropertyTest.groovy
deleted file mode 100644
index 752562a218bc..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetPropertyTest.groovy
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.SetPropertyDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class SetPropertyTest extends YamlTestSupport {
-
-    def "setProperty definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], SetPropertyDefinition) {
-                name == 'test'
-
-                with (expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setProperty:
-                              name: test
-                              simple: "${body}"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setProperty:
-                              name: test
-                              expression:
-                                simple: "${body}"
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetVariableTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetVariableTest.groovy
deleted file mode 100644
index 00dfe69c3621..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetVariableTest.groovy
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.SetVariableDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-import org.apache.camel.spi.Resource
-import org.apache.camel.support.PluginHelper
-import org.junit.jupiter.api.Assertions
-
-class SetVariableTest extends YamlTestSupport {
-
-    def "setVariable definition (#resource.location)"(Resource resource) {
-        when:
-            PluginHelper.getRoutesLoader(context).loadRoutes(resource)
-        then:
-            with(context.routeDefinitions[0].outputs[0], SetVariableDefinition) {
-                name == 'test'
-
-                with (expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == 'Hello ${body}'
-                }
-            }
-        where:
-            resource << [
-                asResource('expression', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setVariable:
-                              name: test
-                              simple: "Hello ${body}"
-                          - to: "mock:result"
-                    '''),
-                asResource('expression-block', '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setVariable:
-                              name: test
-                              expression:
-                                simple: "Hello ${body}"
-                          - to: "mock:result"
-                    ''')
-            ]
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetVariablesTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetVariablesTest.groovy
deleted file mode 100644
index 701c6bc8f70c..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetVariablesTest.groovy
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.model.SetVariableDefinition
-import org.apache.camel.model.SetVariablesDefinition
-import org.apache.camel.model.language.ExpressionDefinition
-
-class SetVariablesTest extends YamlTestSupport {
-
-    def "setVariables definition"() {
-        when:
-        loadRoutes '''
-                    - from:
-                        uri: "direct:start"
-                        steps:    
-                          - setVariables:
-                              variables:
-                                - name: testbody
-                                  simple: "${body}"
-                                - name: testconstant
-                                  constant: ABC
-                          - to: "mock:result"
-                    '''
-        then:
-        with(context.routeDefinitions[0].outputs[0], SetVariablesDefinition) {
-            with(it.variables[0], SetVariableDefinition) {
-                name == 'testbody'
-                with(expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${body}'
-                }
-            }
-            with(it.variables[1], SetVariableDefinition) {
-                name == 'testconstant'
-                with(expression, ExpressionDefinition) {
-                    language == 'constant'
-                    expression == "ABC"
-                }
-            }
-        }
-    }
-    
-        def "setVariables resultType"() {
-        when:
-        loadRoutes '''
-                - from:
-                    uri: "direct:start"
-                    steps:    
-                      - setVariables:
-                          variables:
-                            - name: foo
-                              simple: "${body}"
-                            - name: bar
-                              simple:
-                                expression: "${variable.foo} > 10"
-                                resultType: "boolean"      
-                      - to: "mock:result"
-            '''
-        then:
-        with(context.routeDefinitions[0].outputs[0], SetVariablesDefinition) {
-            with(it.variables[1], SetVariableDefinition) {
-                name == 'bar'
-                with(expression, ExpressionDefinition) {
-                    language == 'simple'
-                    expression == '${variable.foo} > 10'
-                    resultTypeName == 'boolean'
-                }
-            }
-        }
-    }
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
deleted file mode 100644
index 837cae9e1386..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.FailedToCreateRouteException
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.common.YamlDeserializationMode
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-
-class SplitTest extends YamlTestSupport {
-
-    @Override
-    def doSetup() {
-        context.start()
-    }
-
-    def "split"() {
-        setup:
-            loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - split:
-                          tokenize: ","
-                          steps:
-                            - to: "mock:split"
-                      - to: "mock:route"
-            '''
-
-            withMock('mock:split') {
-                expectedMessageCount 3
-                expectedBodiesReceived 'a', 'b', 'c'
-            }
-            withMock('mock:route') {
-                expectedMessageCount 1
-                expectedBodiesReceived 'a,b,c'
-            }
-
-        when:
-            withTemplate {
-                to('direct:route').withBody('a,b,c').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "split (flow)"() {
-        setup:
-            loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - split:
-                          tokenize: ","
-                      - to: "mock:split"
-            '''
-
-            withMock('mock:split') {
-                expectedMessageCount 3
-                expectedBodiesReceived 'a', 'b', 'c'
-            }
-
-        when:
-            withTemplate {
-                to('direct:route').withBody('a,b,c').send()
-            }
-
-        then:
-            MockEndpoint.assertIsSatisfied(context)
-    }
-
-    def "split xtokenize"() {
-        setup:
-        loadRoutes '''
-                - from:
-                    uri: "direct:route"
-                    steps:
-                      - split:
-                          expression:
-                            xtokenize:
-                              mode: i
-                              expression: /orders/order 
-                          steps:
-                            - to: "mock:split"
-                      - to: "mock:route"
-            '''
-
-        withMock('mock:split') {
-            expectedMessageCount 3
-            expectedBodiesReceived '<order>Camel in Action</order>', '<order>ActiveMQ in Action</order>', '<order>DSL in Action</order>'
-        }
-
-        when:
-        withTemplate {
-            to('direct:route').withBody(createBody()).send()
-        }
-
-        then:
-        MockEndpoint.assertIsSatisfied(context)
-    }
-
-    protected String createBody() {
-        StringBuilder sb = new StringBuilder("<?xml version=\"1.0\"?>\n")
-        sb.append("<orders>\n")
-        sb.append("  <order>Camel in Action</order>\n")
-        sb.append("  <order>ActiveMQ in Action</order>\n")
-        sb.append("  <order>DSL in Action</order>\n")
-        sb.append("</orders>")
-        return sb.toString()
-    }
-
-
-}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/TemplatedRouteTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/TemplatedRouteTest.groovy
deleted file mode 100644
index 6915afd14142..000000000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/TemplatedRouteTest.groovy
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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.dsl.yaml
-
-import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.dsl.yaml.support.model.MyUppercaseProcessor
-import org.apache.camel.model.RouteDefinition
-import org.junit.jupiter.api.Assertions
-
-class TemplatedRouteTest extends YamlTestSupport {
-
-    def "create templated route"() {
-        setup:
... 19443 lines suppressed ...