You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/08/19 15:54:49 UTC
[camel-k-runtime] 01/03: loaders: consistent test class naming and
test packages organization
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 54d45eac17338b0cdb2650e1633fd9e7a7a18b7c
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Aug 19 17:15:24 2020 +0200
loaders: consistent test class naming and test packages organization
---
...onTest.groovy => GroovySourceLoaderTest.groovy} | 50 ++++++++++++++-
.../apache/camel/k/loader/groovy/LoaderTest.groovy | 71 ----------------------
.../extension/ExpressionClauseExtensionTest.groovy | 2 +-
.../{dsl => }/extension/LogExtensionTest.groovy | 2 +-
.../camel/k/loader/yaml/DefinitionsTest.groovy | 1 +
.../apache/camel/k/loader/yaml/RoutesTest.groovy | 1 +
.../loader/yaml/RoutesWithPlaceholdersTest.groovy | 1 +
.../k/loader/yaml/parser/AggregateTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/BeanTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/ChoiceTest.groovy | 2 +-
.../k/loader/yaml/parser/CircuitBreakerTest.groovy | 2 +-
.../k/loader/yaml/parser/ClaimCheckTest.groovy | 2 +-
.../k/loader/yaml/parser/ConvertBodyTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/DelayTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/DoTryTest.groovy | 2 +-
.../k/loader/yaml/parser/DynamicRouterTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/EnrichTest.groovy | 2 +-
.../k/loader/yaml/parser/ErrorHandlerTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/FilterTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/FromTest.groovy | 2 +-
.../yaml/parser/IdempotentConsumerTest.groovy | 3 +-
.../k/loader/yaml/parser/LoadBalanceTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/LogTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/LoopTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/MarshalTest.groovy | 2 +-
.../k/loader/yaml/parser/MulticastTest.groovy | 2 +-
.../k/loader/yaml/parser/OnExceptionTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/PipelineTest.groovy | 2 +-
.../k/loader/yaml/parser/PollEnrichTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/ProcessTest.groovy | 2 +-
.../k/loader/yaml/parser/RecipientListTest.groovy | 2 +-
.../k/loader/yaml/parser/RemoveHeaderTest.groovy | 2 +-
.../k/loader/yaml/parser/RemoveHeadersTest.groovy | 4 +-
.../loader/yaml/parser/RemovePropertiesTest.groovy | 4 +-
.../k/loader/yaml/parser/RemovePropertyTest.groovy | 2 +-
.../k/loader/yaml/parser/ResequenceTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/RestTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/RollbackTest.groovy | 2 +-
.../k/loader/yaml/parser/RoutingSlipTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/SagaTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/SampleTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/ScriptTest.groovy | 2 +-
.../k/loader/yaml/parser/ServiceCallTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/SetBodyTest.groovy | 2 +-
.../yaml/parser/SetExchangePatternTest.groovy | 2 +-
.../k/loader/yaml/parser/SetHeaderTest.groovy | 2 +-
.../k/loader/yaml/parser/SetPropertyTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/SortTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/SplitTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/StepTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/StopTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/ThreadsTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/ThrottleTest.groovy | 2 +-
.../k/loader/yaml/parser/ThrowExceptionTest.groovy | 2 +-
.../k/loader/yaml/parser/ToDynamicTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/ToTest.groovy | 2 +-
.../k/loader/yaml/parser/TransactedTest.groovy | 2 +-
.../k/loader/yaml/parser/UnmarshalTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/ValidateTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/WireTapTest.groovy | 2 +-
.../k/loader/yaml/{ => support}/TestSupport.groovy | 4 +-
61 files changed, 110 insertions(+), 133 deletions(-)
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
similarity index 82%
rename from camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
rename to camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
index 5e5119a..60163af 100644
--- a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
+++ b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.loader.groovy.dsl
+package org.apache.camel.k.loader.groovy
import org.apache.camel.Predicate
import org.apache.camel.Processor
@@ -22,8 +22,13 @@ import org.apache.camel.RuntimeCamelException
import org.apache.camel.component.jackson.JacksonDataFormat
import org.apache.camel.component.log.LogComponent
import org.apache.camel.component.seda.SedaComponent
+import org.apache.camel.k.Sources
+import org.apache.camel.k.listener.RoutesConfigurer
import org.apache.camel.k.loader.groovy.support.TestRuntime
import org.apache.camel.language.bean.BeanLanguage
+import org.apache.camel.model.FromDefinition
+import org.apache.camel.model.ModelCamelContext
+import org.apache.camel.model.ToDefinition
import org.apache.camel.model.rest.GetVerbDefinition
import org.apache.camel.model.rest.PostVerbDefinition
import org.apache.camel.processor.FatalFallbackErrorHandler
@@ -36,10 +41,50 @@ import spock.lang.Specification
import javax.sql.DataSource
-class IntegrationTest extends Specification {
+class GroovySourceLoaderTest extends Specification {
@AutoCleanup
def runtime = new TestRuntime()
+ def "load routes"() {
+ given:
+ def source = Sources.fromURI("classpath:routes.groovy")
+
+ when:
+ def loader = RoutesConfigurer.load(runtime, source)
+
+ then:
+ loader instanceof GroovySourceLoader
+
+ with(runtime.getCamelContext(ModelCamelContext.class).routeDefinitions) {
+ it.size() == 1
+
+ it[0].outputs[0] instanceof ToDefinition
+ it[0].input.endpointUri == 'timer:tick'
+ }
+ }
+
+ def "load routes with endpoint dsl"() {
+ given:
+ def source = Sources.fromURI("classpath:routes-with-endpoint-dsl.groovy")
+
+ when:
+ def loader = RoutesConfigurer.load(runtime, source)
+
+ then:
+ loader instanceof GroovySourceLoader
+
+ with(runtime.getCamelContext(ModelCamelContext.class).routeDefinitions) {
+ it.size() == 1
+
+ with(it[0].input, FromDefinition) {
+ it.endpointUri == 'timer://tick?period=1s'
+ }
+ with(it[0].outputs[0], ToDefinition) {
+ it.endpointUri == 'log://info'
+ }
+ }
+ }
+
def "load integration with rest"() {
when:
runtime.loadRoutes('classpath:routes-with-rest.groovy')
@@ -183,4 +228,3 @@ class IntegrationTest extends Specification {
1 == 1
}
}
-
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy
deleted file mode 100644
index e11a5e2..0000000
--- a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy
+++ /dev/null
@@ -1,71 +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.k.loader.groovy
-
-
-import org.apache.camel.k.Sources
-import org.apache.camel.k.listener.RoutesConfigurer
-import org.apache.camel.k.loader.groovy.support.TestRuntime
-import org.apache.camel.model.FromDefinition
-import org.apache.camel.model.ModelCamelContext
-import org.apache.camel.model.ToDefinition
-import spock.lang.Specification
-
-class LoaderTest extends Specification {
-
- def "load routes"() {
- given:
- def runtime = new TestRuntime()
- def source = Sources.fromURI("classpath:routes.groovy")
-
- when:
- def loader = RoutesConfigurer.load(runtime, source)
-
- then:
- loader instanceof GroovySourceLoader
-
- with(runtime.getCamelContext(ModelCamelContext.class).routeDefinitions) {
- it.size() == 1
-
- it[0].outputs[0] instanceof ToDefinition
- it[0].input.endpointUri == 'timer:tick'
- }
- }
-
- def "load routes with endpoint dsl"() {
- given:
- def runtime = new TestRuntime()
- def source = Sources.fromURI("classpath:routes-with-endpoint-dsl.groovy")
-
- when:
- def loader = RoutesConfigurer.load(runtime, source)
-
- then:
- loader instanceof GroovySourceLoader
-
- with(runtime.getCamelContext(ModelCamelContext.class).routeDefinitions) {
- it.size() == 1
-
- with(it[0].input, FromDefinition) {
- it.endpointUri == 'timer://tick?period=1s'
- }
- with(it[0].outputs[0], ToDefinition) {
- it.endpointUri == 'log://info'
- }
- }
- }
-}
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/extension/ExpressionClauseExtensionTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensionTest.groovy
similarity index 98%
rename from camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/extension/ExpressionClauseExtensionTest.groovy
rename to camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensionTest.groovy
index 255ae90..b76f416 100644
--- a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/extension/ExpressionClauseExtensionTest.groovy
+++ b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensionTest.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.loader.groovy.dsl.extension
+package org.apache.camel.k.loader.groovy.extension
import org.apache.camel.impl.DefaultCamelContext
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/extension/LogExtensionTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/LogExtensionTest.groovy
similarity index 96%
rename from camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/extension/LogExtensionTest.groovy
rename to camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/LogExtensionTest.groovy
index a5a4b5e..3fa4580 100644
--- a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/extension/LogExtensionTest.groovy
+++ b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/LogExtensionTest.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.loader.groovy.dsl.extension
+package org.apache.camel.k.loader.groovy.extension
import org.apache.camel.component.log.LogComponent
import org.apache.camel.impl.DefaultCamelContext
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy
index 6db3a3f..40dfb03 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy
@@ -17,6 +17,7 @@
package org.apache.camel.k.loader.yaml
import org.apache.camel.impl.DefaultCamelContext
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ChoiceDefinition
import org.apache.camel.model.FilterDefinition
import org.apache.camel.model.SplitDefinition
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy
index 1f6ace9..f1cb5ae 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy
@@ -18,6 +18,7 @@ package org.apache.camel.k.loader.yaml
import org.apache.camel.component.mock.MockEndpoint
import org.apache.camel.k.loader.yaml.support.MyFailingProcessor
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy
import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy
index 1e7f2ea..751b928 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy
@@ -17,6 +17,7 @@
package org.apache.camel.k.loader.yaml
import org.apache.camel.component.direct.DirectEndpoint
+import org.apache.camel.k.loader.yaml.support.TestSupport
class RoutesWithPlaceholdersTest extends TestSupport {
def 'route'() {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy
index 289f946..16cd6dc 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.AggregateDefinition
import org.apache.camel.model.language.SimpleExpression
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy
index 30f1a19..073b891 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy
@@ -17,7 +17,7 @@
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.BeanDefinition
class BeanTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
index 474acdd..cf09d1b 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.k.loader.yaml.spi.StepParserException
import org.apache.camel.model.ChoiceDefinition
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy
index 5922f34..fb39bfa 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.CircuitBreakerDefinition
import org.apache.camel.model.ToDefinition
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
index a431337..2584885 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ClaimCheckDefinition
class ClaimCheckTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
index a5cfc8b..9183e7c 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ConvertBodyDefinition
class ConvertBodyTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
index 6670f4b..68d74b1 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.DelayDefinition
class DelayTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy
index fcd9c59..16da4d5 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.TryDefinition
class DoTryTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
index 623e809..2f58321 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.DynamicRouterDefinition
class DynamicRouterTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy
index c6f87b2..8c68bab 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.EnrichDefinition
class EnrichTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy
index 51f5ed4..fc41682 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy
@@ -20,7 +20,7 @@ import org.apache.camel.builder.DeadLetterChannelBuilder
import org.apache.camel.builder.DefaultErrorHandlerBuilder
import org.apache.camel.builder.ErrorHandlerBuilderRef
import org.apache.camel.builder.NoErrorHandlerBuilder
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.RouteDefinition
class ErrorHandlerTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
index 6e78d63..0612b3a 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.FilterDefinition
class FilterTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
index 49a9f86..168c124 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.k.loader.yaml.spi.StepParserException
import org.apache.camel.model.FromDefinition
import org.apache.camel.model.RouteDefinition
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy
index 277f2c3..645cf8a 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy
@@ -16,9 +16,8 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.IdempotentConsumerDefinition
-import org.apache.camel.model.SplitDefinition
class IdempotentConsumerTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy
index b5843d3..1ea6db3 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.LoadBalanceDefinition
import org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition
import org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
index eeb1e9f..b85fb5a 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
@@ -17,7 +17,7 @@
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.LogDefinition
class LogTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy
index dcae226..08fc660 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.LoopDefinition
class LoopTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
index fa2a160..7b736f2 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.MarshalDefinition
class MarshalTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy
index ec18c03..17b54a1 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.MulticastDefinition
class MulticastTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy
index 4f60916..9cef2da 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.OnExceptionDefinition
import org.apache.camel.model.ToDefinition
import org.apache.camel.model.language.ConstantExpression
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
index 68a11dd..fecfa32 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
@@ -17,7 +17,7 @@
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.k.loader.yaml.spi.StepParserException
import org.apache.camel.model.PipelineDefinition
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy
index 1e2b3dc..441fc5e 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.PollEnrichDefinition
class PollEnrichTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy
index ad8b3f9..13fec09 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ProcessDefinition
class ProcessTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RecipientListTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RecipientListTest.groovy
index a42b6da..fc17212 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RecipientListTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RecipientListTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.RecipientListDefinition
import org.apache.camel.model.language.ConstantExpression
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy
index 4e56e74..04ad2f0 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.RemoveHeaderDefinition
class RemoveHeaderTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy
index 7bedad6..0249730 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy
@@ -16,10 +16,10 @@
*/
package org.apache.camel.k.loader.yaml.parser
-
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.RemoveHeadersDefinition
-class RemoveHeadersTest extends org.apache.camel.k.loader.yaml.TestSupport {
+class RemoveHeadersTest extends TestSupport {
def "definition"() {
when:
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy
index 15193d5..ee11440 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy
@@ -16,10 +16,10 @@
*/
package org.apache.camel.k.loader.yaml.parser
-
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.RemovePropertiesDefinition
-class RemovePropertiesTest extends org.apache.camel.k.loader.yaml.TestSupport {
+class RemovePropertiesTest extends TestSupport {
def "definition"() {
given:
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy
index 6687f44..0a28793 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.RemovePropertyDefinition
class RemovePropertyTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ResequenceTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ResequenceTest.groovy
index 6f8d867..cbecf63 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ResequenceTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ResequenceTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ResequenceDefinition
import org.apache.camel.model.config.StreamResequencerConfig
import org.apache.camel.model.language.SimpleExpression
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy
index e175c5a..05ac26a 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.k.loader.yaml.spi.StepParserException
import org.apache.camel.model.RouteDefinition
import org.apache.camel.model.rest.GetVerbDefinition
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RollbackTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RollbackTest.groovy
index 71dc515..87c3243 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RollbackTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RollbackTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.RollbackDefinition
class RollbackTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RoutingSlipTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RoutingSlipTest.groovy
index 332a88c..92e0c88 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RoutingSlipTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RoutingSlipTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.RoutingSlipDefinition
import org.apache.camel.model.language.SimpleExpression
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SagaTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SagaTest.groovy
index 7a08b9f..017a21e 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SagaTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SagaTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.SagaDefinition
class SagaTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SampleTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SampleTest.groovy
index 643c21c..309acaf 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SampleTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SampleTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.SamplingDefinition
class SampleTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ScriptTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ScriptTest.groovy
index 2dfdcfb..7430eab 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ScriptTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ScriptTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ScriptDefinition
class ScriptTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ServiceCallTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ServiceCallTest.groovy
index 41ec88a..89aee0d 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ServiceCallTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ServiceCallTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.cloud.ServiceCallDefinition
import org.apache.camel.model.cloud.ServiceCallExpressionConfiguration
import org.apache.camel.model.language.ExpressionDefinition
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy
index a8bcb1f..4a8fff0 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.SetBodyDefinition
class SetBodyTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetExchangePatternTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetExchangePatternTest.groovy
index 9efb531..a48aa68 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetExchangePatternTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetExchangePatternTest.groovy
@@ -17,7 +17,7 @@
package org.apache.camel.k.loader.yaml.parser
import org.apache.camel.ExchangePattern
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.SetExchangePatternDefinition
class SetExchangePatternTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy
index 689e1e2..fe1ba26 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.SetHeaderDefinition
class SetHeaderTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy
index 66851e3..364c702 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.SetPropertyDefinition
class SetPropertyTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SortTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SortTest.groovy
index c3b5345..cb1e431 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SortTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SortTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.SortDefinition
class SortTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy
index 2e12fd4..806afd1 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.SplitDefinition
class SplitTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StepTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StepTest.groovy
index 17ee0dd..42f2259 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StepTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StepTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.k.loader.yaml.spi.StepParserException
import org.apache.camel.model.StepDefinition
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StopTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StopTest.groovy
index f89d68d..411c941 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StopTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StopTest.groovy
@@ -17,7 +17,7 @@
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.StopDefinition
class StopTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThreadsTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThreadsTest.groovy
index 0657c0a..1ba839f 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThreadsTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThreadsTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ThreadsDefinition
class ThreadsTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrottleTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrottleTest.groovy
index c5eccb8..187293e 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrottleTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrottleTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ThrottleDefinition
import org.apache.camel.model.language.ConstantExpression
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrowExceptionTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrowExceptionTest.groovy
index 1d1295c..6ebcdd8 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrowExceptionTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrowExceptionTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ThrowExceptionDefinition
class ThrowExceptionTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy
index c400f33..fdb1a66 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy
@@ -17,7 +17,7 @@
package org.apache.camel.k.loader.yaml.parser
import com.fasterxml.jackson.databind.node.TextNode
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ToDynamicDefinition
class ToDynamicTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy
index a60db22..e30a09e 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy
@@ -17,7 +17,7 @@
package org.apache.camel.k.loader.yaml.parser
import com.fasterxml.jackson.databind.node.TextNode
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ToDefinition
class ToTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/TransactedTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/TransactedTest.groovy
index ed60dfe..6cc6e2f 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/TransactedTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/TransactedTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.TransactedDefinition
class TransactedTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy
index b815931..36a4e20 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.UnmarshalDefinition
class UnmarshalTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ValidateTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ValidateTest.groovy
index 58f405e..9cd4eb1 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ValidateTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ValidateTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.ValidateDefinition
class ValidateTest extends TestSupport {
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/WireTapTest.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/WireTapTest.groovy
index d08429d..7407263 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/WireTapTest.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/WireTapTest.groovy
@@ -16,7 +16,7 @@
*/
package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
import org.apache.camel.model.WireTapDefinition
import org.apache.camel.model.language.ConstantExpression
import org.apache.camel.model.language.SimpleExpression
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/TestSupport.groovy b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestSupport.groovy
similarity index 97%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/TestSupport.groovy
rename to camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestSupport.groovy
index a6ce9d5..2781923 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/TestSupport.groovy
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestSupport.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.loader.yaml
+package org.apache.camel.k.loader.yaml.support
import com.fasterxml.jackson.databind.JsonNode
import groovy.util.logging.Slf4j
@@ -26,6 +26,8 @@ import org.apache.camel.impl.DefaultCamelContext
import org.apache.camel.k.Runtime
import org.apache.camel.k.Source
import org.apache.camel.k.Sources
+import org.apache.camel.k.loader.yaml.YamlSourceLoader
+import org.apache.camel.k.loader.yaml.YamlStepResolver
import org.apache.camel.k.loader.yaml.spi.ProcessorStepParser
import org.apache.camel.k.loader.yaml.spi.StartStepParser
import org.apache.camel.k.loader.yaml.spi.StepParser