From 3bbdd6ed493b5e6442da60da7738c38be2983289 Mon Sep 17 00:00:00 2001 From: JiriOndrusek Date: Thu, 3 Oct 2024 10:59:47 +0200 Subject: [PATCH] fixes #6492 - removed DoubleRoutesPerClassTest,because it is invalid scenario since Camel 4.9.0 --- .../DoubleRoutesPerClassTest.java | 63 ------------------- .../FirstPerClassET.java | 60 ------------------ .../RouteBuilderPerClass.java | 26 -------- .../SecondPerClassET.java | 60 ------------------ 4 files changed, 209 deletions(-) delete mode 100644 test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/DoubleRoutesPerClassTest.java delete mode 100644 test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/FirstPerClassET.java delete mode 100644 test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/RouteBuilderPerClass.java delete mode 100644 test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java diff --git a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/DoubleRoutesPerClassTest.java b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/DoubleRoutesPerClassTest.java deleted file mode 100644 index ec1dc7b29392..000000000000 --- a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/DoubleRoutesPerClassTest.java +++ /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.quarkus.test.extensions.doubeRouteBuilderPerClass; - -import java.util.function.Supplier; - -import io.quarkus.test.ContinuousTestingTestUtils; -import io.quarkus.test.QuarkusDevModeTest; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -/** - * Test for https://github.com/apache/camel-quarkus/issues/4560 - */ -@Disabled //https://github.com/apache/camel-quarkus/issues/6492 -public class DoubleRoutesPerClassTest { - - @RegisterExtension - static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(new Supplier<>() { - @Override - public JavaArchive get() { - return ShrinkWrap.create(JavaArchive.class).addClass(RouteBuilderPerClass.class) - .add(new StringAsset( - ContinuousTestingTestUtils.appProperties("#")), - "application.properties"); - } - }) - .setTestArchiveProducer(new Supplier<>() { - @Override - public JavaArchive get() { - return ShrinkWrap.create(JavaArchive.class).addClasses(FirstPerClassET.class, SecondPerClassET.class); - } - }); - - @Test - public void checkTests() { - ContinuousTestingTestUtils utils = new ContinuousTestingTestUtils(); - ContinuousTestingTestUtils.TestStatus ts = utils.waitForNextCompletion(); - - Assertions.assertEquals(0L, ts.getTestsFailed()); - Assertions.assertEquals(4L, ts.getTestsPassed()); - } -} diff --git a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/FirstPerClassET.java b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/FirstPerClassET.java deleted file mode 100644 index 759236ad4f49..000000000000 --- a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/FirstPerClassET.java +++ /dev/null @@ -1,60 +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.quarkus.test.extensions.doubeRouteBuilderPerClass; - -import io.quarkus.test.junit.QuarkusTest; -import org.apache.camel.RoutesBuilder; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; - -@QuarkusTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class FirstPerClassET extends CamelQuarkusTestSupport { - - @Override - protected RoutesBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from("direct:startTest").to("direct:start").to("mock:result"); - } - }; - } - - @Test - public void someTestA() throws InterruptedException { - MockEndpoint mockEndpoint = getMockEndpoint("mock:result"); - mockEndpoint.expectedBodiesReceived("Some Value"); - - template.sendBody("direct:startTest", null); - - mockEndpoint.assertIsSatisfied(); - } - - @Test - public void someTestB() throws InterruptedException { - MockEndpoint mockEndpoint = getMockEndpoint("mock:result"); - mockEndpoint.expectedBodiesReceived("Some Value"); - - template.sendBody("direct:startTest", null); - - mockEndpoint.assertIsSatisfied(); - } -} diff --git a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/RouteBuilderPerClass.java b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/RouteBuilderPerClass.java deleted file mode 100644 index a33b1d2b3ea7..000000000000 --- a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/RouteBuilderPerClass.java +++ /dev/null @@ -1,26 +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.quarkus.test.extensions.doubeRouteBuilderPerClass; - -public class RouteBuilderPerClass extends org.apache.camel.builder.RouteBuilder { - @Override - public void configure() throws Exception { - from("direct:start").setBody(constant("Some Value")).log("The body is: ${body}"); - - from("timer:timeToAct?period=5000").routeId("TimerRoute").log("Calling direct:start").to("direct:start"); - } -} diff --git a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java deleted file mode 100644 index 5b58726702c0..000000000000 --- a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java +++ /dev/null @@ -1,60 +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.quarkus.test.extensions.doubeRouteBuilderPerClass; - -import io.quarkus.test.junit.QuarkusTest; -import org.apache.camel.RoutesBuilder; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; - -@QuarkusTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class SecondPerClassET extends CamelQuarkusTestSupport { - - @Override - protected RoutesBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from("direct:startTest2").to("direct:start").to("mock:result"); - } - }; - } - - @Test - public void someTestC() throws InterruptedException { - MockEndpoint mockEndpoint = getMockEndpoint("mock:result"); - mockEndpoint.expectedBodiesReceived("Some Value"); - - template.sendBody("direct:startTest2", null); - - mockEndpoint.assertIsSatisfied(); - } - - @Test - public void someTestD() throws InterruptedException { - MockEndpoint mockEndpoint = getMockEndpoint("mock:result"); - mockEndpoint.expectedBodiesReceived("Some Value"); - - template.sendBody("direct:startTest", null); - - mockEndpoint.assertIsSatisfied(); - } -}