Improve the policy model download

[clamp.git] / src / test / java / org / onap / clamp / clds / tosca / DictionaryRepositoriesTestItCase.java

diff --git a/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java b/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
index 2274fcf..01dc840 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
@@ -25,9 +25,7 @@ package org.onap.clamp.clds.tosca;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.LinkedList;
 import java.util.List;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.Application;
@@ -55,16 +53,12 @@ public class DictionaryRepositoriesTestItCase {
         dictionaryTest1.setSubDictionaryType("testType");
 
         DictionaryElement element1 = new DictionaryElement();
-        element1.setDictionary(dictionaryTest1);
         element1.setName("element1");
         element1.setShortName("shortName1");
-        element1.setSubDictionary("subDictionary1");
         element1.setType("type1");
         element1.setDescription("description1");
 
-        LinkedList<DictionaryElement> elementList1 = new LinkedList<DictionaryElement>();
-        elementList1.add(element1);
-        dictionaryTest1.setDictionaryElements(elementList1);
+        dictionaryTest1.addDictionaryElements(element1);
 
         Dictionary dictionaryTest2 = new Dictionary();
         dictionaryTest2.setName("testDictionary2");
@@ -72,26 +66,23 @@ public class DictionaryRepositoriesTestItCase {
         dictionaryTest2.setSubDictionaryType("testType");
 
         DictionaryElement element2 = new DictionaryElement();
-        element2.setDictionary(dictionaryTest2);
         element2.setName("element2");
         element2.setShortName("shortName2");
-        element2.setSubDictionary("subDictionary2");
+        element2.setSubDictionary("testDictionary1");
         element2.setType("type2");
         element2.setDescription("description2");
 
-        LinkedList<DictionaryElement> elementList2 = new LinkedList<DictionaryElement>();
-        elementList2.add(element2);
-        dictionaryTest2.setDictionaryElements(elementList2);
+        dictionaryTest2.addDictionaryElements(element2);
 
         dictionaryRepository.save(dictionaryTest1);
         List<String> res1 = dictionaryRepository.getAllDictionaryNames();
-        assertThat(res1.size()).isEqualTo(1);
-        assertThat(res1.get(0)).isEqualTo("testDictionary1");
+        assertThat(res1.size()).isGreaterThanOrEqualTo(1);
+        assertThat(res1).contains("testDictionary1");
 
         dictionaryRepository.save(dictionaryTest2);
         List<String> res2 = dictionaryRepository.getAllDictionaryNames();
-        assertThat(res2.size()).isEqualTo(2);
-        assertThat(res2.get(0)).isEqualTo("testDictionary1");
-        assertThat(res2.get(1)).isEqualTo("testDictionary2");
+        assertThat(res2.size()).isGreaterThanOrEqualTo(2);
+        assertThat(res2).contains("testDictionary1");
+        assertThat(res2).contains("testDictionary2");
     }
 }