Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix YAKS tests for 4.4.0-SNAPSHOT #1863

Merged
merged 1 commit into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/camel-kamelets-itest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-spring</artifactId>
<artifactId>cucumber-java</artifactId>
<version>${cucumber.version}</version>
<scope>test</scope>
</dependency>
Expand Down
5 changes: 0 additions & 5 deletions tests/camel-kamelets-itest/src/test/java/KameletsYaksIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,8 @@

import io.cucumber.junit.Cucumber;
import io.cucumber.junit.CucumberOptions;
import io.cucumber.spring.CucumberContextConfiguration;
import org.citrusframework.config.CitrusSpringConfig;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;

@CucumberContextConfiguration
@ContextConfiguration(classes = CitrusSpringConfig.class)
@RunWith(Cucumber.class)
@CucumberOptions(
extraGlue = "org.citrusframework.yaks",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
apiVersion: camel.apache.org/v1
name: timer-source
properties:
period: 5000
period: 10000
contentType: application/json
message: >
${user}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
apiVersion: camel.apache.org/v1
name: timer-source
properties:
period: 5000
period: 10000
contentType: application/json
message: >
${user}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ spec:
properties:
scheme: "http"
format: "application-cloudevents"
- ref:
kind: Kamelet
apiVersion: camel.apache.org/v1
name: data-type-action
properties:
scheme: "text"
format: "plain"
- ref:
kind: Kamelet
apiVersion: camel.apache.org/v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Feature: AWS S3 Source - Http sink
| ce-source | aws.s3.bucket.${aws.s3.bucketNameOrArn} |
| ce-type | org.apache.camel.event.aws.s3.getObject |
| ce-time | @notEmpty()@ |
| Content-Type | application/json;charset=UTF-8 |
| Content-Type | text/plain; charset=UTF-8 |
When receive POST /incoming
Then send HTTP 201 CREATED

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ citrus.type.converter=camel
yaks.cluster.type=local
yaks.camelk.max.attempts=10

yaks.jbang.camel.version=4.3.0
yaks.jbang.camel.version=4.4.0-SNAPSHOT
yaks.jbang.kamelets.version=4.4.0-SNAPSHOT

yaks.jbang.kamelets.local.dir=../../../kamelets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#

cucumber.object-factory=org.citrusframework.cucumber.backend.spring.CitrusSpringObjectFactory
cucumber.object-factory=org.citrusframework.cucumber.backend.CitrusObjectFactory
cucumber.publish.quiet=true

cucumber.filter.tags=not @ignored and not @knative
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
apiVersion: camel.apache.org/v1
name: timer-source
properties:
period: 5000
period: 10000
contentType: application/json
message: >
${input}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
apiVersion: camel.apache.org/v1
name: timer-source
properties:
period: 5000
period: 10000
contentType: application/json
message: >
${input}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
apiVersion: camel.apache.org/v1
name: timer-source
properties:
period: 5000
period: 10000
contentType: application/json
message: >
${input}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
apiVersion: camel.apache.org/v1
name: timer-source
properties:
period: 5000
period: 10000
contentType: application/json
message: ${message}
sink:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
apiVersion: camel.apache.org/v1
kind: Pipe
metadata:
name: timer-to-http
name: timer-to-http-pipe
spec:
source:
ref:
kind: Kamelet
apiVersion: camel.apache.org/v1
name: timer-source
properties:
period: 10000
message: "${message}"
sink:
uri: yaks:resolveURL('test-service')/events
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

// camel-k: language=groovy

from('timer:tick?period=5000')
from('timer:tick?period=10000')
.setHeader("CamelHttpMethod", constant("PUT"))
.setBody().constant('{{message}}')
.to('yaks:resolveURL(test-service)/messages')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ Feature: Timer Source Kamelet
Scenario: Create Kamelet binding
And variables
| message | Hello World |
Given load Pipe timer-to-http.yaml
Then Pipe timer-to-http should be available
Then Camel K integration timer-to-http should be running
And Camel K integration timer-to-http should print Routes startup
Given load Pipe timer-to-http-pipe.yaml
Then Pipe timer-to-http-pipe should be available
Then Camel K integration timer-to-http-pipe should be running
And Camel K integration timer-to-http-pipe should print Routes startup

Scenario: Verify binding
Given expect HTTP request body: Hello World
When receive POST /events
Then send HTTP 200 OK

Scenario: Remove Camel K resources
Given delete Pipe timer-to-http
Given delete Pipe timer-to-http-pipe
And delete Kubernetes service test-service
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ Feature: Verify Camel K integrations

Scenario: Remove Camel K resources
Given delete Camel K integration timer-to-http
And delete Kubernetes service test-service
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ config:
- name: INTEGRATION_LOGS
level: INFO
resources:
- ../timer-to-http.yaml
- ../timer-to-http-pipe.yaml
- ../timer-to-http.groovy
- ../timer-to-http.properties
dump:
Expand Down
Loading