1 files changed, 27 insertions, 1 deletions
diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/MessageRouterTestsUtils.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/MessageRouterTestsUtils.java
index 1a315806..ebb9af74 100644
--- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/MessageRouterTestsUtils.java
+++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/MessageRouterTestsUtils.java
@@ -26,6 +26,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
 import io.vavr.collection.List;
+import org.onap.dcaegen2.services.sdk.model.streams.ImmutableAafCredentials;
 import org.onap.dcaegen2.services.sdk.model.streams.dmaap.ImmutableMessageRouterSink;
 import org.onap.dcaegen2.services.sdk.model.streams.dmaap.ImmutableMessageRouterSource;
 import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.MessageRouterPublisher;
@@ -62,6 +63,17 @@ public final class MessageRouterTestsUtils {
                 .build();
     }
 
+    public static MessageRouterPublishRequest createPublishRequest(String topicUrl, String username, String password) {
+        return ImmutableMessageRouterPublishRequest.builder()
+                .sinkDefinition(createMessageRouterSink(topicUrl)
+                        .withAafCredentials(ImmutableAafCredentials.builder()
+                                .username(username)
+                                .password(password)
+                                .build()))
+                .contentType(ContentType.APPLICATION_JSON)
+                .build();
+    }
+
     public static MessageRouterPublishRequest createPublishRequest(String topicUrl, ContentType contentType) {
         return ImmutableMessageRouterPublishRequest.builder()
                 .sinkDefinition(createMessageRouterSink(topicUrl))
@@ -83,7 +95,6 @@ public final class MessageRouterTestsUtils {
     public static MessageRouterSubscribeRequest createMRSubscribeRequest(String topicUrl,
                                                                          String consumerGroup, String consumerId,
                                                                          Duration timeout) {
-
         return ImmutableMessageRouterSubscribeRequest
                 .builder()
                 .timeoutConfig(ImmutableDmaapTimeoutConfig.builder()
@@ -95,6 +106,21 @@ public final class MessageRouterTestsUtils {
                 .build();
     }
 
+    public static MessageRouterSubscribeRequest createMRSubscribeRequest(String topicUrl,
+                                                                         String consumerGroup, String consumerId,
+                                                                         String username, String password) {
+        return ImmutableMessageRouterSubscribeRequest
+                .builder()
+                .sourceDefinition(getImmutableMessageRouterSource(topicUrl)
+                .withAafCredentials(ImmutableAafCredentials.builder()
+                        .username(username)
+                        .password(password)
+                        .build()))
+                .consumerGroup(consumerGroup)
+                .consumerId(consumerId)
+                .build();
+    }
+
     private static ImmutableMessageRouterSource getImmutableMessageRouterSource(String topicUrl) {
         return ImmutableMessageRouterSource.builder()
                 .name("the topic")