From 50bc4d3ad818b165ab3a36b0b10b85e1b7b1843a Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Fri, 6 Jan 2023 16:49:14 +0200 Subject: [PATCH] Added TODOs update versions. --- ...ElasticsearchConsumerApplicationTests.java | 49 ++++--------------- .../RedisMessageStoreAggregatorTests.java | 2 +- .../mail/AbstractMailSupplierTests.java | 2 +- .../cloud/fn/supplier/mail/ImapFailTests.java | 2 +- .../fn/supplier/mail/ImapIdleFailTests.java | 2 +- .../fn/supplier/mail/ImapIdlePassTests.java | 2 +- .../cloud/fn/supplier/mail/ImapPassTests.java | 2 +- .../cloud/fn/supplier/mail/Pop3FailTests.java | 2 +- .../cloud/fn/supplier/mail/Pop3PassTests.java | 2 +- 9 files changed, 18 insertions(+), 47 deletions(-) diff --git a/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java b/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java index cea3c7d0..3bd96288 100644 --- a/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java +++ b/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java @@ -28,11 +28,10 @@ import co.elastic.clients.elasticsearch.core.GetRequest; import co.elastic.clients.elasticsearch.core.GetResponse; import co.elastic.clients.json.JsonData; import org.awaitility.Awaitility; -import org.elasticsearch.xcontent.XContentBuilder; -import org.elasticsearch.xcontent.XContentFactory; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.testcontainers.elasticsearch.ElasticsearchContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -61,6 +60,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @Tag("integration") @Testcontainers(disabledWithoutDocker = true) public class ElasticsearchConsumerApplicationTests { + private static final Logger log = LoggerFactory.getLogger(ElasticsearchConsumerApplicationTests.class); @Container static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer( @@ -107,7 +107,7 @@ public class ElasticsearchConsumerApplicationTests { + "\"fullName\":\"John Doe\"}"; final Message message = MessageBuilder.withPayload(jsonObject) .setHeader(ElasticsearchConsumerConfiguration.INDEX_ID_HEADER, "2").build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); @@ -133,7 +133,7 @@ public class ElasticsearchConsumerApplicationTests { jsonMap.put("dateOfBirth", 1471466076564L); jsonMap.put("fullName", "John Doe"); final Message> message = MessageBuilder.withPayload(jsonMap).build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); final GetRequest getRequest = new GetRequest.Builder().index("foo").id("3").build(); @@ -151,35 +151,6 @@ public class ElasticsearchConsumerApplicationTests { }); } - @Test - @Disabled - public void testXContentBuilder() { - this.contextRunner - .withPropertyValues("elasticsearch.consumer.index=foo", "elasticsearch.consumer.id=4", - "spring.elasticsearch.rest.uris=http://" + elasticsearch.getHttpHostAddress()) - .run(context -> { - Consumer> elasticsearchConsumer = context.getBean("elasticsearchConsumer", Consumer.class); - - XContentBuilder builder = XContentFactory.jsonBuilder(); - builder.startObject(); - builder.field("user", "kimchy"); - builder.timeField("postDate", 1471466076564L); - builder.field("message", "trying out Elasticsearch"); - builder.endObject(); - - final Message message = MessageBuilder.withPayload(builder).build(); - - elasticsearchConsumer.accept(message); - - final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); - final GetRequest getRequest = new GetRequest.Builder().index("foo").id("4").build(); - - final GetResponse response = elasticsearchClient.get(getRequest, String.class); - assertThat(response.found()).isTrue(); - - assertThat(response.source()).isEqualTo(builder.toString()); - }); - } @Test public void testAsyncIndexing() { this.contextRunner @@ -192,7 +163,7 @@ public class ElasticsearchConsumerApplicationTests { final String jsonObject = "{\"age\":10,\"dateOfBirth\":1471466076564," + "\"fullName\":\"John Doe\"}"; final Message message = MessageBuilder.withPayload(jsonObject).build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); @@ -228,7 +199,7 @@ public class ElasticsearchConsumerApplicationTests { + "\"fullName\":\"John Doe\"}") .setHeader(ElasticsearchConsumerConfiguration.INDEX_ID_HEADER, Integer.toString(i)) .build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); } @@ -275,9 +246,9 @@ public class ElasticsearchConsumerApplicationTests { final Message message = builder.build(); if (i < properties.getBatchSize() - 1) { + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); - } - else { + } else { // last invocation assertThatIllegalStateException() .isThrownBy(() -> elasticsearchConsumer.accept(message)) @@ -304,7 +275,7 @@ public class ElasticsearchConsumerApplicationTests { .setHeader(ElasticsearchConsumerConfiguration.INDEX_ID_HEADER, "2") .setHeader(ElasticsearchConsumerConfiguration.INDEX_NAME_HEADER, dynamicIndex) .build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); diff --git a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java b/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java index c53f671a..8091aaee 100644 --- a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java +++ b/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Artem Bilan */ @TestPropertySource(properties = "aggregator.message-store-type=redis") -@Disabled("Needs real Redis Server to be run") +@Disabled("Needs real Redis Server to be run") // TODO add redis test container public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests { @Test diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java index 24c48f4e..617dfced 100644 --- a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java +++ b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java @@ -34,7 +34,7 @@ import org.springframework.test.annotation.DirtiesContext; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container solution @SpringIntegrationTest(noAutoStartup = "*") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "mail.supplier.mark-as-read=true", diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java index b5d9154a..0a27c049 100644 --- a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java +++ b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java @@ -30,7 +30,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = { "mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX", "mail.supplier.charset=cp1251"}) diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdleFailTests.java b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdleFailTests.java index f901c82f..144300f9 100644 --- a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdleFailTests.java +++ b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdleFailTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = { "mail.supplier.idle-imap=true", "mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX"}) diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java index 34dbad71..dd25e4da 100644 --- a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java +++ b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = { "mail.supplier.idle-imap=true", "mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX"}) diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java index 6e3c268d..bacc200a 100644 --- a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java +++ b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java @@ -31,7 +31,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = "mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX") public class ImapPassTests extends AbstractMailSupplierTests { diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java index c8c022fa..8ec32fdd 100644 --- a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java +++ b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = "mail.supplier.url=pop3://user:pw@localhost:${test.mail.server.port}/INBOX") public class Pop3FailTests extends AbstractMailSupplierTests { diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java index 943b1348..0b465d38 100644 --- a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java +++ b/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = "mail.supplier.url=pop3://user:pw@localhost:${test.mail.server.port}/INBOX") public class Pop3PassTests extends AbstractMailSupplierTests {