diff options
author | Xue Gao <xg353y@intl.att.com> | 2020-03-25 12:11:57 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-03-25 12:11:57 +0000 |
commit | f152e38d8120333a2572d0b785f4e68aedc92a04 (patch) | |
tree | b4bbbd52ab9f363e912663ddc8933f8f03d09704 /src/test/java/org | |
parent | 98bade58e0ab9b74378e4e3214700e7b00e10d7d (diff) | |
parent | e65d457a2dfd6ebb5e1f5a28b74f05c16c285dc3 (diff) |
Merge "Improve metadata support"
Diffstat (limited to 'src/test/java/org')
-rw-r--r-- | src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java | 4 | ||||
-rw-r--r-- | src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java | 5 |
2 files changed, 6 insertions, 3 deletions
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 2faf38f0..092d35b0 100644 --- a/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java +++ b/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java @@ -76,12 +76,12 @@ public class DictionaryRepositoriesTestItCase { dictionaryRepository.save(dictionaryTest1); List<String> res1 = dictionaryRepository.getAllDictionaryNames(); - assertThat(res1.size()).isGreaterThan(1); + assertThat(res1.size()).isEqualTo(1); assertThat(res1).contains("testDictionary1"); dictionaryRepository.save(dictionaryTest2); List<String> res2 = dictionaryRepository.getAllDictionaryNames(); - assertThat(res2.size()).isGreaterThan(2); + assertThat(res2.size()).isEqualTo(2); assertThat(res2).contains("testDictionary1"); assertThat(res2).contains("testDictionary2"); } diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java index 3ff6ffb3..ea11f800 100644 --- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java +++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java @@ -41,10 +41,12 @@ import org.onap.clamp.tosca.DictionaryService; import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = Application.class) +@ActiveProfiles(profiles = "clamp-default,clamp-default-user,default-dictionary-elements") public class ToscaConverterWithDictionarySupportItCase { @Autowired @@ -108,7 +110,8 @@ public class ToscaConverterWithDictionarySupportItCase { JsonTemplateManager jsonTemplateManager = new JsonTemplateManager( - ResourceFileUtil.getResourceAsString("tosca/new-converter/tosca_metadata_clamp_possible_values.yaml"), + ResourceFileUtil + .getResourceAsString("tosca/new-converter/tosca_metadata_clamp_possible_values.yaml"), ResourceFileUtil.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"), ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json")); |