Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing tests on build. #5291

Merged
merged 1 commit into from
Jun 8, 2017
Merged

Fix failing tests on build. #5291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...ose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/CommandDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public void composeServiceCommandShouldBeParsedSuccessfully(String command,
assertEquals(environment.get("MYSQL_PASSWORD"), "password");
assertTrue(service.getExpose().containsAll(asList("4403", "5502")));

assertTrue(service.getCommand().containsAll(commandWords));
assertEquals(service.getCommand().size(), commandNumberOfWords);
assertEquals(service.getCommand(), commandWords);
}

@DataProvider(name = "validCommand")
Expand Down Expand Up @@ -137,7 +136,7 @@ private Object[][] validCommand() {
{"\"echo ${PWD}\"", asList("echo", "${PWD}"), 2},
{"\"(Test)\"", singletonList("(Test)"), 1},

{"", singletonList(""), 1},
{"", null, 1},
};
}

Expand Down
7 changes: 1 addition & 6 deletions ...src/test/java/org/eclipse/che/plugin/docker/compose/yaml/EnvironmentDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@
import com.google.common.collect.ImmutableMap;

import org.eclipse.che.api.core.ServerException;
import org.eclipse.che.api.machine.server.util.RecipeDownloader;
import org.eclipse.che.plugin.docker.compose.ComposeEnvironment;
import org.eclipse.che.plugin.docker.compose.ComposeServiceImpl;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.testng.MockitoTestNGListener;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Listeners;
Expand All @@ -40,9 +38,6 @@
@Listeners(MockitoTestNGListener.class)
public class EnvironmentDeserializerTest {

@Mock
private RecipeDownloader recipeDownloader;

@InjectMocks
private ComposeEnvironmentParser parser;

Expand Down Expand Up @@ -74,7 +69,7 @@ public Object[][] correctContentTestData() {
+ " image: codenvy/ubuntu_jdk8\n"
+ " environment:\n"
+ " MYSQL_ROOT_PASSWORD: ",
ImmutableMap.of("MYSQL_ROOT_PASSWORD", "")
ImmutableMap.of("MYSQL_ROOT_PASSWORD", null)
},

// dictionary format, value of variable contains colon sign
Expand Down