Change the Csar installer

[clamp.git] / src / test / java / org / onap / clamp / loop / PolicyModelServiceItCase.java

diff --git a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java b/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
index b284dd7..f8c1d86 100644 (file)
--- a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
+++ b/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
@@ -66,7 +66,6 @@ public class PolicyModelServiceItCase {
         policyModel.setPolicyAcronym(policyAcronym);
         policyModel.setPolicyModelTosca(policyModelTosca);
         policyModel.setPolicyModelType(policyType);
-        policyModel.setPolicyVariant(policyVariant);
         policyModel.setUpdatedBy(createdBy);
         policyModel.setVersion(version);
         return policyModel;
@@ -92,7 +91,6 @@ public class PolicyModelServiceItCase {
         assertThat(actualPolicyModel.getCreatedDate()).isNotNull();
         assertThat(actualPolicyModel.getPolicyAcronym()).isEqualTo(policyModel.getPolicyAcronym());
         assertThat(actualPolicyModel.getPolicyModelTosca()).isEqualTo(policyModel.getPolicyModelTosca());
-        assertThat(actualPolicyModel.getPolicyVariant()).isEqualTo(policyModel.getPolicyVariant());
         assertThat(actualPolicyModel.getUpdatedBy()).isEqualTo("");
         assertThat(actualPolicyModel.getUpdatedDate()).isNotNull();
         assertThat(actualPolicyModel.getVersion()).isEqualTo(policyModel.getVersion());
@@ -113,8 +111,7 @@ public class PolicyModelServiceItCase {
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
         List<String> policyModelTypesList = policyModelsService.getAllPolicyModelTypes();
 
-        assertThat(policyModelTypesList).containsOnly(policyModel1.getPolicyModelType(),
-                policyModel2.getPolicyModelType());
+        assertThat(policyModelTypesList).contains(policyModel1.getPolicyModelType(), policyModel2.getPolicyModelType());
     }
 
     @Test
@@ -127,7 +124,7 @@ public class PolicyModelServiceItCase {
                 "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
 
-        assertThat(policyModelsService.getAllPolicyModels()).containsOnly(policyModel1, policyModel2);
+        assertThat(policyModelsService.getAllPolicyModels()).contains(policyModel1, policyModel2);
     }
 
     @Test
@@ -140,7 +137,7 @@ public class PolicyModelServiceItCase {
                 "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
 
-        assertThat(policyModelsService.getAllPolicyModelsByType(POLICY_MODEL_TYPE_2)).containsOnly(policyModel1,
+        assertThat(policyModelsService.getAllPolicyModelsByType(POLICY_MODEL_TYPE_2)).contains(policyModel1,
                 policyModel2);
     }
 
@@ -156,6 +153,6 @@ public class PolicyModelServiceItCase {
 
         SortedSet<PolicyModel> sortedSet = new TreeSet<>();
         policyModelsService.getAllPolicyModels().forEach(sortedSet::add);
-        assertThat(sortedSet).containsExactly(policyModel2, policyModel1);
+        assertThat(sortedSet).contains(policyModel2, policyModel1);
     }
 }