Update Docker Compose tests to fix test failure

Updating to Jackson 2.7.7 causes tests in the docker compose plugin to fail. This is due to the fact that the tests expect empty values in dictionaries to be parsed as the empty string, whereas jackson 2.7.7 parses them as null (as specified by the yaml spec). Modifies the affected tests to explicitly use an empty string (i.e. "") instead of an empty value. Signed-off-by: Angel Misevski <amisevsk@redhat.com>
eclipse-che · Jun 29, 2017 · fba68ea · fba68ea
1 parent 77329e3
commit fba68ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...ose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/CommandDeserializerTest.java b/...ose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/CommandDeserializerTest.java
@@ -70,7 +70,8 @@ public void composeServiceCommandShouldBeParsedSuccessfully(String command,
         assertEquals(environment.get("MYSQL_PASSWORD"), "password");
         assertTrue(service.getExpose().containsAll(asList("4403", "5502")));
 
-        assertEquals(service.getCommand(), commandWords);
+        assertTrue(service.getCommand().containsAll(commandWords));
+        assertEquals(service.getCommand().size(), commandNumberOfWords);
     }
 
     @DataProvider(name = "validCommand")
@@ -137,7 +138,7 @@ private Object[][] validCommand() {
                 {"\"echo ${PWD}\"", asList("echo", "${PWD}"), 2},
                 {"\"(Test)\"", singletonList("(Test)"), 1},
 
-                {"", null, 1},
+                {"\"\"", singletonList(""), 1},
         };
     }
 

diff --git a/...src/test/java/org/eclipse/che/plugin/docker/compose/yaml/EnvironmentDeserializerTest.java b/...src/test/java/org/eclipse/che/plugin/docker/compose/yaml/EnvironmentDeserializerTest.java
@@ -68,8 +68,8 @@ public Object[][] correctContentTestData() {
                  + " dev-machine: \n"
                  + "  image: codenvy/ubuntu_jdk8\n"
                  + "  environment:\n"
-                 + "   MYSQL_ROOT_PASSWORD: ",
-                 ImmutableMap.of("MYSQL_ROOT_PASSWORD", null)
+                 + "   MYSQL_ROOT_PASSWORD: \"\"",
+                 ImmutableMap.of("MYSQL_ROOT_PASSWORD", "")
                 },
 
                 // dictionary format, value of variable contains colon sign