import org.mockito.ArgumentCaptor;
import org.oran.pmproducer.clients.AsyncRestClient;
import org.oran.pmproducer.clients.AsyncRestClientFactory;
-import org.oran.pmproducer.clients.SecurityContext;
import org.oran.pmproducer.configuration.ApplicationConfig;
import org.oran.pmproducer.configuration.WebClientConfig;
import org.oran.pmproducer.configuration.WebClientConfig.HttpProxyConfig;
import org.oran.pmproducer.filter.PmReport;
import org.oran.pmproducer.filter.PmReportFilter;
import org.oran.pmproducer.filter.PmReportFilter.FilterData;
+import org.oran.pmproducer.oauth2.SecurityContext;
import org.oran.pmproducer.r1.ConsumerJobInfo;
import org.oran.pmproducer.r1.ProducerJobInfo;
import org.oran.pmproducer.repository.InfoType;
return thisProcessUrl();
}
- @Override
- public String getDmaapBaseUrl() {
- return thisProcessUrl();
- }
-
@Override
public String getSelfUrl() {
return thisProcessUrl();
return "https://localhost:" + this.applicationConfig.getLocalServerHttpPort();
}
- private String quote(String str) {
- final String q = "\"";
- return q + str.replace(q, "\\\"") + q;
- }
-
private Object toJson(String json) {
try {
return JsonParser.parseString(json).getAsJsonObject();
}
private void waitForRegistration() {
+ producerRegistrationTask.registerTypesAndProducer().block();
// Register producer, Register types
await().untilAsserted(() -> assertThat(icsSimulatorController.testResults.registrationInfo).isNotNull());
- producerRegistrationTask.supervisionTask().block();
+ producerRegistrationTask.registerTypesAndProducer().block();
assertThat(icsSimulatorController.testResults.registrationInfo.supportedTypeIds).hasSize(this.types.size());
assertThat(producerRegistrationTask.isRegisteredInIcs()).isTrue();
await().untilAsserted(() -> assertThat(this.jobs.size()).isEqualTo(1));
}
- @Test
- void testReRegister() throws Exception {
- // Wait foir register types and producer
- waitForRegistration();
-
- // Clear the registration, should trigger a re-register
- icsSimulatorController.testResults.reset();
- producerRegistrationTask.supervisionTask().block();
- await().untilAsserted(() -> assertThat(icsSimulatorController.testResults.registrationInfo).isNotNull());
- assertThat(icsSimulatorController.testResults.registrationInfo.supportedTypeIds).hasSize(this.types.size());
-
- // Just clear the registerred types, should trigger a re-register
- icsSimulatorController.testResults.types.clear();
- await().untilAsserted(() -> assertThat(icsSimulatorController.testResults.registrationInfo.supportedTypeIds)
- .hasSize(this.types.size()));
- }
-
@Test
@SuppressWarnings("squid:S2925") // "Thread.sleep" should not be used in tests.
void testZZActuator() throws Exception {