Change-Id: I56d5d9b60b3a1ff4482333688af00f8ade620335
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
- <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<exec.skip>true</exec.skip>
</properties>
<dependencies>
<exec.skip>true</exec.skip>
</properties>
<dependencies>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<id>run-test-script</id>
<executions>
<execution>
<id>run-test-script</id>
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
-import java.io.IOException;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
- private void processMsg(String msg) throws IOException {
+ private void processMsg(String msg) {
logger.debug("Message Reveived from DMAAP : {}", msg);
getDmaapMessageHandler().handleDmaapMsg(msg);
}
logger.debug("Message Reveived from DMAAP : {}", msg);
getDmaapMessageHandler().handleDmaapMsg(msg);
}
url = "/policies";
String rsp = restClient().get(url).block();
url = "/policies";
String rsp = restClient().get(url).block();
- assertThat(rsp).contains(policyInstanceId).as("Response contains policy instance ID.");
+ assertThat(rsp).as("Response contains policy instance ID.").contains(policyInstanceId);
url = "/policy?id=" + policyInstanceId;
rsp = restClient().get(url).block();
url = "/policy?id=" + policyInstanceId;
rsp = restClient().get(url).block();
testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND);
url = putPolicyUrl(serviceName, ricName, policyTypeName + "XX", policyInstanceId);
testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND);
url = putPolicyUrl(serviceName, ricName, policyTypeName + "XX", policyInstanceId);
+ addPolicyType(policyTypeName + "XX", "otherRic");
testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND);
url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId);
testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND);
url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId);
// GET (all)
url = "/services";
rsp = restClient().get(url).block();
// GET (all)
url = "/services";
rsp = restClient().get(url).block();
- assertThat(rsp).contains(serviceName).as("Response contains service name");
+ assertThat(rsp).as("Response contains service name").contains(serviceName);
logger.info(rsp);
// Keep alive
logger.info(rsp);
// Keep alive
private final AsyncRestClient agentClient = mock(AsyncRestClient.class);
private DmaapMessageHandler testedObject;
private static Gson gson = new GsonBuilder() //
private final AsyncRestClient agentClient = mock(AsyncRestClient.class);
private DmaapMessageHandler testedObject;
private static Gson gson = new GsonBuilder() //
@BeforeEach
private void setUp() throws Exception {
@BeforeEach
private void setUp() throws Exception {
DmaapRequestMessage dmaapRequestMessage(Operation operation) {
Optional<JsonObject> payload =
DmaapRequestMessage dmaapRequestMessage(Operation operation) {
Optional<JsonObject> payload =
- ((operation == Operation.PUT || operation == Operation.POST) ? Optional.of(payloadAsJson())
- : Optional.empty());
+ ((operation == Operation.PUT || operation == Operation.POST) ? Optional.of(payloadAsJson())
+ : Optional.empty());
return ImmutableDmaapRequestMessage.builder() //
return ImmutableDmaapRequestMessage.builder() //
- .apiVersion("apiVersion") //
- .correlationId("correlationId") //
- .operation(operation) //
- .originatorId("originatorId") //
- .payload(payload) //
- .requestId("requestId") //
- .target("target") //
- .timestamp("timestamp") //
- .url(URL) //
- .build();
+ .apiVersion("apiVersion") //
+ .correlationId("correlationId") //
+ .operation(operation) //
+ .originatorId("originatorId") //
+ .payload(payload) //
+ .requestId("requestId") //
+ .target("target") //
+ .timestamp("timestamp") //
+ .url(URL) //
+ .build();
}
private String dmaapInputMessage(Operation operation) {
}
private String dmaapInputMessage(Operation operation) {
@Test
void unparseableMessage_thenWarning() {
final ListAppender<ILoggingEvent> logAppender =
@Test
void unparseableMessage_thenWarning() {
final ListAppender<ILoggingEvent> logAppender =
- LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
+ LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
String msg = "bad message";
testedObject.handleDmaapMsg(msg);
assertThat(logAppender.list.get(0).getFormattedMessage()).startsWith(
String msg = "bad message";
testedObject.handleDmaapMsg(msg);
assertThat(logAppender.list.get(0).getFormattedMessage()).startsWith(
- "handleDmaapMsg failure org.oransc.policyagent.exceptions.ServiceException: Received unparsable "
- + "message from DMAAP: \"" + msg + "\", reason: ");
+ "handleDmaapMsg failure org.oransc.policyagent.exceptions.ServiceException: Received unparsable "
+ + "message from DMAAP: \"" + msg + "\", reason: ");
String message = dmaapInputMessage(Operation.DELETE);
StepVerifier //
String message = dmaapInputMessage(Operation.DELETE);
StepVerifier //
- .create(testedObject.createTask(message)) //
- .expectSubscription() //
- .expectNext("OK") //
- .verifyComplete(); //
+ .create(testedObject.createTask(message)) //
+ .expectSubscription() //
+ .expectNext("OK") //
+ .verifyComplete(); //
verify(agentClient).deleteForEntity(URL);
verifyNoMoreInteractions(agentClient);
verify(agentClient).deleteForEntity(URL);
verifyNoMoreInteractions(agentClient);
doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
StepVerifier //
doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
StepVerifier //
- .create(testedObject.createTask(dmaapInputMessage(Operation.GET))) //
- .expectSubscription() //
- .expectNext("OK") //
- .verifyComplete(); //
+ .create(testedObject.createTask(dmaapInputMessage(Operation.GET))) //
+ .expectSubscription() //
+ .expectNext("OK") //
+ .verifyComplete(); //
verify(agentClient).getForEntity(URL);
verifyNoMoreInteractions(agentClient);
verify(agentClient).getForEntity(URL);
verifyNoMoreInteractions(agentClient);
doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
StepVerifier //
doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
StepVerifier //
- .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) //
- .expectSubscription() //
- .expectNext("OK") //
- .verifyComplete(); //
+ .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) //
+ .expectSubscription() //
+ .expectNext("OK") //
+ .verifyComplete(); //
verify(agentClient).putForEntity(URL, payloadAsString());
verifyNoMoreInteractions(agentClient);
verify(agentClient).putForEntity(URL, payloadAsString());
verifyNoMoreInteractions(agentClient);
doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
StepVerifier //
doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
StepVerifier //
- .create(testedObject.createTask(dmaapInputMessage(Operation.POST))) //
- .expectSubscription() //
- .expectNext("OK") //
- .verifyComplete(); //
+ .create(testedObject.createTask(dmaapInputMessage(Operation.POST))) //
+ .expectSubscription() //
+ .expectNext("OK") //
+ .verifyComplete(); //
verify(agentClient).postForEntity(URL, payloadAsString());
verifyNoMoreInteractions(agentClient);
verify(agentClient).postForEntity(URL, payloadAsString());
verifyNoMoreInteractions(agentClient);
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
verify(dmaapClient).post(anyString(), captor.capture());
String actualMessage = captor.getValue();
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
verify(dmaapClient).post(anyString(), captor.capture());
String actualMessage = captor.getValue();
- assertThat(actualMessage).contains(HttpStatus.BAD_GATEWAY.toString())
- .as("Message \"%s\" sent to DMaaP contains %s", actualMessage, HttpStatus.BAD_GATEWAY);
+ assertThat(actualMessage).as("Message \"%s\" sent to DMaaP contains %s", actualMessage, HttpStatus.BAD_GATEWAY)
+ .contains(HttpStatus.BAD_GATEWAY.toString());
verifyNoMoreInteractions(dmaapClient);
}
verifyNoMoreInteractions(dmaapClient);
}
message = message.replace(",\"payload\":{\"name\":\"name\",\"schema\":\"schema\"}", "");
final ListAppender<ILoggingEvent> logAppender =
message = message.replace(",\"payload\":{\"name\":\"name\",\"schema\":\"schema\"}", "");
final ListAppender<ILoggingEvent> logAppender =
- LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
+ LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
testedObject.handleDmaapMsg(message);
assertThat(logAppender.list.get(0).getFormattedMessage())
testedObject.handleDmaapMsg(message);
assertThat(logAppender.list.get(0).getFormattedMessage())
- .startsWith("Expected payload in message from DMAAP: ");
+ .startsWith("Expected payload in message from DMAAP: ");