X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pmproducer%2Fsrc%2Ftest%2Fjava%2Forg%2Foran%2Fpmproducer%2FApplicationTest.java;h=76ccb487fcb91dceacf8945b708fe3f212dcfd73;hb=HEAD;hp=dd38ffcfd8517fef1946aeb3f5d1dba4a0e09ef0;hpb=890c93c9bae2113d99f027b166319703c67c278f;p=nonrtric%2Fplt%2Franpm.git diff --git a/pmproducer/src/test/java/org/oran/pmproducer/ApplicationTest.java b/pmproducer/src/test/java/org/oran/pmproducer/ApplicationTest.java index dd38ffc..76ccb48 100644 --- a/pmproducer/src/test/java/org/oran/pmproducer/ApplicationTest.java +++ b/pmproducer/src/test/java/org/oran/pmproducer/ApplicationTest.java @@ -53,7 +53,6 @@ import org.junit.jupiter.api.TestMethodOrder; 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; @@ -64,6 +63,7 @@ import org.oran.pmproducer.filter.FilteredData; 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; @@ -106,7 +106,7 @@ import reactor.test.StepVerifier; "app.webclient.trust-store=./config/truststore.jks", // "app.webclient.trust-store-used=true", // "app.configuration-filepath=./src/test/resources/test_application_configuration.json", // - "app.pm-files-path=/tmp/dmaapadaptor", // + "app.pm-files-path=/tmp/pmproducer", // "app.s3.endpointOverride=" // }) class ApplicationTest { @@ -235,11 +235,6 @@ class ApplicationTest { 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();