From 1d0ca608ab432cbedf90a2d102b4af207ae88952 Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Mon, 28 Mar 2022 15:32:01 +0200 Subject: [PATCH] dmaap-adaptor Removed code smells. Improved coverage Signed-off-by: PatrikBuhr Issue-ID: NONRTRIC-735 Change-Id: I391df1746af764c9e188f2269d7855758b36750c --- config/keystore.jks | Bin 4987 -> 5019 bytes config/truststore.jks | Bin 3683 -> 3699 bytes .../dmaapadapter/clients/AsyncRestClientFactory.java | 3 +-- .../java/org/oran/dmaapadapter/ApplicationTest.java | 5 +++-- .../org/oran/dmaapadapter/IntegrationWithIcs.java | 7 +------ .../org/oran/dmaapadapter/IntegrationWithKafka.java | 13 +++++++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config/keystore.jks b/config/keystore.jks index 122997ac7b9ad8a58b7a167916bfdf808f3f3e4b..675785b465ecfe18399cf7adbf20e63e4377ab61 100644 GIT binary patch delta 4926 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 aM5GGd;7!~Jbu-J3m;4syI)wrQ0fwN4UICH- delta 3588 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 K assertThat(consumer.receivedBodies.size()).isEqualTo(1)); + await().untilAsserted(() -> assertThat(consumer.receivedBodies).hasSize(1)); assertThat(consumer.receivedBodies.get(0)).isEqualTo("[\"data\"]"); // Test send an exception @@ -304,7 +305,7 @@ class ApplicationTest { DmaapSimulatorController.dmaapResponses.add("DmaapResponse1"); DmaapSimulatorController.dmaapResponses.add("DmaapResponse2"); ConsumerController.TestResults consumer = this.consumerController.testResults; - await().untilAsserted(() -> assertThat(consumer.receivedBodies.size()).isEqualTo(2)); + await().untilAsserted(() -> assertThat(consumer.receivedBodies).hasSize(2)); assertThat(consumer.receivedBodies.get(0)).isEqualTo("DmaapResponse1"); String jobUrl = baseUrl() + ProducerCallbacksController.JOB_URL; diff --git a/src/test/java/org/oran/dmaapadapter/IntegrationWithIcs.java b/src/test/java/org/oran/dmaapadapter/IntegrationWithIcs.java index 9f0ef19..559b144 100644 --- a/src/test/java/org/oran/dmaapadapter/IntegrationWithIcs.java +++ b/src/test/java/org/oran/dmaapadapter/IntegrationWithIcs.java @@ -38,7 +38,6 @@ import org.oran.dmaapadapter.configuration.ImmutableWebClientConfig; import org.oran.dmaapadapter.configuration.WebClientConfig; import org.oran.dmaapadapter.configuration.WebClientConfig.HttpProxyConfig; import org.oran.dmaapadapter.r1.ConsumerJobInfo; -import org.oran.dmaapadapter.repository.InfoTypes; import org.oran.dmaapadapter.repository.Job; import org.oran.dmaapadapter.repository.Jobs; import org.oran.dmaapadapter.tasks.ProducerRegstrationTask; @@ -53,7 +52,6 @@ import org.springframework.http.HttpStatus; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; - @SuppressWarnings("java:S3577") // Rename class @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT) @@ -77,9 +75,6 @@ class IntegrationWithIcs { @Autowired private Jobs jobs; - @Autowired - private InfoTypes types; - @Autowired private ConsumerController consumerController; @@ -262,7 +257,7 @@ class IntegrationWithIcs { DmaapSimulatorController.dmaapResponses.add("Junk"); ConsumerController.TestResults results = this.consumerController.testResults; - await().untilAsserted(() -> assertThat(results.receivedBodies.size()).isEqualTo(2)); + await().untilAsserted(() -> assertThat(results.receivedBodies).hasSize(2)); assertThat(results.receivedBodies.get(0)).isEqualTo("DmaapResponse1"); deleteInformationJobInIcs(DMAAP_JOB_ID); diff --git a/src/test/java/org/oran/dmaapadapter/IntegrationWithKafka.java b/src/test/java/org/oran/dmaapadapter/IntegrationWithKafka.java index 5a48d61..f637917 100644 --- a/src/test/java/org/oran/dmaapadapter/IntegrationWithKafka.java +++ b/src/test/java/org/oran/dmaapadapter/IntegrationWithKafka.java @@ -242,12 +242,17 @@ class IntegrationWithKafka { private void verifiedReceivedByConsumer(String... strings) { ConsumerController.TestResults consumer = this.consumerController.testResults; - await().untilAsserted(() -> assertThat(consumer.receivedBodies.size()).isEqualTo(strings.length)); + await().untilAsserted(() -> assertThat(consumer.receivedBodies).hasSize(strings.length)); for (String s : strings) { assertTrue(consumer.hasReceived(s)); } } + @SuppressWarnings("squid:S2925") // "Thread.sleep" should not be used in tests. + private static void sleep(long millis) throws InterruptedException { + Thread.sleep(millis); + } + @Test void simpleCase() throws InterruptedException { final String JOB_ID = "ID"; @@ -259,7 +264,7 @@ class IntegrationWithKafka { this.icsSimulatorController.addJob(consumerJobInfo(null, Duration.ZERO, 0, 1), JOB_ID, restClient()); await().untilAsserted(() -> assertThat(this.jobs.size()).isEqualTo(1)); - Thread.sleep(4000); + sleep(4000); var dataToSend = Flux.just(senderRecord("Message")); sendDataToStream(dataToSend); @@ -287,7 +292,7 @@ class IntegrationWithKafka { await().untilAsserted(() -> assertThat(this.jobs.size()).isEqualTo(2)); - Thread.sleep(2000); + sleep(2000); var dataToSend = Flux.range(1, 3).map(i -> senderRecord("Message_" + i)); // Message_1, Message_2 etc. sendDataToStream(dataToSend); @@ -326,7 +331,7 @@ class IntegrationWithKafka { this.icsSimulatorController.deleteJob(JOB_ID2, restClient()); // Delete one job kafkaTopicConsumers.restartNonRunningTopics(); - Thread.sleep(1000); // Restarting the input seems to take some asynch time + sleep(1000); // Restarting the input seems to take some asynch time dataToSend = Flux.just(senderRecord("Howdy\"")); sendDataToStream(dataToSend); -- 2.16.6