From 30afdffb7215ca92fabbb6f500cc0b18989c0572 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 8 Oct 2024 11:08:17 -0400 Subject: [PATCH] Fix `CassandraContainerTest` for latest Testcontainers * Fix `HttpRequestExecutingMessageHandlerTests` for latest SF --- .../integration/cassandra/CassandraContainerTest.java | 6 +++--- .../outbound/HttpRequestExecutingMessageHandlerTests.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/CassandraContainerTest.java b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/CassandraContainerTest.java index 9adc19636a..ca24b69fbd 100644 --- a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/CassandraContainerTest.java +++ b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/CassandraContainerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 the original author or authors. + * Copyright 2022-2024 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. @@ -17,7 +17,7 @@ package org.springframework.integration.cassandra; import org.junit.jupiter.api.BeforeAll; -import org.testcontainers.containers.CassandraContainer; +import org.testcontainers.cassandra.CassandraContainer; import org.testcontainers.junit.jupiter.Testcontainers; /** @@ -34,7 +34,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; @Testcontainers(disabledWithoutDocker = true) public interface CassandraContainerTest { - CassandraContainer CASSANDRA_CONTAINER = new CassandraContainer<>("cassandra:4.1"); + CassandraContainer CASSANDRA_CONTAINER = new CassandraContainer("cassandra"); @BeforeAll static void startContainer() { diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java index c8ba17c785..33318a8522 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java @@ -764,7 +764,7 @@ public class HttpRequestExecutingMessageHandlerTests { .isThrownBy(() -> handler.handleMessage(new GenericMessage<>("queues/%2f/si.test.queue?foo#bar"))); assertThat(restTemplate.actualUrl.get()) - .isEqualTo("https://my.rabbitmq.com/api/queues/%2f/si.test.queue?foo#bar"); + .isEqualTo("https://my.RabbitMQ.com/api/queues/%2f/si.test.queue?foo#bar"); } @Test