From 3ed8d43005f52b84ce04a7311ca97b4cb4a8b487 Mon Sep 17 00:00:00 2001 From: sebdet Date: Tue, 24 Mar 2020 15:49:19 -0700 Subject: Improve the policy model download Improve the policy model download so that the yaml is now in pretty printing and the policy engine is not triggered if the model is already in the database Issue-ID: CLAMP-784 Signed-off-by: sebdet Change-Id: Ibd1e6bd617cf052ad4c475e4dd9c63eb2b046acd --- .../onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java | 2 -- .../org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java | 4 ++-- .../java/org/onap/clamp/loop/deploy/BlueprintInputParametersTest.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/test/java/org') diff --git a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java index 9efb68983..cd7337a4d 100644 --- a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java +++ b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java @@ -30,7 +30,6 @@ import static org.assertj.core.api.Assertions.assertThat; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; - import java.io.IOException; import java.util.Arrays; import java.util.Collections; @@ -39,7 +38,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; - import org.json.JSONObject; import org.junit.Assert; import org.junit.BeforeClass; 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 092d35b0d..01dc8404c 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 res1 = dictionaryRepository.getAllDictionaryNames(); - assertThat(res1.size()).isEqualTo(1); + assertThat(res1.size()).isGreaterThanOrEqualTo(1); assertThat(res1).contains("testDictionary1"); dictionaryRepository.save(dictionaryTest2); List res2 = dictionaryRepository.getAllDictionaryNames(); - assertThat(res2.size()).isEqualTo(2); + assertThat(res2.size()).isGreaterThanOrEqualTo(2); assertThat(res2).contains("testDictionary1"); assertThat(res2).contains("testDictionary2"); } diff --git a/src/test/java/org/onap/clamp/loop/deploy/BlueprintInputParametersTest.java b/src/test/java/org/onap/clamp/loop/deploy/BlueprintInputParametersTest.java index a580a6ac8..ccaa417e4 100644 --- a/src/test/java/org/onap/clamp/loop/deploy/BlueprintInputParametersTest.java +++ b/src/test/java/org/onap/clamp/loop/deploy/BlueprintInputParametersTest.java @@ -89,7 +89,7 @@ public class BlueprintInputParametersTest { } @Test - public void getDeploymentParametersinJsonSingleBlueprintTest() throws IOException, SdcToscaParserException { + public void getDeploymentParametersInJsonSingleBlueprintTest() throws IOException, SdcToscaParserException { Loop loop = Mockito.mock(Loop.class); MicroServicePolicy umService1 = Mockito.mock(MicroServicePolicy.class); -- cgit 1.2.3-korg