CAMEL-21080: more interface pre-work to simplifying migration of the test code

components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java

@@ -52,7 +52,7 @@
  * testing.
  */
 public abstract class CamelTestSupport extends AbstractTestSupport
-        implements BeforeTestExecutionCallback, AfterTestExecutionCallback, ConfigurableTest, ConfigurableContext {
+        implements BeforeTestExecutionCallback, AfterTestExecutionCallback {
     private static final Logger LOG = LoggerFactory.getLogger(CamelTestSupport.class);
 
     @RegisterExtension

components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CommonTestSupport.java

@@ -17,24 +17,9 @@
 
 package org.apache.camel.test.junit5;
 
-import org.apache.camel.CamelContext;
-
 /**
  * A common interface for tests that use the CamelContext.
  */
-public interface CommonTestSupport {
-
-    /**
-     * Gets the {@link CamelContextConfiguration} for the test
-     *
-     * @return the camel context configuration
-     */
-    CamelContextConfiguration camelContextConfiguration();
+public interface CommonTestSupport extends ConfigurableTest, ConfigurableContext {
 
-    /**
-     * Gets the {@link TestExecutionConfiguration} test execution configuration instance for the test
-     *
-     * @return the configuration instance for the test
-     */
-    TestExecutionConfiguration testConfiguration();
 }

components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/ConfigurableContext.java

@@ -27,4 +27,11 @@ public interface ConfigurableContext {
      * @param camelContextConfiguration
      */
     void configureContext(CamelContextConfiguration camelContextConfiguration);
+
+    /**
+     * Gets the {@link CamelContextConfiguration} for the test
+     *
+     * @return the camel context configuration
+     */
+    CamelContextConfiguration camelContextConfiguration();
 }

components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/ConfigurableTest.java

@@ -27,4 +27,11 @@ public interface ConfigurableTest {
      * @param testExecutionConfiguration
      */
     void configureTest(TestExecutionConfiguration testExecutionConfiguration);
+
+    /**
+     * Gets the {@link TestExecutionConfiguration} test execution configuration instance for the test
+     *
+     * @return the configuration instance for the test
+     */
+    TestExecutionConfiguration testConfiguration();
 }