From edb0176b1f3a53ea921765112ab91703da8af054 Mon Sep 17 00:00:00 2001 From: Christoph Deppisch Date: Tue, 24 Oct 2023 20:27:19 +0200 Subject: [PATCH] chore: Remove deprecated code - Remove deprecated CitrusXmlTest annotation in favor of using CitrusTestSource annotation - Remove SleepAction time expression setter - Remove HtmlReporter setOutputDirectory() in favor of using setReportDirectory() - Remove Selenium browserType setting - Remove MessageConstructionInterceptor in favor of using org.citrusframework.message.MessageTransformer --- .../docker/integration/DockerExecuteIT.java | 5 +- .../integration/KubernetesCreateIT.java | 5 +- .../integration/KubernetesExecuteIT.java | 5 +- .../integration/KubernetesSendReceiveIT.java | 5 +- .../annotation/SeleniumBrowserConfig.java | 8 -- .../SeleniumBrowserConfigParser.java | 4 - .../config/xml/SeleniumBrowserParser.java | 3 +- .../endpoint/SeleniumBrowserBuilder.java | 11 --- .../citrus-selenium-config-4.0.0-SNAPSHOT.xsd | 1 - .../schema/citrus-selenium-config.xsd | 1 - .../SeleniumBrowserConfigParserTest.java | 10 +-- .../config/xml/SeleniumBrowserParserTest.java | 4 +- .../selenium/integration/SeleniumIT.java | 5 +- .../xml/SeleniumBrowserParserTest-context.xml | 6 +- .../integration/actions/ExecutePLSQLIT.java | 5 +- .../integration/actions/ExecuteSQLIT.java | 5 +- .../actions/ExecuteSQLTransactionIT.java | 5 +- .../integration/actions/FinallyBlockIT.java | 5 +- .../actions/QueryDatabaseRetriesIT.java | 5 +- .../annotations/CitrusXmlTest.java | 46 ---------- .../MessageConstructionInterceptor.java | 48 ---------- .../citrusframework/actions/SleepAction.java | 9 -- .../citrusframework/report/HtmlReporter.java | 11 --- ...bstractMessageConstructionInterceptor.java | 88 ------------------- ...actMessageConstructionInterceptorTest.java | 59 ------------- .../integration/CamelEndpointExceptionIT.java | 5 +- .../integration/CamelEndpointFactoryIT.java | 5 +- .../camel/integration/CamelEndpointIT.java | 5 +- .../integration/CamelRouteDefinitionIT.java | 5 +- .../integration/CamelSyncEndpointIT.java | 5 +- .../ftp/client/ScpClientBuilder.java | 2 - .../ftp/integration/FtpClientServerIT.java | 5 +- .../ftp/integration/FtpDynamicEndpointIT.java | 5 +- .../ftp/integration/FtpFileActionIT.java | 5 +- .../ftp/integration/FtpLoginIT.java | 5 +- .../http/integration/FormUrlEncodedIT.java | 9 +- .../http/integration/HttpClientIT.java | 5 +- .../integration/HttpClientTemplateIT.java | 5 +- .../http/integration/HttpClientTimeoutIT.java | 5 +- .../integration/HttpEndpointFactoryIT.java | 5 +- .../integration/HttpFormUrlEncodedIT.java | 5 +- .../http/integration/HttpGzipEncodedIT.java | 5 +- .../http/integration/HttpHandleCookiesIT.java | 5 +- .../HttpJsonSchemaValidationIT.java | 5 +- .../integration/HttpMessageControllerIT.java | 5 +- ...HttpSendMessageJsonSchemaValidationIT.java | 8 +- .../http/integration/HttpServerIT.java | 13 +-- .../http/integration/HttpServerJmsIT.java | 5 +- .../jms/integration/JmsByteMessageIT.java | 5 +- .../jms/integration/JmsCommunicationIT.java | 5 +- .../jms/integration/JmsEndpointFactoryIT.java | 5 +- .../jms/integration/JmsEndpointIT.java | 5 +- .../jms/integration/JmsGzipMessageIT.java | 5 +- .../jms/integration/JmsMessageHeadersIT.java | 5 +- .../jms/integration/JmsSendReceiveIT.java | 5 +- .../jms/integration/JmsSoapIT.java | 5 +- .../jms/integration/JmsSyncEndpointIT.java | 5 +- .../jms/integration/JmsSyncSendReceiveIT.java | 5 +- .../jms/integration/JmsTopic2IT.java | 5 +- .../JmsTopicDurableSubscriberIT.java | 5 +- .../jms/integration/JmsTopicIT.java | 5 +- .../jms/integration/JmsTopicSubscriberIT.java | 5 +- .../jms/integration/PurgeJmsQueuesIT.java | 5 +- .../jms/integration/ReceiveTimeoutIT.java | 5 +- .../jms/integration/SendReplyToIT.java | 5 +- .../integration/SyncJmsCommunicationIT.java | 5 +- .../SyncJmsTopicCommunicationIT.java | 5 +- .../jms/integration/TemplateAdvancedIT.java | 5 +- .../jmx/integration/JmxClientIT.java | 5 +- .../jmx/integration/JmxDynamicEndpointIT.java | 5 +- .../jmx/integration/JmxServerIT.java | 5 +- .../integration/KafkaEndpointFactoryIT.java | 5 +- .../kafka/integration/KafkaEndpointIT.java | 5 +- .../integration/KafkaMessageHeadersIT.java | 5 +- .../mail/integration/MailMultipartIT.java | 5 +- .../mail/integration/MailSendReceiveIT.java | 5 +- .../mail/integration/MailServerAcceptIT.java | 5 +- .../mail/integration/MailServerErrorIT.java | 5 +- .../mail/integration/MailServerIT.java | 5 +- .../rmi/integration/RmiDynamicEndpointIT.java | 5 +- .../rmi/integration/RmiEndpointIT.java | 7 +- .../integration/MessageChannelIT.java | 5 +- .../channel/ChannelEndpointFactoryIT.java | 5 +- .../channel/ChannelEndpointIT.java | 5 +- .../channel/ChannelSyncEndpointIT.java | 5 +- .../common/SpringXmlTestLoaderIT.java | 5 +- .../ssh/integration/SshServerErrorIT.java | 5 +- .../ssh/integration/SshServerIT.java | 5 +- .../vertx/integration/VertxEndpointIT.java | 5 +- .../integration/VertxSyncEndpointIT.java | 5 +- .../integration/WebSocketEndpointIT.java | 7 +- .../ws/integration/AssertSoapFaultIT.java | 5 +- .../ws/integration/EmptySoapResponseIT.java | 5 +- .../ws/integration/PropagateSoapFaultIT.java | 5 +- .../SendSoapMessageWithAttachmentIT.java | 9 +- ...SendSoapMessageWithSchemaValidationIT.java | 8 +- .../ws/integration/ServerSoapFaultIT.java | 5 +- .../ws/integration/SoapForkModeIT.java | 5 +- .../ws/integration/SoapHeaderFragmentIT.java | 5 +- .../SoapHttpAttributeHeaderIT.java | 5 +- .../ws/integration/SoapHttpErrorIT.java | 5 +- .../ws/integration/SoapMimeHeaderIT.java | 5 +- .../integration/SoapMultipleAttachmentIT.java | 5 +- .../SoapMultipleHeaderFragmentIT.java | 5 +- .../integration/SoapSchemaValidationIT.java | 7 +- .../ws/integration/SoapWsdlRequestIT.java | 5 +- .../ws/integration/WebServiceClientIT.java | 5 +- .../WebServiceEndpointFactoryIT.java | 5 +- .../ws/integration/WebServiceServerIT.java | 13 +-- .../ws/integration/WsAddressingIT.java | 5 +- .../zookeeper/integration/ZooExecuteIT.java | 5 +- .../actions/CreateVariablesIT.java | 5 +- .../integration/actions/LoadPropertiesIT.java | 5 +- .../integration/container/IterateIT.java | 5 +- .../container/ParallelFailureIT.java | 5 +- .../container/TemplateVariablesIT.java | 5 +- .../integration/script/GroovyActionIT.java | 5 +- .../variables/GlobalVariablesIT.java | 5 +- .../junit/CitrusJUnit4Runner.java | 7 -- .../junit/JUnit4CitrusSupport.java | 5 +- .../spring/CitrusSpringJUnit4Runner.java | 7 -- .../spring/JUnit4CitrusSpringSupport.java | 14 +-- .../junit/integration/JUnit4SpringXmlIT.java | 15 ++-- .../integration/SpringXmlTestLoaderIT.java | 5 +- .../junit/jupiter/CitrusExtensionHelper.java | 15 +--- .../integration/spring/SpringBeanXml_IT.java | 7 +- .../spring/SpringXmlTestLoader_IT.java | 5 +- .../testng/TestNGCitrusMethodInterceptor.java | 4 - .../testng/TestNGCitrusSupport.java | 7 -- .../citrusframework/testng/TestNGHelper.java | 7 +- .../TestNGCitrusSpringMethodInterceptor.java | 33 ------- .../spring/TestNGCitrusSpringSupport.java | 77 ++++++---------- .../integration/FailTestNgIT.java | 5 +- .../integration/actions/AntRunActionIT.java | 5 +- .../actions/CreateVariablesIT.java | 5 +- .../integration/actions/EchoActionIT.java | 5 +- .../integration/actions/FailActionIT.java | 5 +- .../actions/GlobalPropertiesIT.java | 5 +- .../integration/actions/InputActionIT.java | 5 +- .../integration/actions/JavaActionIT.java | 5 +- .../integration/actions/LoadPropertiesIT.java | 5 +- .../integration/actions/SleepActionIT.java | 5 +- .../actions/StartStopServerActionIT.java | 5 +- .../integration/actions/StopTimeIT.java | 5 +- .../actions/TransformActionIT.java | 5 +- .../annotation/CitrusXmlAnnotationIT.java | 11 +-- .../integration/annotation/SampleIT.java | 5 +- .../integration/container/AssertIT.java | 5 +- .../integration/container/AsyncFailIT.java | 5 +- .../integration/container/AsyncIT.java | 5 +- .../integration/container/CatchIT.java | 5 +- .../integration/container/ConditionalIT.java | 5 +- .../integration/container/IterateIT.java | 5 +- .../integration/container/ParallelIT.java | 5 +- .../container/RepeatOnErrorIT.java | 5 +- .../container/RepeatUntilTrueIT.java | 5 +- .../integration/container/SequentialIT.java | 5 +- .../integration/container/TemplateIT.java | 5 +- .../integration/container/TimerIT.java | 5 +- .../container/TimerParallelIT.java | 5 +- .../integration/container/WaitIT.java | 5 +- .../functions/ConcatFunctionIT.java | 5 +- .../functions/CustomFunctionIT.java | 5 +- .../integration/functions/FunctionsIT.java | 5 +- .../integration/parameter/DataProviderIT.java | 7 +- .../integration/parameter/ParameterIT.java | 5 +- .../DateRangeValidationMatcherIT.java | 5 +- .../variables/GlobalVariablesIT.java | 5 +- .../variables/VariablesOrderIT.java | 5 +- src/manual/endpoint-selenium.adoc | 2 +- src/manual/validation-xml.adoc | 2 +- .../src/test/java/HelloService_Ok_IT.java | 5 +- .../src/test/java/SampleXmlIT.java | 5 +- .../src/test/java/HelloService_Ok_IT.java | 5 +- .../restdocs/integration/HttpRestDocsIT.java | 5 +- .../restdocs/integration/SoapRestDocsIT.java | 5 +- .../generate/javadsl/JavaTestGenerator.java | 19 ++-- .../integration/JsonGroovyValidationIT.java | 5 +- .../ScriptMessageValidationIT.java | 5 +- .../integration/ValidateSqlResultSetIT.java | 5 +- .../integration/ConditionalIT.java | 5 +- .../HamcrestValidationMatcherIT.java | 5 +- .../integration/IterateIT.java | 5 +- .../integration/RepeatOnErrorIT.java | 5 +- .../integration/RepeatUntilTrueIT.java | 5 +- .../HamcrestValidationMatcherIT.java | 5 +- .../JsonPathSegmentVariableExtractorIT.java | 5 +- .../integration/JsonPathValidationIT.java | 5 +- .../integration/JsonTextValidationIT.java | 5 +- .../integration/MessageValidationIT.java | 5 +- .../integration/MessageValidationIT.java | 5 +- .../integration/PlainTextValidationIT.java | 5 +- .../integration/DataDictionaryIT.java | 5 +- .../HamcrestValidationMatcherIT.java | 5 +- .../integration/InlineVariablesIT.java | 5 +- .../integration/MessageValidationIT.java | 5 +- .../integration/ScriptVariablesIT.java | 5 +- .../integration/UseVariablesIT.java | 5 +- .../integration/UseXPathVariablesIT.java | 5 +- .../integration/ValidateNamespacesIT.java | 5 +- .../integration/ValidateValuesIT.java | 5 +- .../ValidateValuesWithNamespaceIT.java | 5 +- .../integration/ValidateXMLDataIT.java | 5 +- .../integration/ValidateXmlCombinedIT.java | 5 +- .../integration/XMLValidationMatcherIT.java | 5 +- .../XpathSegmentVariableExtractorIT.java | 5 +- .../integration/functions/XmlFunctionsIT.java | 5 +- 207 files changed, 615 insertions(+), 841 deletions(-) delete mode 100644 core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusXmlTest.java delete mode 100644 core/citrus-api/src/main/java/org/citrusframework/validation/interceptor/MessageConstructionInterceptor.java delete mode 100644 core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/AbstractMessageConstructionInterceptor.java delete mode 100644 core/citrus-base/src/test/java/org/citrusframework/validation/interceptor/AbstractMessageConstructionInterceptorTest.java diff --git a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/DockerExecuteIT.java b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/DockerExecuteIT.java index faff646ba8..1ccf3e5b73 100644 --- a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/DockerExecuteIT.java +++ b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/DockerExecuteIT.java @@ -16,7 +16,8 @@ package org.citrusframework.docker.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.testng.annotations.Test; /** @@ -28,6 +29,6 @@ @Test public class DockerExecuteIT extends AbstractDockerIT { - @CitrusXmlTest(name = "DockerExecuteIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "DockerExecuteIT") public void dockerInfoTest() {} } diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesCreateIT.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesCreateIT.java index 1cf9a697c9..76da0fe448 100644 --- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesCreateIT.java +++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesCreateIT.java @@ -16,7 +16,8 @@ package org.citrusframework.kubernetes.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.testng.annotations.Test; /** @@ -28,7 +29,7 @@ @Test public class KubernetesCreateIT extends AbstractKubernetesIT { - @CitrusXmlTest(name = "KubernetesCreateIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "KubernetesCreateIT") public void kubernetesCreateIT() { } } diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.java index b647bead37..f9b052515e 100644 --- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.java +++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.java @@ -16,7 +16,8 @@ package org.citrusframework.kubernetes.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.testng.annotations.Test; /** @@ -28,7 +29,7 @@ @Test public class KubernetesExecuteIT extends AbstractKubernetesIT { - @CitrusXmlTest(name = "KubernetesExecuteIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "KubernetesExecuteIT") public void kubernetesExecuteIT() { } } diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.java index 7378fe5dac..be4756fa97 100644 --- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.java +++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.java @@ -16,7 +16,8 @@ package org.citrusframework.kubernetes.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.testng.annotations.Test; /** @@ -28,7 +29,7 @@ @Test public class KubernetesSendReceiveIT extends AbstractKubernetesIT { - @CitrusXmlTest(name = "KubernetesSendReceiveIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "KubernetesSendReceiveIT") public void kubernetesSendReceiveIT() { } } diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfig.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfig.java index 283294037c..f2c654efe7 100644 --- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfig.java +++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfig.java @@ -62,14 +62,6 @@ */ String webDriver() default ""; - /** - * Browser type - * @return - * @deprecated in favor of {@link #type()} - */ - @Deprecated - String browserType() default ""; - /** * Browser type * @return diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParser.java index 63cd256a85..ceb7a00e5d 100644 --- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParser.java +++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParser.java @@ -51,10 +51,6 @@ public SeleniumBrowser parse(SeleniumBrowserConfig annotation, ReferenceResolver builder.type(annotation.type()); } - if (StringUtils.hasText(annotation.browserType())) { - builder.browserType(annotation.browserType()); - } - if (StringUtils.hasText(annotation.webDriver())) { builder.webDriver(referenceResolver.resolve(annotation.webDriver(), WebDriver.class)); } diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParser.java index 972efbae86..e6f509c26a 100644 --- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParser.java +++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParser.java @@ -28,7 +28,7 @@ /** * Bean definition parser for selenium browser instance. - * + * * @author Tamer Erdogan, Christoph Deppisch * @since 2.7 */ @@ -38,7 +38,6 @@ public class SeleniumBrowserParser extends AbstractEndpointParser { protected void parseEndpointConfiguration(BeanDefinitionBuilder endpointConfiguration, Element element, ParserContext parserContext) { super.parseEndpointConfiguration(endpointConfiguration, element, parserContext); - BeanDefinitionParserUtils.setPropertyValue(endpointConfiguration, element.getAttribute("browser-type"), "browserType"); BeanDefinitionParserUtils.setPropertyValue(endpointConfiguration, element.getAttribute("type"), "browserType"); BeanDefinitionParserUtils.setPropertyValue(endpointConfiguration, element.getAttribute("version"), "version"); BeanDefinitionParserUtils.setPropertyValue(endpointConfiguration, element.getAttribute("start-page"), "startPageUrl"); diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserBuilder.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserBuilder.java index fa17f5e9cf..2a6272240e 100644 --- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserBuilder.java +++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserBuilder.java @@ -37,17 +37,6 @@ protected SeleniumBrowser getEndpoint() { return endpoint; } - /** - * Sets the browser type. - * @param type - * @return - * @deprecated in favor of {@link #type(String)} - */ - @Deprecated - public SeleniumBrowserBuilder browserType(String type) { - return this.type(type); - } - /** * Sets the browser type. * @param type diff --git a/connectors/citrus-selenium/src/main/resources/org/citrusframework/schema/citrus-selenium-config-4.0.0-SNAPSHOT.xsd b/connectors/citrus-selenium/src/main/resources/org/citrusframework/schema/citrus-selenium-config-4.0.0-SNAPSHOT.xsd index 2228beeb3a..7e3f6ad362 100644 --- a/connectors/citrus-selenium/src/main/resources/org/citrusframework/schema/citrus-selenium-config-4.0.0-SNAPSHOT.xsd +++ b/connectors/citrus-selenium/src/main/resources/org/citrusframework/schema/citrus-selenium-config-4.0.0-SNAPSHOT.xsd @@ -26,7 +26,6 @@ - diff --git a/connectors/citrus-selenium/src/main/resources/org/citrusframework/schema/citrus-selenium-config.xsd b/connectors/citrus-selenium/src/main/resources/org/citrusframework/schema/citrus-selenium-config.xsd index 2228beeb3a..7e3f6ad362 100644 --- a/connectors/citrus-selenium/src/main/resources/org/citrusframework/schema/citrus-selenium-config.xsd +++ b/connectors/citrus-selenium/src/main/resources/org/citrusframework/schema/citrus-selenium-config.xsd @@ -26,7 +26,6 @@ - diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParserTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParserTest.java index 03d715b3d8..5296750a3e 100644 --- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParserTest.java +++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParserTest.java @@ -69,8 +69,8 @@ public class SeleniumBrowserConfigParserTest extends AbstractTestNGUnitTest { private SeleniumBrowser browser3; @CitrusEndpoint - @SeleniumBrowserConfig(browserType="htmlunit") - private SeleniumBrowser browserWithDeprecatedConfig; + @SeleniumBrowserConfig(type="htmlunit") + private SeleniumBrowser browser4; @Mock private ReferenceResolver referenceResolver; @@ -137,11 +137,11 @@ public void parseBrowserConfig_remoteBrowserConfig_shouldParseConfigurationSucce } @Test - public void parseBrowserConfig_browserUsingDeprecatedConfig_shouldParseConfigurationSuccessfully() { + public void parseBrowserConfig_htmlUnitBrowserConfig_shouldParseConfigurationSuccessfully() { CitrusAnnotations.injectEndpoints(this, context); - Assert.assertNotNull(browserWithDeprecatedConfig); - Assert.assertEquals(browserWithDeprecatedConfig.getEndpointConfiguration().getBrowserType(), Browser.HTMLUNIT.browserName()); + Assert.assertNotNull(browser4); + Assert.assertEquals(browser4.getEndpointConfiguration().getBrowserType(), Browser.HTMLUNIT.browserName()); } @Test diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest.java index d89410ccbe..84b318874e 100644 --- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest.java +++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest.java @@ -41,7 +41,7 @@ public void parseBrowserConfig_multipleBrowsersConfigured_shouldDetectAllBrowser public void parseBrowserConfig_htmlUnitBrowserConfigured_shouldParseConfigurationSuccessfully() { Map browsers = beanDefinitionContext.getBeansOfType(SeleniumBrowser.class); - SeleniumBrowser browser = browsers.get("htmlUnitBrowser"); + SeleniumBrowser browser = browsers.get("defaultBrowser"); Assert.assertEquals(browser.getEndpointConfiguration().getBrowserType(), Browser.HTMLUNIT.browserName()); Assert.assertNull(browser.getEndpointConfiguration().getStartPageUrl()); Assert.assertTrue(browser.getEndpointConfiguration().getEventListeners().isEmpty()); @@ -81,7 +81,7 @@ public void parseBrowserConfig_remoteBrowserConfigured_shouldParseConfigurationS public void parseBrowserConfig_browserUsingDeprecatedConfig_shouldParseConfigurationSuccessfully() { Map browsers = beanDefinitionContext.getBeansOfType(SeleniumBrowser.class); - SeleniumBrowser browser = browsers.get("browserUsingDeprecatedConfiguration"); + SeleniumBrowser browser = browsers.get("htmlUnitBrowser"); Assert.assertEquals(browser.getEndpointConfiguration().getBrowserType(), Browser.HTMLUNIT.browserName()); } } diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/integration/SeleniumIT.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/integration/SeleniumIT.java index 36c85386aa..f95ae2ac05 100644 --- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/integration/SeleniumIT.java +++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/integration/SeleniumIT.java @@ -16,7 +16,8 @@ package org.citrusframework.selenium.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,7 +28,7 @@ public class SeleniumIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SeleniumIT() { } } diff --git a/connectors/citrus-selenium/src/test/resources/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest-context.xml b/connectors/citrus-selenium/src/test/resources/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest-context.xml index 0c9986dba9..ed8de3c309 100644 --- a/connectors/citrus-selenium/src/test/resources/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest-context.xml +++ b/connectors/citrus-selenium/src/test/resources/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest-context.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd http://www.citrusframework.org/schema/selenium/config http://www.citrusframework.org/schema/selenium/config/citrus-selenium-config.xsd"> - + - + diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLIT.java index 8ecbad3d99..c8b8195097 100644 --- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLIT.java +++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ExecutePLSQLIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ExecutePLSQLIT() {} } diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLIT.java index bea1e435fd..48d9e8aea4 100644 --- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLIT.java +++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ExecuteSQLIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ExecuteSQLIT() {} } diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLTransactionIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLTransactionIT.java index d6703f327e..be413b33d9 100644 --- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLTransactionIT.java +++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLTransactionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ExecuteSQLTransactionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ExecuteSQLTransactionIT() {} } diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockIT.java index 3c261688ad..8a7a5ce602 100644 --- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockIT.java +++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class FinallyBlockIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void FinallyBlockIT() {} } diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesIT.java index 9e786576e6..40b442a923 100644 --- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesIT.java +++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class QueryDatabaseRetriesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void QueryDatabaseRetriesIT() {} } diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusXmlTest.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusXmlTest.java deleted file mode 100644 index c2aa9ff03c..0000000000 --- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusXmlTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2006-2018 the original author or authors. - * - * Licensed 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.citrusframework.annotations; - -import java.lang.annotation.*; - -/** - * Citrus test case annotation used for XML test case definition inside a unit test class. - * Each method annotated with this annotation will result in a separate test execution. - * - * @deprecated in favor of using generic {@link CitrusTestSource} annotation - * @author Christoph Deppisch - * @since 1.3.1 - */ -@Deprecated -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface CitrusXmlTest { - - /** Test name optional - by default method name is used as test name */ - String[] name() default {}; - - /** Test package name optional - by default package of declaring test class is used */ - String packageName() default ""; - - /** Test packages to scan for XML test case definitions */ - String[] packageScan() default {}; - - /** Test sources optional list of file resources to load */ - String[] sources() default {}; - -} diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/interceptor/MessageConstructionInterceptor.java b/core/citrus-api/src/main/java/org/citrusframework/validation/interceptor/MessageConstructionInterceptor.java deleted file mode 100644 index 200e2bb467..0000000000 --- a/core/citrus-api/src/main/java/org/citrusframework/validation/interceptor/MessageConstructionInterceptor.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2006-2010 the original author or authors. - * - * Licensed 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.citrusframework.validation.interceptor; - -import org.citrusframework.context.TestContext; -import org.citrusframework.message.Message; -import org.citrusframework.message.MessageDirectionAware; -import org.citrusframework.message.MessageTransformer; -import org.citrusframework.message.MessageTypeSelector; - - -/** - * Implementing classes may intercept the message payload constructing mechanism in order - * to modify the message content. - * - * @author Christoph Deppisch - * @deprecated since 3.0 in favor of using {@link org.citrusframework.message.MessageTransformer} - */ -@Deprecated -public interface MessageConstructionInterceptor extends MessageTransformer, MessageDirectionAware, MessageTypeSelector { - - @Override - default Message transform(Message message, TestContext context) { - return interceptMessageConstruction(message, message.getType(), context); - } - - /** - * Intercept the message construction. - * @param message the message to be modified. - * @param messageType the message type. - * @param context the current test context. - */ - Message interceptMessageConstruction(Message message, String messageType, TestContext context); -} diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java index dfb338445e..09b3ae3a5a 100644 --- a/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java +++ b/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java @@ -147,15 +147,6 @@ public Builder time(Duration duration) { return this; } - /** - * @deprecated in favor of using {@link #milliseconds(String)} - */ - @Deprecated - public Builder time(String expression) { - time(expression, TimeUnit.MILLISECONDS); - return this; - } - public Builder time(String expression, TimeUnit timeUnit) { time = expression; this.timeUnit = timeUnit; diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporter.java b/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporter.java index 015a5fda96..88c6dda370 100644 --- a/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporter.java +++ b/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporter.java @@ -275,17 +275,6 @@ public void setLogo(String logo) { this.logo = logo; } - /** - * Sets the outputDirectory property. - * - * @param outputDirectory - * @deprecated in favor of using {@link AbstractTestReporter#setReportDirectory}. - */ - @Deprecated - public void setOutputDirectory(String outputDirectory) { - setReportDirectory(outputDirectory); - } - @Override public String getReportDirectory() { if (StringUtils.hasText(outputDirectory)) { diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/AbstractMessageConstructionInterceptor.java b/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/AbstractMessageConstructionInterceptor.java deleted file mode 100644 index 80dd1dcaad..0000000000 --- a/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/AbstractMessageConstructionInterceptor.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2006-2013 the original author or authors. - * - * Licensed 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.citrusframework.validation.interceptor; - -import org.citrusframework.context.TestContext; -import org.citrusframework.message.Message; -import org.citrusframework.message.MessageDirection; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Abstract message construction interceptor reads message payload and headers for separate interceptor methods. - * Subclasses can either do payload modifying or header modifying or both depending on which method is overwritten. - * - * @author Christoph Deppisch - * @since 1.4 - * @deprecated since 3.0 in favor of using {@link org.citrusframework.message.AbstractMessageProcessor} - */ -@Deprecated -public abstract class AbstractMessageConstructionInterceptor implements MessageConstructionInterceptor { - - /** Logger */ - private final Logger logger = LoggerFactory.getLogger(getClass()); - - /** Inbound/Outbound direction */ - private MessageDirection direction = MessageDirection.UNBOUND; - - @Override - public Message interceptMessageConstruction(Message message, String messageType, TestContext context) { - if (supportsMessageType(messageType)) { - return interceptMessage(message, messageType, context); - } else { - logger.debug(String.format("Message interceptor type '%s' skipped for message type: %s", getName(), messageType)); - return message; - } - } - - /** - * Gets this interceptors name. - * @return - */ - protected String getName() { - return getClass().getSimpleName(); - } - - /** - * Intercept the message construction. Subclasses may overwrite this method and modify message payload. - * @param message the payload - * @param messageType - * @param context the current test context - */ - protected Message interceptMessage(Message message, String messageType, TestContext context) { - return message; - } - - /** - * Gets the direction. - * - * @return - */ - @Override - public MessageDirection getDirection() { - return direction; - } - - /** - * Sets the direction. - * - * @param direction - */ - public void setDirection(MessageDirection direction) { - this.direction = direction; - } -} diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/interceptor/AbstractMessageConstructionInterceptorTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/interceptor/AbstractMessageConstructionInterceptorTest.java deleted file mode 100644 index 763f6b1e97..0000000000 --- a/core/citrus-base/src/test/java/org/citrusframework/validation/interceptor/AbstractMessageConstructionInterceptorTest.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2006-2015 the original author or authors. - * - * Licensed 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.citrusframework.validation.interceptor; - -import org.citrusframework.UnitTestSupport; -import org.citrusframework.context.TestContext; -import org.citrusframework.message.DefaultMessage; -import org.citrusframework.message.Message; -import org.citrusframework.message.MessageType; -import org.testng.Assert; -import org.testng.annotations.Test; - -/** - * @author Christoph Deppisch - */ -@Deprecated -public class AbstractMessageConstructionInterceptorTest extends UnitTestSupport { - - @Test - public void testInterceptMessageConstruction() throws Exception { - MessageConstructionInterceptor interceptor = new AbstractMessageConstructionInterceptor() { - @Override - public boolean supportsMessageType(String messageType) { - return MessageType.XML.toString().equalsIgnoreCase(messageType); - } - - @Override - protected Message interceptMessage(Message message, String messageType, TestContext context) { - return new DefaultMessage("Intercepted!"); - } - - @Override - protected String getName() { - return "MockInterceptor"; - } - }; - - Message in = new DefaultMessage("Hello Citrus!"); - Message intercepted = interceptor.interceptMessageConstruction(in, MessageType.XML.toString(), context); - Assert.assertEquals(intercepted.getPayload(String.class), "Intercepted!"); - - intercepted = interceptor.interceptMessageConstruction(in, MessageType.PLAINTEXT.toString(), context); - Assert.assertEquals(intercepted.getPayload(String.class), "Hello Citrus!"); - } -} diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointExceptionIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointExceptionIT.java index 169d1995c8..bab6a8fd33 100644 --- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointExceptionIT.java +++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointExceptionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.camel.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class CamelEndpointExceptionIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "CamelEndpointExceptionIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "CamelEndpointExceptionIT") public void testCamelEndpointException() {} } diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointFactoryIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointFactoryIT.java index 4f3f38a07a..f216689951 100644 --- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointFactoryIT.java +++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointFactoryIT.java @@ -16,7 +16,8 @@ package org.citrusframework.camel.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class CamelEndpointFactoryIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "CamelEndpointFactoryIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "CamelEndpointFactoryIT") public void testCamelEndpointFactory() {} } diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointIT.java index 121b4bfce9..27168eba44 100644 --- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointIT.java +++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.camel.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class CamelEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "CamelEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "CamelEndpointIT") public void testCamelEndpoint() {} } diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteDefinitionIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteDefinitionIT.java index f9b506e665..39958b6d5b 100644 --- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteDefinitionIT.java +++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteDefinitionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.camel.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class CamelRouteDefinitionIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "CamelRouteDefinitionIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "CamelRouteDefinitionIT") public void testCamelRouteDefinition() {} } diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelSyncEndpointIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelSyncEndpointIT.java index bdd2c4b543..1580f64890 100644 --- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelSyncEndpointIT.java +++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelSyncEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.camel.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class CamelSyncEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "CamelSyncEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "CamelSyncEndpointIT") public void testCamelSyncEndpoint() {} } diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClientBuilder.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClientBuilder.java index 0f58db89ff..dcdedf961f 100644 --- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClientBuilder.java +++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClientBuilder.java @@ -69,9 +69,7 @@ public ScpClientBuilder port(int port) { * * @param autoReadFiles * @return - * @deprecated received files are always read automatically making this flag obsolete */ - @Deprecated public ScpClientBuilder autoReadFiles(boolean autoReadFiles) { endpoint.getEndpointConfiguration().setAutoReadFiles(autoReadFiles); return this; diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpClientServerIT.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpClientServerIT.java index 3dfa65aa6a..dd5c75f5a2 100644 --- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpClientServerIT.java +++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpClientServerIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ftp.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class FtpClientServerIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "FtpClientServerIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "FtpClientServerIT") public void testClientServer() {} } diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpDynamicEndpointIT.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpDynamicEndpointIT.java index 2d65e3928d..b1bc8bcfb1 100644 --- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpDynamicEndpointIT.java +++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpDynamicEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ftp.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class FtpDynamicEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "FtpDynamicEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "FtpDynamicEndpointIT") public void testDynamicEndpoint() {} } diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpFileActionIT.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpFileActionIT.java index ba46612313..506554ba1a 100644 --- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpFileActionIT.java +++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpFileActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ftp.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.TestNGUtils; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.BeforeClass; @@ -34,6 +35,6 @@ public static void setup() { TestNGUtils.skipForOs("win", "Flaky on win."); } - @CitrusXmlTest(name = "FtpFileActionIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "FtpFileActionIT") public void testFileAction() {} } diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpLoginIT.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpLoginIT.java index 11268d87c7..e6b6f2c5d8 100644 --- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpLoginIT.java +++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpLoginIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ftp.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class FtpLoginIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "FtpLoginIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "FtpLoginIT") public void testLogin() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/FormUrlEncodedIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/FormUrlEncodedIT.java index f35cd8c58e..51955e0cf3 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/FormUrlEncodedIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/FormUrlEncodedIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,15 +27,15 @@ public class FormUrlEncodedIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest(name = "FormUrlEncoded_PlainText_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "FormUrlEncoded_PlainText_IT") public void formUrlEncodedPlainText() {} @Test - @CitrusXmlTest(name = "FormUrlEncoded_FormData_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "FormUrlEncoded_FormData_IT") public void formUrlEncodedFormData() {} @Test(enabled = false) - @CitrusXmlTest(name = "FormUrlEncoded_Manual_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "FormUrlEncoded_Manual_IT") public void formUrlEncodedManual() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientIT.java index 1727d7486a..5b71717a89 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class HttpClientIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HttpClientIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpClientIT") public void testHttpClient() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTemplateIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTemplateIT.java index 5f9b2759e7..223edeb69a 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTemplateIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTemplateIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class HttpClientTemplateIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HttpClientTemplateIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpClientTemplateIT") public void testHttpTemplateClient() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTimeoutIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTimeoutIT.java index 704afbd7e5..eb8210067b 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTimeoutIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTimeoutIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class HttpClientTimeoutIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HttpClientTimeoutIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpClientTimeoutIT") public void testHttpClientTimeout() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpEndpointFactoryIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpEndpointFactoryIT.java index 3782b0c401..049a8993cb 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpEndpointFactoryIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpEndpointFactoryIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class HttpEndpointFactoryIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HttpEndpointFactoryIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpEndpointFactoryIT") public void testHttpEndpointFactory() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpFormUrlEncodedIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpFormUrlEncodedIT.java index 3343d40068..392d2926fb 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpFormUrlEncodedIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpFormUrlEncodedIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class HttpFormUrlEncodedIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HttpFormUrlEncodedIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpFormUrlEncodedIT") public void testHttpFormUrlEncoded() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpGzipEncodedIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpGzipEncodedIT.java index d5737f9c8a..948e7eddd7 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpGzipEncodedIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpGzipEncodedIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class HttpGzipEncodedIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HttpGzipEncodedIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpGzipEncodedIT") public void testHttpGzipEncoded() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpHandleCookiesIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpHandleCookiesIT.java index 6afbad5ee9..745812ee75 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpHandleCookiesIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpHandleCookiesIT.java @@ -3,7 +3,8 @@ import jakarta.servlet.http.Cookie; import org.citrusframework.annotations.CitrusTest; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.http.client.HttpClient; import org.citrusframework.http.server.HttpServer; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; @@ -25,7 +26,7 @@ public class HttpHandleCookiesIT extends TestNGCitrusSpringSupport { private HttpServer httpServer; @Test - @CitrusXmlTest(name = "HttpCookiesIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpCookiesIT") public void testCookies() {} @Test diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpJsonSchemaValidationIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpJsonSchemaValidationIT.java index 9390516fd8..6f5959253b 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpJsonSchemaValidationIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpJsonSchemaValidationIT.java @@ -1,12 +1,13 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @Test public class HttpJsonSchemaValidationIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HttpJsonSchemaValidationIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpJsonSchemaValidationIT") public void testHttpClientJsonValidation() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerIT.java index 4acb863058..f2ec354c42 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class HttpMessageControllerIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void HttpMessageControllerIT() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpSendMessageJsonSchemaValidationIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpSendMessageJsonSchemaValidationIT.java index 374425227a..602af18535 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpSendMessageJsonSchemaValidationIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpSendMessageJsonSchemaValidationIT.java @@ -1,16 +1,14 @@ package org.citrusframework.http.integration; -import org.citrusframework.actions.SendMessageAction; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Test public class HttpSendMessageJsonSchemaValidationIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HttpSendMessageJsonSchemaValidationIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpSendMessageJsonSchemaValidationIT") public void testHttpSendMessageJsonSchemaValidationIT() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerIT.java index 66a2810aa4..5fe9c40f97 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,22 +27,22 @@ @Test public class HttpServerIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HttpServerIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpServerIT") public void testHttpServer() {} @Test - @CitrusXmlTest(name = "HttpServerStandaloneIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpServerStandaloneIT") public void serverStandaloneIT() {} @Test - @CitrusXmlTest(name = "HttpParallelRequest_1_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpParallelRequest_1_IT") public void parallelRequestsIterateIT() {} @Test - @CitrusXmlTest(name = "HttpParallelRequest_2_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpParallelRequest_2_IT") public void parallelRequestsEndpointUriIT() {} @Test - @CitrusXmlTest(name = "HttpParallelRequest_3_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpParallelRequest_3_IT") public void parallelRequestsIT() {} } diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java index a4f919511e..402e848add 100644 --- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java +++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java @@ -16,7 +16,8 @@ package org.citrusframework.http.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,7 +27,7 @@ */ public class HttpServerJmsIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest(name = "HttpServerJmsIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpServerJmsIT") public void serverJmsIT() {} diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageIT.java index 672cdc4de3..895f16de85 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class JmsByteMessageIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsByteMessageIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsByteMessageIT") public void testByteMessage() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationIT.java index 0862dc360a..88e5ce3579 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class JmsCommunicationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void JmsCommunicationIT() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointFactoryIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointFactoryIT.java index b7fe8690d8..b52ea9cae3 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointFactoryIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointFactoryIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,7 +28,7 @@ @Test public class JmsEndpointFactoryIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsEndpointFactoryIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsEndpointFactoryIT") public void testJmsEndpointFactory() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointIT.java index 999610d1ed..b3547b26c9 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class JmsEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsEndpointIT") public void testJmsEndpoint() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageIT.java index e6bb382bbc..0cae4e777b 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class JmsGzipMessageIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsGzipMessageIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsGzipMessageIT") public void testGzipMessage() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsMessageHeadersIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsMessageHeadersIT.java index 613e07d7ea..ff6cec5b6c 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsMessageHeadersIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsMessageHeadersIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class JmsMessageHeadersIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsMessageHeadersIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsMessageHeadersIT") public void testJmsMessageHeaders() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveIT.java index 22a63907ab..ebd6791462 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class JmsSendReceiveIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void JmsSendReceiveIT() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSoapIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSoapIT.java index fbb99241b4..09275fd349 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSoapIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSoapIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class JmsSoapIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsSoapIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsSoapIT") public void testJmsSoap() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncEndpointIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncEndpointIT.java index 11cfc019e1..90156ed747 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncEndpointIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class JmsSyncEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsSyncEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsSyncEndpointIT") public void testJmsSyncEndpoint() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveIT.java index a5baac78d2..10f126d3d3 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class JmsSyncSendReceiveIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void JmsSyncSendReceiveIT() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopic2IT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopic2IT.java index fe07856647..09b2320e9b 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopic2IT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopic2IT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class JmsTopic2IT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest(name = "JmsTopic2IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsTopic2IT") public void JmsTopic2IT() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicDurableSubscriberIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicDurableSubscriberIT.java index aaef541746..1ddacfa6f9 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicDurableSubscriberIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicDurableSubscriberIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class JmsTopicDurableSubscriberIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsTopicDurableSubscriberIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsTopicDurableSubscriberIT") public void testJmsTopicDurableSubscriber() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicIT.java index f7cccc3b1b..2723495bca 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class JmsTopicIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsTopicIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsTopicIT") public void testJmsTopic() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicSubscriberIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicSubscriberIT.java index c73f308708..9a66a41065 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicSubscriberIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicSubscriberIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class JmsTopicSubscriberIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmsTopicSubscriberIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmsTopicSubscriberIT") public void testJmsTopicSubscriber() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesIT.java index 7d1c56a986..e4aaf2e9bc 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class PurgeJmsQueuesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void PurgeJmsQueuesIT() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/ReceiveTimeoutIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/ReceiveTimeoutIT.java index 23628cba1b..66715ae61c 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/ReceiveTimeoutIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/ReceiveTimeoutIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ReceiveTimeoutIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ReceiveTimeoutIT() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToIT.java index 330f9dd768..9b4ac5ab06 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SendReplyToIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SendReplyToIT() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsCommunicationIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsCommunicationIT.java index 4e44bb3e75..81b9e6405d 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsCommunicationIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsCommunicationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SyncJmsCommunicationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SyncJmsCommunicationIT() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicCommunicationIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicCommunicationIT.java index 215be7b1f3..941166e0a2 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicCommunicationIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicCommunicationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SyncJmsTopicCommunicationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SyncJmsTopicCommunicationIT() {} } diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/TemplateAdvancedIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/TemplateAdvancedIT.java index 216b01143d..7f33eb1eda 100644 --- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/TemplateAdvancedIT.java +++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/TemplateAdvancedIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jms.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class TemplateAdvancedIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void TemplateAdvancedIT() {} } diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxClientIT.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxClientIT.java index 79ee7020c6..045125eef2 100644 --- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxClientIT.java +++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxClientIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jmx.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class JmxClientIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmxClientIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmxClientIT") public void jmxClientTest() {} } diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxDynamicEndpointIT.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxDynamicEndpointIT.java index d856c8b302..43b41b8da2 100644 --- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxDynamicEndpointIT.java +++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxDynamicEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jmx.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class JmxDynamicEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmxDynamicEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmxDynamicEndpointIT") public void jmxDynamicEndpointTest() {} } diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxServerIT.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxServerIT.java index 0bab3edf61..fc94ccd95d 100644 --- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxServerIT.java +++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxServerIT.java @@ -16,7 +16,8 @@ package org.citrusframework.jmx.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class JmxServerIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "JmxServerIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "JmxServerIT") public void jmxServerTest() {} } diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointFactoryIT.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointFactoryIT.java index 348201b07c..4eebc0de06 100644 --- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointFactoryIT.java +++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointFactoryIT.java @@ -16,7 +16,8 @@ package org.citrusframework.kafka.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,7 +27,7 @@ @Test public class KafkaEndpointFactoryIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "KafkaEndpointFactoryIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "KafkaEndpointFactoryIT") public void testKafkaEndpointFactory() {} } diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointIT.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointIT.java index 7347dabd87..ad7dc9434d 100644 --- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointIT.java +++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.kafka.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class KafkaEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "KafkaEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "KafkaEndpointIT") public void testKafkaEndpoint() {} } diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaMessageHeadersIT.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaMessageHeadersIT.java index 39a25ef246..ff2ecbdf9f 100644 --- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaMessageHeadersIT.java +++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaMessageHeadersIT.java @@ -16,7 +16,8 @@ package org.citrusframework.kafka.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class KafkaMessageHeadersIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "KafkaMessageHeadersIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "KafkaMessageHeadersIT") public void testKafkaMessageHeaders() {} } diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailMultipartIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailMultipartIT.java index 09ed47c951..43d085e280 100644 --- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailMultipartIT.java +++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailMultipartIT.java @@ -16,7 +16,8 @@ package org.citrusframework.mail.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ public class MailMultipartIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void MailMultipartIT() {} } diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailSendReceiveIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailSendReceiveIT.java index 36acef0d25..8201b1fdb2 100644 --- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailSendReceiveIT.java +++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailSendReceiveIT.java @@ -16,7 +16,8 @@ package org.citrusframework.mail.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class MailSendReceiveIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void MailSendReceiveIT() {} } diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerAcceptIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerAcceptIT.java index a19c107ef0..710ff5c3f0 100644 --- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerAcceptIT.java +++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerAcceptIT.java @@ -16,7 +16,8 @@ package org.citrusframework.mail.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ public class MailServerAcceptIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void MailServerAcceptIT() {} } diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerErrorIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerErrorIT.java index a609279983..4d55e48729 100644 --- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerErrorIT.java +++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerErrorIT.java @@ -16,7 +16,8 @@ package org.citrusframework.mail.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ public class MailServerErrorIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void MailServerErrorIT() {} } diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerIT.java index 27cad0b415..516388bdd7 100644 --- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerIT.java +++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerIT.java @@ -16,7 +16,8 @@ package org.citrusframework.mail.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ public class MailServerIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void MailServerIT() {} } diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java index 65abafc331..1832d5c29a 100644 --- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java +++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.rmi.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class RmiDynamicEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "RmiDynamicEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "RmiDynamicEndpointIT") public void testDynamicEndpoint() {} } diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java index c85b9ba9c0..a27a819f16 100644 --- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java +++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.rmi.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,11 +28,11 @@ @Test public class RmiEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "RmiClientIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "RmiClientIT") public void testClientXml() { } - @CitrusXmlTest(name = "RmiServerIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "RmiServerIT") public void testServerXml() { } } diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/MessageChannelIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/MessageChannelIT.java index b9b4e32250..796876f65c 100644 --- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/MessageChannelIT.java +++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/MessageChannelIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class MessageChannelIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void MessageChannelIT() {} } diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointFactoryIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointFactoryIT.java index 0c57a7c805..9664177cd3 100644 --- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointFactoryIT.java +++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointFactoryIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.channel; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,7 +28,7 @@ @Test public class ChannelEndpointFactoryIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "ChannelEndpointFactoryIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "ChannelEndpointFactoryIT") public void testChannelEndpointFactory() {} } diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointIT.java index e1d1f36ce1..beb8783f73 100644 --- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointIT.java +++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.channel; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class ChannelEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "ChannelEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "ChannelEndpointIT") public void testChannelEndpoint() {} } diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelSyncEndpointIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelSyncEndpointIT.java index 560301d554..1115203da6 100644 --- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelSyncEndpointIT.java +++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelSyncEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.channel; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class ChannelSyncEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "ChannelSyncEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "ChannelSyncEndpointIT") public void testChannelSyncEndpoint() {} } diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java index bc40752ea5..36bfc9efa5 100644 --- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java +++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java @@ -3,7 +3,8 @@ import org.citrusframework.DefaultTestCase; import org.citrusframework.TestCase; import org.citrusframework.TestCaseMetaInfo; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.common.BeanDefinitionParserConfiguration; import org.citrusframework.common.SpringXmlTestLoaderConfiguration; import org.citrusframework.config.xml.BaseTestCaseMetaInfoParser; @@ -26,7 +27,7 @@ public class SpringXmlTestLoaderIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SpringXmlTestLoaderIT() { TestCase testCase = getTestCase(); Assert.assertTrue(testCase instanceof CustomTestCase); diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerErrorIT.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerErrorIT.java index 4c175a36db..04dacedee6 100644 --- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerErrorIT.java +++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerErrorIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ssh.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class SshServerErrorIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "SshServerErrorIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "SshServerErrorIT") public void testSshServerError() {} } diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerIT.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerIT.java index 89ca768913..004a0dcac5 100644 --- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerIT.java +++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ssh.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ @Test public class SshServerIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "SshServerIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "SshServerIT") public void testSshServer() {} } diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxEndpointIT.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxEndpointIT.java index 3b478eb11e..e4ced81e9b 100644 --- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxEndpointIT.java +++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.vertx.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class VertxEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "VertxEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "VertxEndpointIT") public void testVertxEndpoint() {} } diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxSyncEndpointIT.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxSyncEndpointIT.java index 17b1bed05c..498c30956d 100644 --- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxSyncEndpointIT.java +++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxSyncEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.vertx.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class VertxSyncEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "VertxSyncEndpointIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "VertxSyncEndpointIT") public void testVertxSyncEndpoint() {} } diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/integration/WebSocketEndpointIT.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/integration/WebSocketEndpointIT.java index 28be122199..0dd0765124 100644 --- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/integration/WebSocketEndpointIT.java +++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/integration/WebSocketEndpointIT.java @@ -16,7 +16,8 @@ package org.citrusframework.websocket.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,9 +27,9 @@ @Test public class WebSocketEndpointIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "WebSocketEndpoint_1_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "WebSocketEndpoint_1_IT") public void testWebSocketEndpoint1() {} - @CitrusXmlTest(name = "WebSocketEndpoint_2_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "WebSocketEndpoint_2_IT") public void testWebSocketEndpoint2() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultIT.java index eb39407c7f..c667f4207b 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class AssertSoapFaultIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void AssertSoapFaultIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/EmptySoapResponseIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/EmptySoapResponseIT.java index a633916899..eb2af9d611 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/EmptySoapResponseIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/EmptySoapResponseIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class EmptySoapResponseIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void EmptySoapResponseIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/PropagateSoapFaultIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/PropagateSoapFaultIT.java index 7d680dcc7a..710a7f74af 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/PropagateSoapFaultIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/PropagateSoapFaultIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class PropagateSoapFaultIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void PropagateSoapFaultIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithAttachmentIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithAttachmentIT.java index bb8afab2fb..f2f258c546 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithAttachmentIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithAttachmentIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,14 +27,14 @@ */ public class SendSoapMessageWithAttachmentIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SendSoapMessageWithAttachmentIT() {} @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SendSoapMessageWithMtomAttachmentIT() {} @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SendSoapMessageWithAttachmentInTemplateIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java index 1296c5dfea..cd110912b2 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java @@ -1,10 +1,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.actions.SendMessageAction; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @@ -14,7 +12,7 @@ public class SendSoapMessageWithSchemaValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SendSoapMessageWithSchemaValidationIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/ServerSoapFaultIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/ServerSoapFaultIT.java index af7fff7a7a..457fb014e9 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/ServerSoapFaultIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/ServerSoapFaultIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ServerSoapFaultIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ServerSoapFaultIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeIT.java index 3b9c7cd6f7..e544a2c622 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SoapForkModeIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapForkModeIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentIT.java index c92616164d..535800d221 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SoapHeaderFragmentIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapHeaderFragmentIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpAttributeHeaderIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpAttributeHeaderIT.java index 799a2f8201..ba2059d9ca 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpAttributeHeaderIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpAttributeHeaderIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class SoapHttpAttributeHeaderIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapHttpAttributeHeaderIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorIT.java index 58c76e9a8c..ba0fa6941f 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class SoapHttpErrorIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapHttpErrorIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderIT.java index 251e725afc..33b15b2c1a 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SoapMimeHeaderIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapMimeHeaderIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleAttachmentIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleAttachmentIT.java index b802c87cd0..bb38933a68 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleAttachmentIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleAttachmentIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SoapMultipleAttachmentIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapMultipleAttachmentIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleHeaderFragmentIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleHeaderFragmentIT.java index 26ba35ca0d..973d9b9af1 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleHeaderFragmentIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleHeaderFragmentIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SoapMultipleHeaderFragmentIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapMultipleHeaderFragmentIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapSchemaValidationIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapSchemaValidationIT.java index 35fbd6463a..005c1fa621 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapSchemaValidationIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapSchemaValidationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,10 +27,10 @@ */ public class SoapSchemaValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapSchemaValidationIT() {} @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapSchemaValidationNamespaceDiffIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapWsdlRequestIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapWsdlRequestIT.java index 212264a40a..3f42874d7d 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapWsdlRequestIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapWsdlRequestIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class SoapWsdlRequestIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SoapWsdlRequestIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientIT.java index c5cd018121..3bc4e52717 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class WebServiceClientIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void WebServiceClientIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceEndpointFactoryIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceEndpointFactoryIT.java index c54f97cb51..e7d352eb62 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceEndpointFactoryIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceEndpointFactoryIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ public class WebServiceEndpointFactoryIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void WebServiceEndpointFactoryIT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerIT.java index b4af1ae4db..6f1094ed40 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,22 +27,22 @@ */ public class WebServiceServerIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest() + @CitrusTestSource(type = TestLoader.SPRING) public void WebServiceServer_1_IT() {} @Test - @CitrusXmlTest() + @CitrusTestSource(type = TestLoader.SPRING) public void WebServiceServer_2_IT() {} @Test - @CitrusXmlTest() + @CitrusTestSource(type = TestLoader.SPRING) public void WebServiceServer_3_IT() {} @Test - @CitrusXmlTest() + @CitrusTestSource(type = TestLoader.SPRING) public void WebServiceServer_4_IT() {} @Test - @CitrusXmlTest() + @CitrusTestSource(type = TestLoader.SPRING) public void WebServiceServer_5_IT() {} } diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingIT.java index 79236c8d48..dd1c9fea18 100644 --- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingIT.java +++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingIT.java @@ -16,7 +16,8 @@ package org.citrusframework.ws.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class WsAddressingIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void WsAddressingIT() {} } diff --git a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteIT.java b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteIT.java index 2cf8be6db7..3b6027cd4a 100644 --- a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteIT.java +++ b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteIT.java @@ -16,7 +16,8 @@ package org.citrusframework.zookeeper.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -31,6 +32,6 @@ @Test public class ZooExecuteIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "ZooExecuteIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "ZooExecuteIT") public void zookeeperTest() {} } diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java index d34496850b..767ca45dc1 100644 --- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java +++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class CreateVariablesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void CreateVariablesIT() {} } diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java index 1b6e78b92a..4908bf4045 100644 --- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java +++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class LoadPropertiesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void LoadPropertiesIT() {} } diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/IterateIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/IterateIT.java index c65a4574e5..1fa67ee350 100644 --- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/IterateIT.java +++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/IterateIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class IterateIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void IterateIT() {} } diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/ParallelFailureIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/ParallelFailureIT.java index 030886d6e7..4c4d7da37a 100644 --- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/ParallelFailureIT.java +++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/ParallelFailureIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ParallelFailureIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ParallelFailureIT() {} } diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/TemplateVariablesIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/TemplateVariablesIT.java index b9394a0554..7c37a3a9bf 100644 --- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/TemplateVariablesIT.java +++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/TemplateVariablesIT.java @@ -1,6 +1,7 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -10,6 +11,6 @@ */ public class TemplateVariablesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void TemplateVariablesIT() {} } diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionIT.java index bbfac7b5a8..51452246bb 100644 --- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionIT.java +++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.script; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class GroovyActionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void GroovyActionIT() {} } diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java index 151473ce55..51ba84b1f2 100644 --- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java +++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.variables; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -30,6 +31,6 @@ */ public class GlobalVariablesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void GlobalVariablesIT() {} } diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/CitrusJUnit4Runner.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/CitrusJUnit4Runner.java index d57e5ef831..dcb916ec02 100644 --- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/CitrusJUnit4Runner.java +++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/CitrusJUnit4Runner.java @@ -21,9 +21,6 @@ import org.citrusframework.annotations.CitrusTest; import org.citrusframework.annotations.CitrusTestSource; -import org.citrusframework.annotations.CitrusXmlTest; -import org.citrusframework.common.TestLoader; -import org.citrusframework.exceptions.CitrusRuntimeException; import org.citrusframework.util.StringUtils; import org.junit.Test; import org.junit.internal.runners.statements.InvokeMethod; @@ -75,10 +72,6 @@ protected List getChildren() { interceptedMethods.addAll(JUnit4Helper.findInterceptedMethods(method, citrusTestAnnotation.type(), citrusTestAnnotation.name(), citrusTestAnnotation.packageName(), citrusTestAnnotation.packageScan(), citrusTestAnnotation.sources())); - } else if (method.getMethod().getAnnotation(CitrusXmlTest.class) != null) { - interceptedMethods.add(new CitrusFrameworkMethod(method.getMethod(), TestLoader.SPRING, method.getName(), - method.getMethod().getDeclaringClass().getPackage().getName()) - .withError(new CitrusRuntimeException("Unsupported XML test annotation - please add Spring support"))); } else { interceptedMethods.add(method); } diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4CitrusSupport.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4CitrusSupport.java index d18df488ac..e526bf222f 100644 --- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4CitrusSupport.java +++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4CitrusSupport.java @@ -26,9 +26,8 @@ import org.citrusframework.TestCaseMetaInfo; import org.citrusframework.TestCaseRunner; import org.citrusframework.annotations.CitrusAnnotations; -import org.citrusframework.annotations.CitrusTestSource; import org.citrusframework.annotations.CitrusTest; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; import org.citrusframework.common.DefaultTestLoader; import org.citrusframework.common.TestLoader; import org.citrusframework.common.TestSourceAware; @@ -82,8 +81,6 @@ public void run(CitrusFrameworkMethod frameworkMethod) { CitrusAnnotations.injectTestRunner(testLoader, runner); testLoader.doWithTestCase(t -> JUnit4Helper.invokeTestMethod(this, frameworkMethod, ctx)); testLoader.load(); - } else if (frameworkMethod.getMethod().getAnnotation(CitrusXmlTest.class) != null) { - throw new CitrusRuntimeException("Unsupported XML test annotation - please add Spring support"); } } diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/CitrusSpringJUnit4Runner.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/CitrusSpringJUnit4Runner.java index 1083ab601c..6aa0479387 100644 --- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/CitrusSpringJUnit4Runner.java +++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/CitrusSpringJUnit4Runner.java @@ -21,8 +21,6 @@ import org.citrusframework.annotations.CitrusTest; import org.citrusframework.annotations.CitrusTestSource; -import org.citrusframework.annotations.CitrusXmlTest; -import org.citrusframework.common.TestLoader; import org.citrusframework.junit.CitrusFrameworkMethod; import org.citrusframework.junit.JUnit4Helper; import org.citrusframework.util.StringUtils; @@ -77,11 +75,6 @@ protected List getChildren() { interceptedMethods.addAll(JUnit4Helper.findInterceptedMethods(method, citrusTestAnnotation.type(), citrusTestAnnotation.name(), citrusTestAnnotation.packageName(), citrusTestAnnotation.packageScan(), citrusTestAnnotation.sources())); - } else if (method.getMethod().getAnnotation(CitrusXmlTest.class) != null) { - CitrusXmlTest citrusTestAnnotation = method.getMethod().getAnnotation(CitrusXmlTest.class); - interceptedMethods.addAll(JUnit4Helper.findInterceptedMethods(method, TestLoader.SPRING, - citrusTestAnnotation.name(), citrusTestAnnotation.packageName(), - citrusTestAnnotation.packageScan(), citrusTestAnnotation.sources())); } else { interceptedMethods.add(method); } diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/JUnit4CitrusSpringSupport.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/JUnit4CitrusSpringSupport.java index 842ee9fab6..f373f0bc29 100644 --- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/JUnit4CitrusSpringSupport.java +++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/JUnit4CitrusSpringSupport.java @@ -30,9 +30,8 @@ import org.citrusframework.TestCaseMetaInfo; import org.citrusframework.TestCaseRunner; import org.citrusframework.annotations.CitrusAnnotations; -import org.citrusframework.annotations.CitrusTestSource; import org.citrusframework.annotations.CitrusTest; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; import org.citrusframework.common.DefaultTestLoader; import org.citrusframework.common.TestLoader; import org.citrusframework.common.TestSourceAware; @@ -42,8 +41,6 @@ import org.citrusframework.junit.CitrusFrameworkMethod; import org.citrusframework.junit.JUnit4Helper; import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @@ -77,14 +74,7 @@ public void run(CitrusFrameworkMethod frameworkMethod) { TestContext ctx = prepareTestContext(citrus.getCitrusContext().createTestContext()); - if (frameworkMethod.getMethod().getAnnotation(CitrusXmlTest.class) != null) { - TestLoader testLoader = createTestLoader(frameworkMethod.getTestName(), frameworkMethod.getPackageName(), frameworkMethod.getSource(), TestLoader.SPRING); - - CitrusAnnotations.injectAll(testLoader, citrus, ctx); - testLoader.doWithTestCase(t -> JUnit4Helper.invokeTestMethod(this, frameworkMethod, ctx)); - - testLoader.load(); - } else if (frameworkMethod.getMethod().getAnnotation(CitrusTest.class) != null || + if (frameworkMethod.getMethod().getAnnotation(CitrusTest.class) != null || frameworkMethod.getMethod().getAnnotation(CitrusTestSource.class) != null) { TestCaseRunner runner = JUnit4Helper.createTestRunner(frameworkMethod, this.getClass(), ctx); frameworkMethod.setAttribute(JUnit4Helper.BUILDER_ATTRIBUTE, runner); diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4SpringXmlIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4SpringXmlIT.java index 21bec00870..206848ce4d 100644 --- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4SpringXmlIT.java +++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4SpringXmlIT.java @@ -17,7 +17,8 @@ package org.citrusframework.junit.integration; import org.citrusframework.ShouldFailGroup; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.exceptions.TestCaseFailedException; import org.citrusframework.junit.spring.JUnit4CitrusSpringSupport; import org.junit.Test; @@ -31,33 +32,33 @@ public class JUnit4SpringXmlIT extends JUnit4CitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void JUnit4SpringXmlIT() { } @Test - @CitrusXmlTest(name = "SampleIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "SampleIT") public void JUnit4SpringXml_1_IT() { } @Test - @CitrusXmlTest(name = { "EchoActionIT", "FailActionIT", "CreateVariablesIT" }, packageName = "org.citrusframework.junit.integration.actions") + @CitrusTestSource(type = TestLoader.SPRING, name = { "EchoActionIT", "FailActionIT", "CreateVariablesIT" }, packageName = "org.citrusframework.junit.integration.actions") public void JUnit4SpringXml_2_IT() { } @Test - @CitrusXmlTest(packageScan = "org.citrusframework.junit.integration.simple") + @CitrusTestSource(type = TestLoader.SPRING, packageScan = "org.citrusframework.junit.integration.simple") public void JUnit4SpringXml_3_IT() { } @Test - @CitrusXmlTest(sources = "classpath:org/citrusframework/junit/integration/actions/CreateVariablesIT.xml") + @CitrusTestSource(type = TestLoader.SPRING, sources = "classpath:org/citrusframework/junit/integration/actions/CreateVariablesIT.xml") public void JUnit4SpringXml_4_IT() { } @Test(expected = TestCaseFailedException.class) @Category( ShouldFailGroup.class ) - @CitrusXmlTest(name = "FailJUnit4IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "FailJUnit4IT") public void JUnit4SpringXml_5_IT() { } } diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java index 033eea876c..f1bce21c02 100644 --- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java +++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java @@ -3,7 +3,8 @@ import org.citrusframework.DefaultTestCase; import org.citrusframework.TestCase; import org.citrusframework.TestCaseMetaInfo; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.common.BeanDefinitionParserConfiguration; import org.citrusframework.common.SpringXmlTestLoaderConfiguration; import org.citrusframework.config.xml.BaseTestCaseMetaInfoParser; @@ -26,7 +27,7 @@ public class SpringXmlTestLoaderIT extends JUnit4CitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SpringXmlTestLoaderIT() { TestCase testCase = getTestCase(); Assert.assertTrue(testCase instanceof CustomTestCase); diff --git a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtensionHelper.java b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtensionHelper.java index 829cda7654..3cd5d6eb79 100644 --- a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtensionHelper.java +++ b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtensionHelper.java @@ -31,7 +31,6 @@ import org.citrusframework.annotations.CitrusAnnotations; import org.citrusframework.annotations.CitrusTest; import org.citrusframework.annotations.CitrusTestSource; -import org.citrusframework.annotations.CitrusXmlTest; import org.citrusframework.common.DefaultTestLoader; import org.citrusframework.common.TestLoader; import org.citrusframework.common.TestSourceAware; @@ -73,7 +72,7 @@ public static boolean isTestFactoryMethod(Method method) { * @return */ public static boolean isTestSourceMethod(Method method) { - return method.isAnnotationPresent(CitrusTestSource.class) || method.isAnnotationPresent(CitrusXmlTest.class); + return method.isAnnotationPresent(CitrusTestSource.class); } /** @@ -158,18 +157,6 @@ public static TestLoader createTestLoader(ExtensionContext extensionContext) { return testLoader; } - if (method.getAnnotation(CitrusXmlTest.class) != null) { - CitrusXmlTest citrusTestAnnotation = method.getAnnotation(CitrusXmlTest.class); - - TestLoader testLoader = TestLoader.lookup(TestLoader.SPRING) - .orElseThrow(() -> new CitrusRuntimeException(String.format("Missing test loader for type '%s'", TestLoader.SPRING))); - - configure(testLoader, extensionContext, method, citrusTestAnnotation.name(), - citrusTestAnnotation.packageName(), citrusTestAnnotation.packageScan(), citrusTestAnnotation.sources()); - - return testLoader; - } - TestLoader testLoader; if (CitrusExtensionHelper.isTestSourceMethod(method)) { CitrusTestSource citrusTestAnnotation = method.getAnnotation(CitrusTestSource.class); diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBeanXml_IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBeanXml_IT.java index 5b3b1a157f..959604c072 100644 --- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBeanXml_IT.java +++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBeanXml_IT.java @@ -22,7 +22,6 @@ import java.util.stream.Stream; import org.citrusframework.annotations.CitrusTestSource; -import org.citrusframework.annotations.CitrusXmlTest; import org.citrusframework.common.TestLoader; import org.citrusframework.config.CitrusSpringConfig; import org.citrusframework.junit.jupiter.CitrusTestFactorySupport; @@ -42,7 +41,7 @@ class SpringBeanXml_IT { @Test @DisplayName("SpringBeanXml_IT") - @CitrusXmlTest(name = "SpringBeanXml_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "SpringBeanXml_IT") void SpringBeanXml_0_IT() { } @@ -52,7 +51,7 @@ void SpringGroovy_IT() { } @Test - @CitrusXmlTest(name = "SampleIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "SampleIT") void SpringBeanXml_1_IT() { } @@ -71,7 +70,7 @@ Stream SpringBeanXml_3_IT() { } @Test - @CitrusXmlTest(sources = "classpath:org/citrusframework/junit/jupiter/integration/spring/SampleIT.xml") + @CitrusTestSource(type = TestLoader.SPRING, sources = "classpath:org/citrusframework/junit/jupiter/integration/spring/SampleIT.xml") void SpringBeanXml_4_IT() { } } diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java index 72b9728ccf..e027a8a996 100644 --- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java +++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java @@ -4,7 +4,8 @@ import org.citrusframework.TestCaseMetaInfo; import org.citrusframework.TestCaseRunner; import org.citrusframework.annotations.CitrusResource; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.common.BeanDefinitionParserConfiguration; import org.citrusframework.common.SpringXmlTestLoaderConfiguration; import org.citrusframework.common.SpringXmlTestLoaderConfigurer; @@ -34,7 +35,7 @@ class SpringXmlTestLoader_IT { @Test - @CitrusXmlTest(name="SpringXmlTestLoader_IT") + @CitrusTestSource(type = TestLoader.SPRING, name="SpringXmlTestLoader_IT") void SpringXmlTestLoaderIT_0_IT(@CitrusResource TestCaseRunner runner) { Assertions.assertNotNull(runner.getTestCase()); diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusMethodInterceptor.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusMethodInterceptor.java index c1b5eddc35..6cea724780 100644 --- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusMethodInterceptor.java +++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusMethodInterceptor.java @@ -25,8 +25,6 @@ import org.citrusframework.CitrusSettings; import org.citrusframework.annotations.CitrusTestSource; -import org.citrusframework.annotations.CitrusXmlTest; -import org.citrusframework.exceptions.CitrusRuntimeException; import org.citrusframework.spi.ClasspathResourceResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,8 +84,6 @@ public List intercept(List methods, ITestConte logger.error("Unable to locate file resources for test package '" + packageName + "'", e); } } - } else if (method.getMethod().getConstructorOrMethod().getMethod().getAnnotation(CitrusXmlTest.class) != null) { - throw new CitrusRuntimeException("Unsupported XML test annotation - please add Spring support"); } } diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusSupport.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusSupport.java index 6d45d4b2db..0c143c5926 100644 --- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusSupport.java +++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusSupport.java @@ -35,7 +35,6 @@ import org.citrusframework.annotations.CitrusAnnotations; import org.citrusframework.annotations.CitrusTest; import org.citrusframework.annotations.CitrusTestSource; -import org.citrusframework.annotations.CitrusXmlTest; import org.citrusframework.common.DefaultTestLoader; import org.citrusframework.common.TestLoader; import org.citrusframework.common.TestSourceAware; @@ -94,8 +93,6 @@ public void run(final IHookCallBack callBack, ITestResult testResult) { throw new CitrusRuntimeException(testResult.getThrowable()); } } - } else if (method.getAnnotation(CitrusXmlTest.class) != null) { - throw new CitrusRuntimeException("Unsupported XML test annotation - please add Spring support"); } else { callBack.runTestMethod(testResult); } @@ -109,10 +106,6 @@ public void run(final IHookCallBack callBack, ITestResult testResult) { * @param invocationCount */ protected void run(ITestResult testResult, Method method, List methodTestLoaders, int invocationCount) { - if (method.getAnnotation(CitrusXmlTest.class) != null) { - throw new CitrusRuntimeException("Unsupported XML test annotation - please add Spring support"); - } - try { if (citrus == null) { citrus = Citrus.newInstance(); diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGHelper.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGHelper.java index e83f904636..80e67bfc14 100644 --- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGHelper.java +++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGHelper.java @@ -34,7 +34,6 @@ import org.citrusframework.TestCaseRunnerFactory; import org.citrusframework.annotations.CitrusTest; import org.citrusframework.annotations.CitrusTestSource; -import org.citrusframework.annotations.CitrusXmlTest; import org.citrusframework.common.TestLoader; import org.citrusframework.common.TestSourceAware; import org.citrusframework.context.TestContext; @@ -111,7 +110,7 @@ public static TestCaseRunner createTestCaseRunner(Object target, Method method, } /** - * Creates test loader from @CitrusXmlTest annotated test method and saves those to local member. + * Creates test loader from @CitrusTestSource(type = TestLoader.SPRING) annotated test method and saves those to local member. * Test loaders get executed later when actual method is called by TestNG. This way user can annotate * multiple methods in one single class each executing several Citrus XML tests. * @@ -126,10 +125,6 @@ public static List createMethodTestLoaders(Method method, TestLoader CitrusTestSource citrusTestAnnotation = method.getAnnotation(CitrusTestSource.class); methodTestLoaders.addAll(createMethodTestLoaders(method, citrusTestAnnotation.name(), citrusTestAnnotation.packageName(), citrusTestAnnotation.packageScan(), citrusTestAnnotation.sources(), provider, citrusTestAnnotation.type(), CitrusSettings.getTestFileNamePattern(citrusTestAnnotation.type()))); - } else if (method.getAnnotation(CitrusXmlTest.class) != null) { - CitrusXmlTest citrusTestAnnotation = method.getAnnotation(CitrusXmlTest.class); - methodTestLoaders.addAll(createMethodTestLoaders(method, citrusTestAnnotation.name(), citrusTestAnnotation.packageName(), - citrusTestAnnotation.packageScan(), citrusTestAnnotation.sources(), provider, TestLoader.SPRING, CitrusSettings.getTestFileNamePattern(TestLoader.SPRING))); } return methodTestLoaders; diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringMethodInterceptor.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringMethodInterceptor.java index 15ff342aec..ef52d26f4b 100644 --- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringMethodInterceptor.java +++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringMethodInterceptor.java @@ -25,8 +25,6 @@ import org.citrusframework.CitrusSettings; import org.citrusframework.annotations.CitrusTestSource; -import org.citrusframework.annotations.CitrusXmlTest; -import org.citrusframework.common.TestLoader; import org.citrusframework.spi.ClasspathResourceResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,37 +84,6 @@ public List intercept(List methods, ITestConte logger.error("Unable to locate file resources for test package '" + packageName + "'", e); } } - } else if (method.getMethod().getConstructorOrMethod().getMethod().getAnnotation(CitrusXmlTest.class) != null) { - CitrusXmlTest citrusXmlTestAnnotation = method.getMethod().getConstructorOrMethod().getMethod().getAnnotation(CitrusXmlTest.class); - if (citrusXmlTestAnnotation.name().length > 1) { - for (int i = 0; i < citrusXmlTestAnnotation.name().length; i++) { - if (i == 0) { - baseMethodAdded = true; - interceptedMethods.add(method); - } else { - interceptedMethods.add(new MethodInstance(method.getMethod())); - } - } - } - - String[] packagesToScan = citrusXmlTestAnnotation.packageScan(); - for (String packageName : packagesToScan) { - try { - for (String fileNamePattern : CitrusSettings.getTestFileNamePattern(TestLoader.SPRING)) { - Set fileResources = new ClasspathResourceResolver().getResources(packageName.replace('.', File.separatorChar), fileNamePattern); - for (int i = 0; i < fileResources.size(); i++) { - if (i == 0 && !baseMethodAdded) { - baseMethodAdded = true; - interceptedMethods.add(method); - } else { - interceptedMethods.add(new MethodInstance(method.getMethod())); - } - } - } - } catch (IOException e) { - logger.error("Unable to locate file resources for test package '" + packageName + "'", e); - } - } } } diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringSupport.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringSupport.java index f1a866c088..fde2140ede 100644 --- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringSupport.java +++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringSupport.java @@ -39,7 +39,6 @@ import org.citrusframework.annotations.CitrusAnnotations; import org.citrusframework.annotations.CitrusTest; import org.citrusframework.annotations.CitrusTestSource; -import org.citrusframework.annotations.CitrusXmlTest; import org.citrusframework.common.DefaultTestLoader; import org.citrusframework.common.TestLoader; import org.citrusframework.common.TestSourceAware; @@ -90,8 +89,7 @@ public void run(final IHookCallBack callBack, ITestResult testResult) { List methodTestLoaders = TestNGHelper.createMethodTestLoaders(method, this::createTestLoader); if (method.getAnnotation(CitrusTest.class) != null || - method.getAnnotation(CitrusTestSource.class) != null || - method.getAnnotation(CitrusXmlTest.class) != null) { + method.getAnnotation(CitrusTestSource.class) != null) { try { run(testResult, method, methodTestLoaders, testResult.getMethod().getCurrentInvocationCount()); testResult.setStatus(ITestResult.SUCCESS); @@ -127,60 +125,43 @@ protected void run(ITestResult testResult, Method method, List metho CitrusAnnotations.injectCitrusFramework(this, citrus); } - if (method.getAnnotation(CitrusXmlTest.class) != null) { - if (!methodTestLoaders.isEmpty()) { - TestContext ctx = prepareTestContext(citrus.getCitrusContext().createTestContext()); - TestLoader testLoader = methodTestLoaders.get(invocationCount % methodTestLoaders.size()); - CitrusAnnotations.injectAll(testLoader, citrus, ctx); - - testLoader.configureTestCase(t -> { - if (t instanceof TestGroupAware) { - ((TestGroupAware) t).setGroups(testResult.getMethod().getGroups()); - } - }); - testLoader.configureTestCase(t -> testCase = t); - - TestNGHelper.invokeTestMethod(this, testResult, method, testLoader, ctx, invocationCount); - } - } else { - try { - TestContext ctx = prepareTestContext(citrus.getCitrusContext().createTestContext()); + try { + TestContext ctx = prepareTestContext(citrus.getCitrusContext().createTestContext()); - TestCaseRunner runner = TestNGHelper.createTestCaseRunner(this, method, ctx); - runner.groups(testResult.getMethod().getGroups()); - testResult.setAttribute(TestNGHelper.BUILDER_ATTRIBUTE, runner); + TestCaseRunner runner = TestNGHelper.createTestCaseRunner(this, method, ctx); + runner.groups(testResult.getMethod().getGroups()); + testResult.setAttribute(TestNGHelper.BUILDER_ATTRIBUTE, runner); - delegate = runner; + delegate = runner; - CitrusAnnotations.injectAll(this, citrus, ctx); + CitrusAnnotations.injectAll(this, citrus, ctx); - TestLoader testLoader ; - if (method.getAnnotation(CitrusTestSource.class) != null && !methodTestLoaders.isEmpty()) { - testLoader = methodTestLoaders.get(invocationCount % methodTestLoaders.size()); + TestLoader testLoader ; + if (method.getAnnotation(CitrusTestSource.class) != null && !methodTestLoaders.isEmpty()) { + testLoader = methodTestLoaders.get(invocationCount % methodTestLoaders.size()); - if (testLoader instanceof TestSourceAware) { - String[] sources = method.getAnnotation(CitrusTestSource.class).sources(); - if (sources.length > 0) { - ((TestSourceAware) testLoader).setSource(sources[0]); - } + if (testLoader instanceof TestSourceAware) { + String[] sources = method.getAnnotation(CitrusTestSource.class).sources(); + if (sources.length > 0) { + ((TestSourceAware) testLoader).setSource(sources[0]); } - } else { - testLoader = new DefaultTestLoader(); } + } else { + testLoader = new DefaultTestLoader(); + } - CitrusAnnotations.injectAll(testLoader, citrus, ctx); - CitrusAnnotations.injectTestRunner(testLoader, runner); - testLoader.configureTestCase(t -> { - if (t instanceof TestGroupAware) { - ((TestGroupAware) t).setGroups(testResult.getMethod().getGroups()); - } - }); - testLoader.configureTestCase(t -> testCase = t); + CitrusAnnotations.injectAll(testLoader, citrus, ctx); + CitrusAnnotations.injectTestRunner(testLoader, runner); + testLoader.configureTestCase(t -> { + if (t instanceof TestGroupAware) { + ((TestGroupAware) t).setGroups(testResult.getMethod().getGroups()); + } + }); + testLoader.configureTestCase(t -> testCase = t); - TestNGHelper.invokeTestMethod(this, testResult, method, testLoader, ctx, invocationCount); - } finally { - testResult.removeAttribute(TestNGHelper.BUILDER_ATTRIBUTE); - } + TestNGHelper.invokeTestMethod(this, testResult, method, testLoader, ctx, invocationCount); + } finally { + testResult.removeAttribute(TestNGHelper.BUILDER_ATTRIBUTE); } } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgIT.java index 333a08bf73..7adf0bcd90 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.exceptions.CitrusRuntimeException; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ public class FailTestNgIT extends TestNGCitrusSpringSupport { @Test(groups = "org.citrusframework.ShouldFailGroup", expectedExceptions = CitrusRuntimeException.class) - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void FailTestNgIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionIT.java index 82686b5cfa..209513217b 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class AntRunActionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void AntRunActionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java index d34496850b..767ca45dc1 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class CreateVariablesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void CreateVariablesIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionIT.java index 59e1dd0cc8..0c3ee2006b 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ @Test public class EchoActionIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void EchoActionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionIT.java index 49e64c6762..14ffc73efd 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class FailActionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void FailActionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesIT.java index d85a72b872..531451894d 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class GlobalPropertiesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void GlobalPropertiesIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionIT.java index 46a5802819..66c949a82e 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class InputActionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void InputActionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/JavaActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/JavaActionIT.java index cfd4271991..92c55989cb 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/JavaActionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/JavaActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class JavaActionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void JavaActionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java index 1b6e78b92a..4908bf4045 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class LoadPropertiesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void LoadPropertiesIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionIT.java index a1296eec08..a52726c412 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SleepActionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SleepActionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StartStopServerActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StartStopServerActionIT.java index f9dbe29ca6..ac3374184b 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StartStopServerActionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StartStopServerActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class StartStopServerActionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void StartStopServerActionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeIT.java index a728b0d31d..d365347a46 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class StopTimeIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void StopTimeIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionIT.java index 7e241bba1f..5a0f93fd09 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.actions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class TransformActionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void TransformActionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/CitrusXmlAnnotationIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/CitrusXmlAnnotationIT.java index 04fd8cf378..861b461467 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/CitrusXmlAnnotationIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/CitrusXmlAnnotationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.annotation; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,15 +28,15 @@ @Test public class CitrusXmlAnnotationIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = { "SampleIT" }) + @CitrusTestSource(type = TestLoader.SPRING, name = { "SampleIT" }) public void CitrusXmlAnnotation_1_IT() {} - @CitrusXmlTest(name = { "EchoActionIT", "FailActionIT" }, packageName = "org.citrusframework.integration.actions") + @CitrusTestSource(type = TestLoader.SPRING, name = { "EchoActionIT", "FailActionIT" }, packageName = "org.citrusframework.integration.actions") public void CitrusXmlAnnotation_2_IT() {} - @CitrusXmlTest(packageScan = "org.citrusframework.integration.functions") + @CitrusTestSource(type = TestLoader.SPRING, packageScan = "org.citrusframework.integration.functions") public void CitrusXmlAnnotation_3_IT() {} - @CitrusXmlTest(sources = { "classpath:org/citrusframework/integration/actions/CreateVariablesIT.xml" }) + @CitrusTestSource(type = TestLoader.SPRING, sources = { "classpath:org/citrusframework/integration/actions/CreateVariablesIT.xml" }) public void CitrusXmlAnnotation_4_IT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/SampleIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/SampleIT.java index ae39a4ff46..b9b9c96382 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/SampleIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/SampleIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.annotation; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ public class SampleIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SampleIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertIT.java index e67dcbcef4..5b4cc58c88 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class AssertIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void AssertIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncFailIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncFailIT.java index 67c7f8d0a1..a223d19545 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncFailIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncFailIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.exceptions.TestCaseFailedException; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -27,6 +28,6 @@ public class AsyncFailIT extends TestNGCitrusSpringSupport { @Test(groups = "org.citrusframework.ShouldFailGroup", expectedExceptions = TestCaseFailedException.class) - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void AsyncFailIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncIT.java index f04895f270..2fcebd0a1e 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ public class AsyncIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void AsyncIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchIT.java index cbed385d24..30f50c591e 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class CatchIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void CatchIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ConditionalIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ConditionalIT.java index 7be71afff8..67d011d22d 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ConditionalIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ConditionalIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class ConditionalIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ConditionalIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateIT.java index c65a4574e5..1fa67ee350 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class IterateIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void IterateIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelIT.java index 6aa94e400f..29eed11330 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ParallelIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ParallelIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorIT.java index b7b2fedabf..72f26ab612 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class RepeatOnErrorIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void RepeatOnErrorIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueIT.java index 734e39b9af..00cf00a382 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class RepeatUntilTrueIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void RepeatUntilTrueIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialIT.java index 6fe5dda4ff..aeb40ad280 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class SequentialIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void SequentialIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TemplateIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TemplateIT.java index 04250c6e0f..6a1a7bd8e0 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TemplateIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TemplateIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class TemplateIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void TemplateIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerIT.java index 62cd8367fd..83ff815a1e 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class TimerIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void TimerIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerParallelIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerParallelIT.java index 6699dc358e..54e1a9778a 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerParallelIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerParallelIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.container; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class TimerParallelIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void TimerParallelIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/WaitIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/WaitIT.java index f79ffa18fb..4c954f34c3 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/WaitIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/WaitIT.java @@ -20,7 +20,8 @@ import java.net.InetSocketAddress; import java.util.concurrent.Executors; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import com.sun.net.httpserver.HttpServer; import org.testng.annotations.AfterClass; @@ -51,6 +52,6 @@ public void stopServer() { } @Test - @CitrusXmlTest(name = "WaitIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "WaitIT") public void waitIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/ConcatFunctionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/ConcatFunctionIT.java index 38c9d137f4..c0975c300a 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/ConcatFunctionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/ConcatFunctionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.functions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ConcatFunctionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ConcatFunctionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/CustomFunctionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/CustomFunctionIT.java index 6b433ff939..63bd1101cd 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/CustomFunctionIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/CustomFunctionIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.functions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class CustomFunctionIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void CustomFunctionIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/FunctionsIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/FunctionsIT.java index 906a609a6d..c0bc556d8f 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/FunctionsIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/FunctionsIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.functions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class FunctionsIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void FunctionsIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/DataProviderIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/DataProviderIT.java index 3b9f9f9599..bc5d73d5f7 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/DataProviderIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/DataProviderIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.parameter; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.citrusframework.testng.CitrusParameters; import org.testng.annotations.*; @@ -27,7 +28,7 @@ */ public class DataProviderIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) @CitrusParameters( "message" ) @Test(dataProvider = "citrusDataProvider") public void DataProviderIT(String message) { @@ -42,7 +43,7 @@ public Object[][] citrusDataProvider() { }; } - @CitrusXmlTest(name = "DataProviderIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "DataProviderIT") @CitrusParameters( "message" ) @Test(dataProvider = "namedDataProvider") public void DataProviderNameIT(String message) { diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/ParameterIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/ParameterIT.java index 7e63b7e3c8..e8f35c703f 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/ParameterIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/ParameterIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.parameter; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.citrusframework.testng.CitrusParameters; import org.testng.annotations.DataProvider; @@ -33,7 +34,7 @@ public Object[][] someDataProvider() { @Test(dataProvider = "someDataProvider") @CitrusParameters({"someVariable"}) - @CitrusXmlTest(name = "TestParameterIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "TestParameterIT") @SuppressWarnings("unused") public void test(String someVariable) { } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/validation/DateRangeValidationMatcherIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/validation/DateRangeValidationMatcherIT.java index cf02d11942..9c0e384d64 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/validation/DateRangeValidationMatcherIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/validation/DateRangeValidationMatcherIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.validation; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class DateRangeValidationMatcherIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void DateRangeValidationMatcherIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java index 151473ce55..51ba84b1f2 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.variables; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -30,6 +31,6 @@ */ public class GlobalVariablesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void GlobalVariablesIT() {} } diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/VariablesOrderIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/VariablesOrderIT.java index 29693868ae..270782d810 100644 --- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/VariablesOrderIT.java +++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/VariablesOrderIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.variables; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class VariablesOrderIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void VariablesOrderIT() {} } diff --git a/src/manual/endpoint-selenium.adoc b/src/manual/endpoint-selenium.adoc index e8019a0137..001ecdb10d 100644 --- a/src/manual/endpoint-selenium.adoc +++ b/src/manual/endpoint-selenium.adoc @@ -58,7 +58,7 @@ The Selenium browser component supports different browser types for the commonly * *custom* Html unit is the default browser type and represents a headless browser that executed without displaying the graphical user interface. In case you need a totally different browser or -you need to customize the Selenium web driver you can use the _browserType="custom"_ in combination with a web driver reference: +you need to customize the Selenium web driver you can use the _type="custom"_ in combination with a web driver reference: [source,xml] ---- diff --git a/src/manual/validation-xml.adoc b/src/manual/validation-xml.adoc index 0bbcd03b38..340210387e 100644 --- a/src/manual/validation-xml.adoc +++ b/src/manual/validation-xml.adoc @@ -1208,7 +1208,7 @@ comes in and tries to find a proper schema. ==== DTD validation XML DTD (document type definition) is another way to validate the structure of an XML document. Many people say that -DTD is deprecated and XML schema is the much more efficient way to describe the rules of an XML structure. We do not +DTD is outdated and XML schema is the much more efficient way to describe the rules of an XML structure. We do not disagree with that, but we also know that legacy systems might still use DTD. So in order to avoid validation errors we have to deal with DTD validation as well. diff --git a/tools/archetypes/jms/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java b/tools/archetypes/jms/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java index e18629bae8..e646f2ea60 100644 --- a/tools/archetypes/jms/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java +++ b/tools/archetypes/jms/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java @@ -2,7 +2,8 @@ import org.testng.annotations.Test; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; /** @@ -12,6 +13,6 @@ @Test public class HelloService_Ok_IT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HelloService_Ok_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HelloService_Ok_IT") public void helloServiceOk() {} } diff --git a/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleXmlIT.java b/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleXmlIT.java index 49df174e3e..dabfc5e00b 100644 --- a/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleXmlIT.java +++ b/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleXmlIT.java @@ -2,7 +2,8 @@ import org.testng.annotations.Test; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; /** @@ -13,6 +14,6 @@ @Test public class SampleXmlIT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "SampleXmlIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "SampleXmlIT") public void sampleXml() {} } diff --git a/tools/archetypes/soap/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java b/tools/archetypes/soap/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java index e18629bae8..e646f2ea60 100644 --- a/tools/archetypes/soap/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java +++ b/tools/archetypes/soap/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java @@ -2,7 +2,8 @@ import org.testng.annotations.Test; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; /** @@ -12,6 +13,6 @@ @Test public class HelloService_Ok_IT extends TestNGCitrusSpringSupport { - @CitrusXmlTest(name = "HelloService_Ok_IT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HelloService_Ok_IT") public void helloServiceOk() {} } diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/HttpRestDocsIT.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/HttpRestDocsIT.java index 2fac9695df..9321600d99 100644 --- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/HttpRestDocsIT.java +++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/HttpRestDocsIT.java @@ -16,7 +16,8 @@ package org.citrusframework.restdocs.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class HttpRestDocsIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest(name = "HttpRestDocsIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "HttpRestDocsIT") public void httpRestDocsIT() {} } diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/SoapRestDocsIT.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/SoapRestDocsIT.java index 03e7b3ee90..8013b9a9a7 100644 --- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/SoapRestDocsIT.java +++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/SoapRestDocsIT.java @@ -16,7 +16,8 @@ package org.citrusframework.restdocs.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class SoapRestDocsIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest(name = "SoapRestDocsIT") + @CitrusTestSource(type = TestLoader.SPRING, name = "SoapRestDocsIT") public void soapRestDocsIT() {} } diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/JavaTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/JavaTestGenerator.java index f6f40b5876..74a50e784e 100644 --- a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/JavaTestGenerator.java +++ b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/JavaTestGenerator.java @@ -16,21 +16,14 @@ package org.citrusframework.generate.javadsl; -import javax.lang.model.element.Modifier; import java.io.File; import java.io.IOException; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Stream; +import javax.lang.model.element.Modifier; -import org.citrusframework.TestCaseRunner; -import org.citrusframework.annotations.CitrusResource; -import org.citrusframework.annotations.CitrusXmlTest; -import org.citrusframework.exceptions.CitrusRuntimeException; -import org.citrusframework.generate.AbstractTestGenerator; -import org.citrusframework.generate.UnitFramework; -import org.citrusframework.util.FileUtils; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; @@ -39,6 +32,13 @@ import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import org.citrusframework.TestCaseRunner; +import org.citrusframework.annotations.CitrusResource; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.exceptions.CitrusRuntimeException; +import org.citrusframework.generate.AbstractTestGenerator; +import org.citrusframework.generate.UnitFramework; +import org.citrusframework.util.FileUtils; /** * @since 2.7.4 @@ -159,7 +159,8 @@ private MethodSpec getTestMethod(final String name) { * @return The AnnotationSpec for XML tests */ protected AnnotationSpec getCitrusAnnotation() { - return AnnotationSpec.builder(CitrusXmlTest.class) + return AnnotationSpec.builder(CitrusTestSource.class) + .addMember("type", "$S", "xml") .addMember("name", "$S", getName()) .build(); } diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/JsonGroovyValidationIT.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/JsonGroovyValidationIT.java index d5947ef43a..4e50a98a78 100644 --- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/JsonGroovyValidationIT.java +++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/JsonGroovyValidationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class JsonGroovyValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void JsonGroovyValidationIT() {} } diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ScriptMessageValidationIT.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ScriptMessageValidationIT.java index b4bd92ff0b..ad9f12c731 100644 --- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ScriptMessageValidationIT.java +++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ScriptMessageValidationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class ScriptMessageValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ScriptMessageValidationIT() {} } diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetIT.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetIT.java index a4d639ba25..bfc29cfe9f 100644 --- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetIT.java +++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ValidateSqlResultSetIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ValidateSqlResultSetIT() {} } diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/ConditionalIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/ConditionalIT.java index f06c1338d3..422c902781 100644 --- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/ConditionalIT.java +++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/ConditionalIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class ConditionalIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ConditionalIT() {} } diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java index 4c548aba25..7d71d8e364 100644 --- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java +++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class HamcrestValidationMatcherIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void HamcrestValidationMatcherIT() {} } diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/IterateIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/IterateIT.java index 60fa106ac9..bd0c38c72f 100644 --- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/IterateIT.java +++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/IterateIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class IterateIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void IterateIT() {} } diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatOnErrorIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatOnErrorIT.java index 7da5e3d0b1..e3758d7833 100644 --- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatOnErrorIT.java +++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatOnErrorIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class RepeatOnErrorIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void RepeatOnErrorIT() {} } diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatUntilTrueIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatUntilTrueIT.java index b08753f22b..c6a4fde2c4 100644 --- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatUntilTrueIT.java +++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatUntilTrueIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class RepeatUntilTrueIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void RepeatUntilTrueIT() {} } diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java index 4c548aba25..7d71d8e364 100644 --- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java +++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class HamcrestValidationMatcherIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void HamcrestValidationMatcherIT() {} } diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathSegmentVariableExtractorIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathSegmentVariableExtractorIT.java index 50aadba965..12298ce1bf 100644 --- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathSegmentVariableExtractorIT.java +++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathSegmentVariableExtractorIT.java @@ -1,12 +1,13 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; public class JsonPathSegmentVariableExtractorIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void JsonPathSegmentVariableExtractorIT() {} } diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathValidationIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathValidationIT.java index 38967836b6..65a219d0ee 100644 --- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathValidationIT.java +++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathValidationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class JsonPathValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void JsonPathValidationIT() {} } diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonTextValidationIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonTextValidationIT.java index b98c0a7bc8..65b5f1fc14 100644 --- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonTextValidationIT.java +++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonTextValidationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class JsonTextValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void JsonTextValidationIT() {} } diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/MessageValidationIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/MessageValidationIT.java index a82fc06f3e..057500fd0c 100644 --- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/MessageValidationIT.java +++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/MessageValidationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class MessageValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void MessageValidationIT() {} } diff --git a/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/MessageValidationIT.java b/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/MessageValidationIT.java index a82fc06f3e..057500fd0c 100644 --- a/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/MessageValidationIT.java +++ b/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/MessageValidationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class MessageValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void MessageValidationIT() {} } diff --git a/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/PlainTextValidationIT.java b/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/PlainTextValidationIT.java index 2633687f29..eaa29b801a 100644 --- a/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/PlainTextValidationIT.java +++ b/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/PlainTextValidationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class PlainTextValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void PlainTextValidationIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/DataDictionaryIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/DataDictionaryIT.java index 9da9fa36f9..41bbcb7b9b 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/DataDictionaryIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/DataDictionaryIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class DataDictionaryIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void DataDictionaryIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java index 4c548aba25..7d71d8e364 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class HamcrestValidationMatcherIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void HamcrestValidationMatcherIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/InlineVariablesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/InlineVariablesIT.java index 0ee22776ba..a27addb902 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/InlineVariablesIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/InlineVariablesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class InlineVariablesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void InlineVariablesIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/MessageValidationIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/MessageValidationIT.java index a82fc06f3e..057500fd0c 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/MessageValidationIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/MessageValidationIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class MessageValidationIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void MessageValidationIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ScriptVariablesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ScriptVariablesIT.java index db4b8b8cee..c5d064303f 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ScriptVariablesIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ScriptVariablesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ScriptVariablesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ScriptVariablesIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseVariablesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseVariablesIT.java index c3813343a1..37b6ade820 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseVariablesIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseVariablesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class UseVariablesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void UseVariablesIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseXPathVariablesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseXPathVariablesIT.java index ebd61c3c82..44aca8097d 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseXPathVariablesIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseXPathVariablesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class UseXPathVariablesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void UseXPathVariablesIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesIT.java index 04dae1fa4c..c2deb60767 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ValidateNamespacesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ValidateNamespacesIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesIT.java index 57b6d5363e..9b70a970c4 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ValidateValuesIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ValidateValuesIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesWithNamespaceIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesWithNamespaceIT.java index 08a5820869..287416f8aa 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesWithNamespaceIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesWithNamespaceIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ValidateValuesWithNamespaceIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ValidateValuesWithNamespaceIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataIT.java index e4108688f1..1dea2b25ca 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ValidateXMLDataIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ValidateXMLDataIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXmlCombinedIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXmlCombinedIT.java index f5e54c38b2..44407c3bcd 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXmlCombinedIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXmlCombinedIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class ValidateXmlCombinedIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void ValidateXmlCombinedIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XMLValidationMatcherIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XMLValidationMatcherIT.java index 41c315bc6b..50c0c1bdc3 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XMLValidationMatcherIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XMLValidationMatcherIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -26,6 +27,6 @@ */ public class XMLValidationMatcherIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void XMLValidationMatcherIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XpathSegmentVariableExtractorIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XpathSegmentVariableExtractorIT.java index a427291e25..1c2cc39877 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XpathSegmentVariableExtractorIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XpathSegmentVariableExtractorIT.java @@ -1,12 +1,13 @@ package org.citrusframework.integration; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; public class XpathSegmentVariableExtractorIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void XpathSegmentVariableExtractorIT() {} } diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/functions/XmlFunctionsIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/functions/XmlFunctionsIT.java index bb0dbf088e..f053298b9f 100644 --- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/functions/XmlFunctionsIT.java +++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/functions/XmlFunctionsIT.java @@ -16,7 +16,8 @@ package org.citrusframework.integration.functions; -import org.citrusframework.annotations.CitrusXmlTest; +import org.citrusframework.annotations.CitrusTestSource; +import org.citrusframework.common.TestLoader; import org.citrusframework.testng.spring.TestNGCitrusSpringSupport; import org.testng.annotations.Test; @@ -25,6 +26,6 @@ */ public class XmlFunctionsIT extends TestNGCitrusSpringSupport { @Test - @CitrusXmlTest + @CitrusTestSource(type = TestLoader.SPRING) public void XmlFunctionsIT() {} }