Create ToscaConceptIdentifier from ToscaEntityKey

[policy/models.git] / models-tosca / src / test / java / org / onap / policy / models / tosca / authorative / concepts / ToscaPolicyTest.java

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTest.java
index 8ee7423..ba39621 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTest.java
@@ -3,6 +3,7 @@
  * ONAP Policy Models
  * ================================================================================
  * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 
 import java.util.LinkedHashMap;
-
 import org.junit.Test;
 
 /**
@@ -36,8 +36,7 @@ public class ToscaPolicyTest {
     public void testGetIdentifier_testGetTypeIdentifier() {
         assertThatThrownBy(() -> {
             new ToscaPolicy(null);
-        }).hasMessage("copyObject is marked @NonNull but is null");
-
+        }).hasMessageMatching("copyObject is marked .*on.*ull but is null");
 
         ToscaPolicy policy = new ToscaPolicy();
 
@@ -47,21 +46,22 @@ public class ToscaPolicyTest {
         policy.setTypeVersion("3.2.1");
 
         assertEquals("ToscaEntityKey(name=my_name, version=1.2.3)", policy.getKey().toString());
+        assertEquals(new ToscaConceptIdentifier("my_name", "1.2.3"), policy.getKey().asIdentifier());
 
-        ToscaPolicyIdentifier ident = policy.getIdentifier();
+        ToscaConceptIdentifier ident = policy.getIdentifier();
         assertEquals("my_name", ident.getName());
         assertEquals("1.2.3", ident.getVersion());
 
-        ToscaPolicyTypeIdentifier type = policy.getTypeIdentifier();
+        ToscaConceptIdentifier type = policy.getTypeIdentifier();
         assertEquals("my_type", type.getName());
         assertEquals("3.2.1", type.getVersion());
 
         ToscaPolicy clonedPolicy0 = new ToscaPolicy(policy);
-        assertEquals(0, policy.compareTo(clonedPolicy0));
+        assertEquals(0, new ToscaPolicyComparator().compare(policy, clonedPolicy0));
 
         policy.setProperties(new LinkedHashMap<String, Object>());
         policy.getProperties().put("PropertyKey", "PropertyValue");
         ToscaPolicy clonedPolicy1 = new ToscaPolicy(policy);
-        assertEquals(0, policy.compareTo(clonedPolicy1));
+        assertEquals(0, new ToscaPolicyComparator().compare(policy, clonedPolicy1));
     }
 }