1 files changed, 17 insertions, 20 deletions
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestDistributionStatusMessage.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestDistributionStatusMessage.java
index be127776..62cf0f3d 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestDistributionStatusMessage.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestDistributionStatusMessage.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Intel. All rights reserved.
+ *  Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,38 +28,34 @@ import org.onap.sdc.utils.DistributionStatusEnum;
 
 public class TestDistributionStatusMessage {
 
+    private static final String ARTIFACT_URL = "http://dummyurl";
+    private static final String CONSUMER_ID = "dummyId";
+    private static final String DISTRIBUTION_ID = "dummyDistribution";
+
     @Test
     public void testDistributionStatusMessage_Download() {
-        final String artifactUrl = "http://dummyurl";
-        final String consumerId = "dummyId";
-        final String distributionId = "dummyDistribution";
         final long timestamp = System.currentTimeMillis();
 
-        final DistributionStatusMessageBuilder messageBuilder = new DistributionStatusMessageBuilder()
-                .setArtifactUrl(artifactUrl).setConsumerId(consumerId).setDistributionId(distributionId)
-                .setDistributionStatus(DistributionStatusEnum.DOWNLOAD_OK).setTimestamp(timestamp);
-        final DistributionStatusMessage message = new DistributionStatusMessage(messageBuilder);
-        assertEquals(artifactUrl, message.getArtifactURL());
-        assertEquals(consumerId, message.getConsumerID());
-        assertEquals(distributionId, message.getDistributionID());
+        final DistributionStatusMessage message = DistributionStatusMessage.builder().artifactUrl(ARTIFACT_URL)
+                        .consumerId(CONSUMER_ID).distributionId(DISTRIBUTION_ID)
+                        .distributionStatus(DistributionStatusEnum.DOWNLOAD_OK).timestamp(timestamp).build();
+        assertEquals(ARTIFACT_URL, message.getArtifactURL());
+        assertEquals(CONSUMER_ID, message.getConsumerID());
+        assertEquals(DISTRIBUTION_ID, message.getDistributionID());
         assertEquals(DistributionStatusEnum.DOWNLOAD_OK, message.getStatus());
         assertEquals(timestamp, message.getTimestamp());
     }
 
     @Test
     public void testDistributionStatusMessage_Deploy() {
-        final String artifactUrl = "http://dummyurl";
-        final String consumerId = "dummyId";
-        final String distributionId = "dummyDistribution";
         final long timestamp = System.currentTimeMillis();
 
-        final DistributionStatusMessageBuilder messageBuilder = new DistributionStatusMessageBuilder()
-                .setArtifactUrl(artifactUrl).setConsumerId(consumerId).setDistributionId(distributionId)
-                .setDistributionStatus(DistributionStatusEnum.DEPLOY_OK).setTimestamp(timestamp);
-        final DistributionStatusMessage message = new DistributionStatusMessage(messageBuilder);
-        assertEquals(artifactUrl, message.getArtifactURL());
-        assertEquals(consumerId, message.getConsumerID());
-        assertEquals(distributionId, message.getDistributionID());
+        final DistributionStatusMessage message = DistributionStatusMessage.builder().artifactUrl(ARTIFACT_URL)
+                        .consumerId(CONSUMER_ID).distributionId(DISTRIBUTION_ID)
+                        .distributionStatus(DistributionStatusEnum.DEPLOY_OK).timestamp(timestamp).build();
+        assertEquals(ARTIFACT_URL, message.getArtifactURL());
+        assertEquals(CONSUMER_ID, message.getConsumerID());
+        assertEquals(DISTRIBUTION_ID, message.getDistributionID());
         assertEquals(DistributionStatusEnum.DEPLOY_OK, message.getStatus());
         assertEquals(timestamp, message.getTimestamp());
     }