Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Change of ECS to ICS in test env"
[nonrtric.git]
/
dmaap-adaptor-java
/
src
/
test
/
java
/
org
/
oran
/
dmaapadapter
/
IntegrationWithKafka.java
diff --git
a/dmaap-adaptor-java/src/test/java/org/oran/dmaapadapter/IntegrationWithKafka.java
b/dmaap-adaptor-java/src/test/java/org/oran/dmaapadapter/IntegrationWithKafka.java
index
9cd4fdd
..
c38af8a
100644
(file)
--- a/
dmaap-adaptor-java/src/test/java/org/oran/dmaapadapter/IntegrationWithKafka.java
+++ b/
dmaap-adaptor-java/src/test/java/org/oran/dmaapadapter/IntegrationWithKafka.java
@@
-94,7
+94,7
@@
class IntegrationWithKafka {
private ConsumerController consumerController;
@Autowired
private ConsumerController consumerController;
@Autowired
- private
EcsSimulatorController e
csSimulatorController;
+ private
IcsSimulatorController i
csSimulatorController;
@Autowired
private KafkaTopicConsumers kafkaTopicConsumers;
@Autowired
private KafkaTopicConsumers kafkaTopicConsumers;
@@
-108,7
+108,7
@@
class IntegrationWithKafka {
static class TestApplicationConfig extends ApplicationConfig {
@Override
static class TestApplicationConfig extends ApplicationConfig {
@Override
- public String get
E
csBaseUrl() {
+ public String get
I
csBaseUrl() {
return thisProcessUrl();
}
return thisProcessUrl();
}
@@
-151,7
+151,7
@@
class IntegrationWithKafka {
@AfterEach
void reset() {
this.consumerController.testResults.reset();
@AfterEach
void reset() {
this.consumerController.testResults.reset();
- this.
e
csSimulatorController.testResults.reset();
+ this.
i
csSimulatorController.testResults.reset();
this.jobs.clear();
}
this.jobs.clear();
}
@@
-252,13
+252,13
@@
class IntegrationWithKafka {
final String JOB_ID2 = "ID2";
// Register producer, Register types
final String JOB_ID2 = "ID2";
// Register producer, Register types
- await().untilAsserted(() -> assertThat(
e
csSimulatorController.testResults.registrationInfo).isNotNull());
- assertThat(
e
csSimulatorController.testResults.registrationInfo.supportedTypeIds).hasSize(this.types.size());
+ await().untilAsserted(() -> assertThat(
i
csSimulatorController.testResults.registrationInfo).isNotNull());
+ assertThat(
i
csSimulatorController.testResults.registrationInfo.supportedTypeIds).hasSize(this.types.size());
// Create two jobs. One buffering and one with a filter
// Create two jobs. One buffering and one with a filter
- this.
e
csSimulatorController.addJob(consumerJobInfo(null, Duration.ofMillis(400), 1000, 20), JOB_ID1,
+ this.
i
csSimulatorController.addJob(consumerJobInfo(null, Duration.ofMillis(400), 1000, 20), JOB_ID1,
restClient());
restClient());
- this.
e
csSimulatorController.addJob(consumerJobInfo("^Message_1$", Duration.ZERO, 0, 1), JOB_ID2, restClient());
+ this.
i
csSimulatorController.addJob(consumerJobInfo("^Message_1$", Duration.ZERO, 0, 1), JOB_ID2, restClient());
await().untilAsserted(() -> assertThat(this.jobs.size()).isEqualTo(2));
await().untilAsserted(() -> assertThat(this.jobs.size()).isEqualTo(2));
@@
-268,8
+268,8
@@
class IntegrationWithKafka {
verifiedReceivedByConsumer("Message_1", "[\"Message_1\", \"Message_2\", \"Message_3\"]");
// Delete the jobs
verifiedReceivedByConsumer("Message_1", "[\"Message_1\", \"Message_2\", \"Message_3\"]");
// Delete the jobs
- this.
e
csSimulatorController.deleteJob(JOB_ID1, restClient());
- this.
e
csSimulatorController.deleteJob(JOB_ID2, restClient());
+ this.
i
csSimulatorController.deleteJob(JOB_ID1, restClient());
+ this.
i
csSimulatorController.deleteJob(JOB_ID2, restClient());
await().untilAsserted(() -> assertThat(this.jobs.size()).isZero());
await().untilAsserted(() -> assertThat(this.kafkaTopicConsumers.getConsumers().keySet()).isEmpty());
await().untilAsserted(() -> assertThat(this.jobs.size()).isZero());
await().untilAsserted(() -> assertThat(this.kafkaTopicConsumers.getConsumers().keySet()).isEmpty());
@@
-281,13
+281,13
@@
class IntegrationWithKafka {
final String JOB_ID2 = "ID2";
// Register producer, Register types
final String JOB_ID2 = "ID2";
// Register producer, Register types
- await().untilAsserted(() -> assertThat(
e
csSimulatorController.testResults.registrationInfo).isNotNull());
- assertThat(
e
csSimulatorController.testResults.registrationInfo.supportedTypeIds).hasSize(this.types.size());
+ await().untilAsserted(() -> assertThat(
i
csSimulatorController.testResults.registrationInfo).isNotNull());
+ assertThat(
i
csSimulatorController.testResults.registrationInfo.supportedTypeIds).hasSize(this.types.size());
// Create two jobs.
// Create two jobs.
- this.
e
csSimulatorController.addJob(consumerJobInfo(null, Duration.ofMillis(400), 1000, 1), JOB_ID1,
+ this.
i
csSimulatorController.addJob(consumerJobInfo(null, Duration.ofMillis(400), 1000, 1), JOB_ID1,
restClient());
restClient());
- this.
e
csSimulatorController.addJob(consumerJobInfo(null, Duration.ZERO, 0, 1), JOB_ID2, restClient());
+ this.
i
csSimulatorController.addJob(consumerJobInfo(null, Duration.ZERO, 0, 1), JOB_ID2, restClient());
await().untilAsserted(() -> assertThat(this.jobs.size()).isEqualTo(2));
await().untilAsserted(() -> assertThat(this.jobs.size()).isEqualTo(2));
@@
-298,8
+298,8
@@
class IntegrationWithKafka {
await().untilAsserted(() -> assertThat(consumer.isRunning()).isFalse());
this.consumerController.testResults.reset();
await().untilAsserted(() -> assertThat(consumer.isRunning()).isFalse());
this.consumerController.testResults.reset();
- this.
e
csSimulatorController.deleteJob(JOB_ID2, restClient()); // Delete one job
- kafkaTopicConsumers.restartNonRunningT
ask
s();
+ this.
i
csSimulatorController.deleteJob(JOB_ID2, restClient()); // Delete one job
+ kafkaTopicConsumers.restartNonRunningT
opic
s();
Thread.sleep(1000); // Restarting the input seems to take some asynch time
dataToSend = Flux.just(senderRecord("Howdy\""));
Thread.sleep(1000); // Restarting the input seems to take some asynch time
dataToSend = Flux.just(senderRecord("Howdy\""));
@@
-308,8
+308,8
@@
class IntegrationWithKafka {
verifiedReceivedByConsumer("[\"Howdy\\\"\"]");
// Delete the jobs
verifiedReceivedByConsumer("[\"Howdy\\\"\"]");
// Delete the jobs
- this.
e
csSimulatorController.deleteJob(JOB_ID1, restClient());
- this.
e
csSimulatorController.deleteJob(JOB_ID2, restClient());
+ this.
i
csSimulatorController.deleteJob(JOB_ID1, restClient());
+ this.
i
csSimulatorController.deleteJob(JOB_ID2, restClient());
await().untilAsserted(() -> assertThat(this.jobs.size()).isZero());
await().untilAsserted(() -> assertThat(this.kafkaTopicConsumers.getConsumers().keySet()).isEmpty());
await().untilAsserted(() -> assertThat(this.jobs.size()).isZero());
await().untilAsserted(() -> assertThat(this.kafkaTopicConsumers.getConsumers().keySet()).isEmpty());