1 files changed, 1 insertions, 29 deletions

diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantPrimeTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantPrimeTest.java
index 890fc55ae..859b4224d 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantPrimeTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantPrimeTest.java
@@ -29,13 +29,10 @@ import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
-import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElementDefinition;
 import org.onap.policy.clamp.models.acm.concepts.ParticipantDefinition;
 import org.onap.policy.clamp.models.acm.utils.CommonTestData;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 
 /**
  * Test the copy constructor.
@@ -52,21 +49,9 @@ class ParticipantPrimeTest {
         orig.setMessageId(UUID.randomUUID());
         orig.setTimestamp(Instant.ofEpochMilli(3000));
 
-        var toscaServiceTemplate = new ToscaServiceTemplate();
-        toscaServiceTemplate.setName("serviceTemplate");
-        toscaServiceTemplate.setDerivedFrom("parentServiceTemplate");
-        toscaServiceTemplate.setDescription("Description of serviceTemplate");
-        toscaServiceTemplate.setVersion("1.2.3");
-
-        var toscaNodeTemplate = new ToscaNodeTemplate();
-        toscaNodeTemplate.setName("nodeTemplate");
-        toscaNodeTemplate.setDerivedFrom("parentNodeTemplate");
-        toscaNodeTemplate.setDescription("Description of nodeTemplate");
-        toscaNodeTemplate.setVersion("1.2.3");
-
         var participantDefinitionUpdate = new ParticipantDefinition();
         var type = new ToscaConceptIdentifier("id", "1.2.3");
-        var acDefinition = getAcElementDefinition(type);
+        var acDefinition = CommonTestData.getAcElementDefinition(type);
         participantDefinitionUpdate.setAutomationCompositionElementDefinitionList(List.of(acDefinition));
         orig.setParticipantDefinitionUpdates(List.of(participantDefinitionUpdate));
 
@@ -76,17 +61,4 @@ class ParticipantPrimeTest {
 
         assertSerializable(orig, ParticipantPrime.class);
     }
-
-    private AutomationCompositionElementDefinition getAcElementDefinition(ToscaConceptIdentifier id) {
-        var toscaNodeTemplate = new ToscaNodeTemplate();
-        toscaNodeTemplate.setName("nodeTemplate");
-        toscaNodeTemplate.setDerivedFrom("parentNodeTemplate");
-        toscaNodeTemplate.setDescription("Description of nodeTemplate");
-        toscaNodeTemplate.setVersion("1.2.3");
-
-        var acDefinition = new AutomationCompositionElementDefinition();
-        acDefinition.setAcElementDefinitionId(id);
-        acDefinition.setAutomationCompositionElementToscaNodeTemplate(toscaNodeTemplate);
-        return acDefinition;
-    }
 }