Skip to content

Commit

Permalink
Merge branch 'citrusframework:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
tschlat authored Nov 28, 2023
2 parents f27a850 + 4f5b9ff commit b6d9bc0
Show file tree
Hide file tree
Showing 182 changed files with 2,800 additions and 1,410 deletions.
2 changes: 1 addition & 1 deletion .github/project.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Citrus Framework
release:
current-version: 4.0.0
current-version: 4.0.2
next-version: 4.1.0-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-3.3.1.
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-3.4.0.xsd=com/consol/citrus/schema/citrus-docker-config-3.4.0.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-4.0.0-M1.xsd=org/citrusframework/schema/citrus-docker-config-4.0.0-M1.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-4.0.0-M2.xsd=org/citrusframework/schema/citrus-docker-config-4.0.0-M2.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-4.1.0-SNAPSHOT-M1.xsd=org/citrusframework/schema/citrus-docker-config-4.1.0-SNAPSHOT-M1.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-4.1.0-SNAPSHOT-M2.xsd=org/citrusframework/schema/citrus-docker-config-4.1.0-SNAPSHOT-M2.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-docker-config-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-4.0.0.xsd=org/citrusframework/schema/citrus-docker-config-4.0.0.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-4.0.1.xsd=org/citrusframework/schema/citrus-docker-config-4.0.1.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-4.0.2.xsd=org/citrusframework/schema/citrus-docker-config-4.0.2.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-docker-config-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/docker/config/citrus-docker-config.xsd=org/citrusframework/schema/citrus-docker-config.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-2.3.xsd=com/consol/citrus/schema/citrus-docker-testcase-2.3.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-2.4.xsd=com/consol/citrus/schema/citrus-docker-testcase-2.4.xsd
Expand Down Expand Up @@ -67,8 +67,8 @@ http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-3.
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-3.4.0.xsd=com/consol/citrus/schema/citrus-docker-testcase-3.4.0.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-4.0.0-M1.xsd=org/citrusframework/schema/citrus-docker-testcase-4.0.0-M1.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-4.0.0-M2.xsd=org/citrusframework/schema/citrus-docker-testcase-4.0.0-M2.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-4.1.0-SNAPSHOT-M1.xsd=org/citrusframework/schema/citrus-docker-testcase-4.1.0-SNAPSHOT-M1.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-4.1.0-SNAPSHOT-M2.xsd=org/citrusframework/schema/citrus-docker-testcase-4.1.0-SNAPSHOT-M2.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-docker-testcase-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-4.0.0.xsd=org/citrusframework/schema/citrus-docker-testcase-4.0.0.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-4.0.1.xsd=org/citrusframework/schema/citrus-docker-testcase-4.0.1.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-4.0.2.xsd=org/citrusframework/schema/citrus-docker-testcase-4.0.2.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-docker-testcase-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/docker/testcase/citrus-docker-testcase.xsd=org/citrusframework/schema/citrus-docker-testcase.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-confi
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-3.4.0.xsd=com/consol/citrus/schema/citrus-kubernetes-config-3.4.0.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-4.0.0-M1.xsd=org/citrusframework/schema/citrus-kubernetes-config-4.0.0-M1.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-4.0.0-M2.xsd=org/citrusframework/schema/citrus-kubernetes-config-4.0.0-M2.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-4.1.0-SNAPSHOT-M1.xsd=org/citrusframework/schema/citrus-kubernetes-config-4.1.0-SNAPSHOT-M1.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-4.1.0-SNAPSHOT-M2.xsd=org/citrusframework/schema/citrus-kubernetes-config-4.1.0-SNAPSHOT-M2.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-kubernetes-config-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-4.0.0.xsd=org/citrusframework/schema/citrus-kubernetes-config-4.0.0.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-4.0.1.xsd=org/citrusframework/schema/citrus-kubernetes-config-4.0.1.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-4.0.2.xsd=org/citrusframework/schema/citrus-kubernetes-config-4.0.2.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-kubernetes-config-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/kubernetes/config/citrus-kubernetes-config.xsd=org/citrusframework/schema/citrus-kubernetes-config.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-2.7.1.xsd=com/consol/citrus/schema/citrus-kubernetes-testcase-2.7.1.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-2.7.2.xsd=com/consol/citrus/schema/citrus-kubernetes-testcase-2.7.2.xsd
Expand All @@ -51,8 +51,8 @@ http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-tes
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-3.4.0.xsd=com/consol/citrus/schema/citrus-kubernetes-testcase-3.4.0.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-4.0.0-M1.xsd=org/citrusframework/schema/citrus-kubernetes-testcase-4.0.0-M1.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-4.0.0-M2.xsd=org/citrusframework/schema/citrus-kubernetes-testcase-4.0.0-M2.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-4.1.0-SNAPSHOT-M1.xsd=org/citrusframework/schema/citrus-kubernetes-testcase-4.1.0-SNAPSHOT-M1.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-4.1.0-SNAPSHOT-M2.xsd=org/citrusframework/schema/citrus-kubernetes-testcase-4.1.0-SNAPSHOT-M2.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-kubernetes-testcase-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-4.0.0.xsd=org/citrusframework/schema/citrus-kubernetes-testcase-4.0.0.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-4.0.1.xsd=org/citrusframework/schema/citrus-kubernetes-testcase-4.0.1.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-4.0.2.xsd=org/citrusframework/schema/citrus-kubernetes-testcase-4.0.2.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-kubernetes-testcase-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/kubernetes/testcase/citrus-kubernetes-testcase.xsd=org/citrusframework/schema/citrus-kubernetes-testcase.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-3.
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-3.4.0.xsd=com/consol/citrus/schema/citrus-selenium-config-3.4.0.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-4.0.0-M1.xsd=org/citrusframework/schema/citrus-selenium-config-4.0.0-M1.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-4.0.0-M2.xsd=org/citrusframework/schema/citrus-selenium-config-4.0.0-M2.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-4.1.0-SNAPSHOT-M1.xsd=org/citrusframework/schema/citrus-selenium-config-4.1.0-SNAPSHOT-M1.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-4.1.0-SNAPSHOT-M2.xsd=org/citrusframework/schema/citrus-selenium-config-4.1.0-SNAPSHOT-M2.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-selenium-config-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-4.0.0.xsd=org/citrusframework/schema/citrus-selenium-config-4.0.0.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-4.0.1.xsd=org/citrusframework/schema/citrus-selenium-config-4.0.1.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-4.0.2.xsd=org/citrusframework/schema/citrus-selenium-config-4.0.2.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-selenium-config-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/selenium/config/citrus-selenium-config.xsd=org/citrusframework/schema/citrus-selenium-config.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-2.7.1.xsd=com/consol/citrus/schema/citrus-selenium-testcase-2.7.1.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-2.7.2.xsd=com/consol/citrus/schema/citrus-selenium-testcase-2.7.2.xsd
Expand All @@ -51,8 +51,8 @@ http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcas
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-3.4.0.xsd=com/consol/citrus/schema/citrus-selenium-testcase-3.4.0.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-4.0.0-M1.xsd=org/citrusframework/schema/citrus-selenium-testcase-4.0.0-M1.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-4.0.0-M2.xsd=org/citrusframework/schema/citrus-selenium-testcase-4.0.0-M2.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-4.1.0-SNAPSHOT-M1.xsd=org/citrusframework/schema/citrus-selenium-testcase-4.1.0-SNAPSHOT-M1.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-4.1.0-SNAPSHOT-M2.xsd=org/citrusframework/schema/citrus-selenium-testcase-4.1.0-SNAPSHOT-M2.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-selenium-testcase-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-4.0.0.xsd=org/citrusframework/schema/citrus-selenium-testcase-4.0.0.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-4.0.1.xsd=org/citrusframework/schema/citrus-selenium-testcase-4.0.1.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-4.0.2.xsd=org/citrusframework/schema/citrus-selenium-testcase-4.0.2.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase-4.1.0-SNAPSHOT.xsd=org/citrusframework/schema/citrus-selenium-testcase-4.1.0-SNAPSHOT.xsd
http\://www.citrusframework.org/schema/selenium/testcase/citrus-selenium-testcase.xsd=org/citrusframework/schema/citrus-selenium-testcase.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.testng.annotations.BeforeClass;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -67,6 +68,10 @@ protected TestContext createTestContext() {
CitrusAnnotations.parseConfiguration(invocationOnMock.getArgument(0, Object.class), citrusContext);
return null;
}).when(citrusContext).parseConfiguration((Object) any());
doAnswer(invocationOnMock-> {
context.getReferenceResolver().bind(invocationOnMock.getArgument(0), invocationOnMock.getArgument(1));
return null;
}).when(citrusContext).addComponent(anyString(), any());
CitrusAnnotations.injectAll(this, citrus, context);
return context;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.testng.annotations.BeforeClass;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -62,6 +63,10 @@ protected TestContext createTestContext() {
CitrusAnnotations.parseConfiguration(invocationOnMock.getArgument(0, Object.class), citrusContext);
return null;
}).when(citrusContext).parseConfiguration((Object) any());
doAnswer(invocationOnMock-> {
context.getReferenceResolver().bind(invocationOnMock.getArgument(0), invocationOnMock.getArgument(1));
return null;
}).when(citrusContext).addComponent(anyString(), any());
CitrusAnnotations.injectAll(this, citrus, context);
return context;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.testng.annotations.BeforeClass;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -62,6 +63,10 @@ protected TestContext createTestContext() {
CitrusAnnotations.parseConfiguration(invocationOnMock.getArgument(0, Object.class), citrusContext);
return null;
}).when(citrusContext).parseConfiguration((Object) any());
doAnswer(invocationOnMock-> {
context.getReferenceResolver().bind(invocationOnMock.getArgument(0), invocationOnMock.getArgument(1));
return null;
}).when(citrusContext).addComponent(anyString(), any());
CitrusAnnotations.injectAll(this, citrus, context);
return context;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ public void testExecutePLSQLBuilderWithTransaction() {
@Test
public void testExecutePLSQLBuilderWithSQLResource() throws IOException {
reset(jdbcTemplate, sqlResource);
when(sqlResource.exists()).thenReturn(true);
when(sqlResource.getInputStream()).thenReturn(new ByteArrayInputStream(("TEST_STMT_1\n" +
"/\n" +
"TEST_STMT_2\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@

package org.citrusframework.actions.dsl;

import java.io.File;
import java.io.IOException;

import org.citrusframework.DefaultTestCaseRunner;
import org.citrusframework.TestCase;
import org.citrusframework.UnitTestSupport;
import org.citrusframework.actions.ExecuteSQLAction;
import org.citrusframework.spi.Resource;
import org.citrusframework.spi.Resources;
import org.mockito.Mockito;
import org.springframework.jdbc.core.JdbcTemplate;
Expand All @@ -42,8 +40,6 @@
public class ExecuteSQLTestActionBuilderTest extends UnitTestSupport {
private final JdbcTemplate jdbcTemplate = Mockito.mock(JdbcTemplate.class);
private final PlatformTransactionManager transactionManager = Mockito.mock(PlatformTransactionManager.class);
private final Resource resource = Mockito.mock(Resource.class);
private final File file = Mockito.mock(File.class);

@Test
public void testExecuteSQLBuilderWithStatement() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.testng.annotations.BeforeClass;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -67,6 +68,10 @@ protected TestContext createTestContext() {
CitrusAnnotations.parseConfiguration(invocationOnMock.getArgument(0, Object.class), citrusContext);
return null;
}).when(citrusContext).parseConfiguration((Object) any());
doAnswer(invocationOnMock-> {
context.getReferenceResolver().bind(invocationOnMock.getArgument(0), invocationOnMock.getArgument(1));
return null;
}).when(citrusContext).addComponent(anyString(), any());
CitrusAnnotations.injectAll(this, citrus, context);
return context;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.testng.annotations.BeforeClass;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -64,6 +65,10 @@ protected TestContext createTestContext() {
CitrusAnnotations.parseConfiguration(invocationOnMock.getArgument(0, Object.class), citrusContext);
return null;
}).when(citrusContext).parseConfiguration((Object) any());
doAnswer(invocationOnMock-> {
context.getReferenceResolver().bind(invocationOnMock.getArgument(0), invocationOnMock.getArgument(1));
return null;
}).when(citrusContext).addComponent(anyString(), any());
CitrusAnnotations.injectAll(this, citrus, context);
return context;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.testng.annotations.BeforeClass;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -64,6 +65,10 @@ protected TestContext createTestContext() {
CitrusAnnotations.parseConfiguration(invocationOnMock.getArgument(0, Object.class), citrusContext);
return null;
}).when(citrusContext).parseConfiguration((Object) any());
doAnswer(invocationOnMock-> {
context.getReferenceResolver().bind(invocationOnMock.getArgument(0), invocationOnMock.getArgument(1));
return null;
}).when(citrusContext).addComponent(anyString(), any());
CitrusAnnotations.injectAll(this, citrus, context);
return context;
}
Expand Down
Loading

0 comments on commit b6d9bc0

Please sign in to comment.