Merge "Remove Dmaap from clamp"

2 files changed, 6 insertions, 4 deletions

diff --git a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/rest/ChartControllerTest.java b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/rest/ChartControllerTest.java
index a6d6f315a..82d833f0b 100644
--- a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/rest/ChartControllerTest.java
+++ b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/rest/ChartControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021-2022 Nordix Foundation.
+ *  Copyright (C) 2021-2022,2024 Nordix Foundation.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,6 +57,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.mock.web.MockPart;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.RequestBuilder;
@@ -191,7 +192,8 @@ class ChartControllerTest {
         when(chartService.saveChart(charts.get(0), chartFile, null)).thenReturn(charts.get(0));
 
         requestBuilder = MockMvcRequestBuilders.multipart(ONBOARD_CHART_URL)
-            .file(chartFile).file(overrideFile).param("info", getChartInfoJson());
+            .file("chartFile", chartFile.getBytes()).file("overrideFile", overrideFile.getBytes())
+                .part(new MockPart("info", getChartInfoJson().getBytes()));
 
         mockMvc.perform(requestBuilder).andExpect(status().isOk());
     }
diff --git a/runtime-acm/src/test/resources/application-prometheus-noauth.yaml b/runtime-acm/src/test/resources/application-prometheus-noauth.yaml
index b34491124..e961df075 100644
--- a/runtime-acm/src/test/resources/application-prometheus-noauth.yaml
+++ b/runtime-acm/src/test/resources/application-prometheus-noauth.yaml
@@ -30,11 +30,11 @@ runtime:
         topic: POLICY-ACRUNTIME-PARTICIPANT
         servers:
           - localhost
-        topicCommInfrastructure: dmaap
+        topicCommInfrastructure: noop
         fetchTimeout: 15000
     topicSinks:
       -
-        topicCommInfrastructure: dmaap
+        topicCommInfrastructure: noop
         servers:
           - localhost
         topic: POLICY-ACRUNTIME-PARTICIPANT