Skip to content

Commit

Permalink
Move implementation specific tests to individal files
Browse files Browse the repository at this point in the history 
Make ServerEvaluationStrategyTest test abstract methods
with Default strategy as implementation.

Signed-off-by: Angel Misevski <[email protected]>
  • Loading branch information
@amisevsk
amisevsk committed Dec 21, 2016
1 parent e2f7ec8 commit 4e8b81a
Show file tree
Hide file tree
Showing 4 changed files with 661 additions and 221 deletions.
7 changes: 5 additions & 2 deletions ...machine/src/main/java/org/eclipse/che/plugin/docker/machine/ServerEvaluationStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,17 @@ public Map<String, ServerImpl> getServers(ContainerInfo containerInfo,
private ServerConfImpl getServerConfImpl(String portProtocol,
Map<String, String> labels,
Map<String, ServerConfImpl> serverConfMap) {
// Label can be specified without protocol -- e.g. 4401 refers to 4401/tcp
String port = portProtocol.substring(0, portProtocol.length() - 4);

ServerConfImpl serverConf;
// provided serverConf map takes precedence
if (serverConfMap.get(portProtocol) != null) {
serverConf = serverConfMap.get(portProtocol);
} else if (serverConfMap.get(port) != null) {
serverConf = serverConfMap.get(port);
} else {
String ref, protocol, path;
// Label can be specified without protocol -- e.g. 4401 refers to 4401/tcp
String port = portProtocol.substring(0, portProtocol.length() - 4);

ref = labels.get(String.format(SERVER_CONF_LABEL_REF_KEY, portProtocol));
if (ref == null) {
Expand Down
223 changes: 223 additions & 0 deletions .../test/java/org/eclipse/che/plugin/docker/machine/DefaultServerEvaluationStrategyTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
/*******************************************************************************
* Copyright (c) 2016 Red Hat Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Red Hat Inc. - initial API and implementation
*******************************************************************************/

package org.eclipse.che.plugin.docker.machine;

import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.eclipse.che.api.core.model.machine.MachineConfig;
import org.eclipse.che.api.machine.server.model.impl.ServerConfImpl;
import org.eclipse.che.api.machine.server.model.impl.ServerImpl;
import org.eclipse.che.api.machine.server.model.impl.ServerPropertiesImpl;
import org.eclipse.che.plugin.docker.client.json.ContainerConfig;
import org.eclipse.che.plugin.docker.client.json.ContainerInfo;
import org.eclipse.che.plugin.docker.client.json.NetworkSettings;
import org.eclipse.che.plugin.docker.client.json.PortBinding;
import org.mockito.Mock;
import org.mockito.testng.MockitoTestNGListener;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Listeners;
import org.testng.annotations.Test;

@Listeners(MockitoTestNGListener.class)
public class DefaultServerEvaluationStrategyTest {

private static final String CHE_DOCKER_IP = "container-host.com";
private static final String CHE_DOCKER_IP_EXTERNAL = "container-host-ext.com";
private static final String ALL_IP_ADDRESS = "0.0.0.0";
private static final String CONTAINERINFO_GATEWAY = "172.17.0.1";
private static final String CONTAINERINFO_IP_ADDRESS = "172.17.0.200";
private static final String DEFAULT_HOSTNAME = "localhost";

@Mock
private ContainerInfo containerInfo;
@Mock
private MachineConfig machineConfig;
@Mock
private ContainerConfig containerConfig;
@Mock
private NetworkSettings networkSettings;

private ServerEvaluationStrategy strategy;

private Map<String, ServerConfImpl> serverConfs;

private Map<String, List<PortBinding>> ports;

@BeforeMethod
public void setUp() {

serverConfs = new HashMap<>();
serverConfs.put("4301/tcp", new ServerConfImpl("sysServer1-tcp", "4301/tcp", "http", "/some/path1"));
serverConfs.put("4305/udp", new ServerConfImpl("devSysServer1-udp", "4305/udp", null, "some/path4"));

ports = new HashMap<>();
ports.put("4301/tcp", Collections.singletonList(new PortBinding().withHostIp(ALL_IP_ADDRESS )
.withHostPort("32100")));
ports.put("4305/udp", Collections.singletonList(new PortBinding().withHostIp(ALL_IP_ADDRESS )
.withHostPort("32103")));

when(containerInfo.getNetworkSettings()).thenReturn(networkSettings);
when(networkSettings.getGateway()).thenReturn(CONTAINERINFO_GATEWAY);
when(networkSettings.getIpAddress()).thenReturn(CONTAINERINFO_IP_ADDRESS);
when(networkSettings.getPorts()).thenReturn(ports);
when(containerInfo.getConfig()).thenReturn(containerConfig);
when(containerConfig.getLabels()).thenReturn(Collections.emptyMap());
}

/**
* Test: che.docker.ip property takes highest precedence for internal address
* @throws Exception
*/
@Test
public void defaultStrategyShouldUseInternalIpPropertyToOverrideContainerInfo() throws Exception {
// given
strategy = new DefaultServerEvaluationStrategy(CHE_DOCKER_IP, null);

final Map<String, ServerImpl> expectedServers = getExpectedServers(CONTAINERINFO_GATEWAY,
CHE_DOCKER_IP,
false);

// when
final Map<String, ServerImpl> servers = strategy.getServers(containerInfo,
null,
serverConfs);

// then
assertEquals(servers, expectedServers);
}

/**
* Test: If che.docker.ip is null, containerInfo.getGateway() is used for internal address
* @throws Exception
*/
@Test
public void defaultStrategyShouldUseContainerInfoWhenInternalIpPropertyIsNull() throws Exception {
// given
strategy = new DefaultServerEvaluationStrategy(null, null);

final Map<String, ServerImpl> expectedServers = getExpectedServers(CONTAINERINFO_GATEWAY,
CONTAINERINFO_GATEWAY,
false);

// when
final Map<String, ServerImpl> servers = strategy.getServers(containerInfo,
null,
serverConfs);

// then
assertEquals(servers, expectedServers);
}

/**
* Test: If che.docker.ip is null, and containerInfo.getGateway() is null or empty, should use provided
* internalHostname value. Also tests that this value is used for external address in this case.
* @throws Exception
*/
@Test
public void defaultStrategyShouldUseInternalHostWhenBothIpPropertyAndContainerInfoAreNull() throws Exception {
// given
strategy = new DefaultServerEvaluationStrategy(null, null);
when(networkSettings.getGateway()).thenReturn("");

final Map<String, ServerImpl> expectedServers = getExpectedServers(DEFAULT_HOSTNAME,
DEFAULT_HOSTNAME,
false);

// when
final Map<String, ServerImpl> servers = strategy.getServers(containerInfo,
DEFAULT_HOSTNAME,
serverConfs);

// then
assertEquals(servers, expectedServers);
}

/**
* Test: If che.docker.ip.external is not null, that should take precedence for external address.
* @throws Exception
*/
@Test
public void defaultStrategyShouldUseExtenalIpPropertyWhenAvailable() throws Exception {
// given
strategy = new DefaultServerEvaluationStrategy(null, CHE_DOCKER_IP_EXTERNAL);

final Map<String, ServerImpl> expectedServers = getExpectedServers(CHE_DOCKER_IP_EXTERNAL,
CONTAINERINFO_GATEWAY,
false);

// when
final Map<String, ServerImpl> servers = strategy.getServers(containerInfo,
DEFAULT_HOSTNAME,
serverConfs);

// then
assertEquals(servers, expectedServers);
}

/**
* Test: If che.docker.ip.external is null, should use containerInfo.getGateway()
* @throws Exception
*/
@Test
public void defaultStrategyShouldUseContainerInfoForExternalWhenPropertyIsNull() throws Exception {
// given
strategy = new DefaultServerEvaluationStrategy(null, null);

final Map<String, ServerImpl> expectedServers = getExpectedServers(CONTAINERINFO_GATEWAY,
CONTAINERINFO_GATEWAY,
false);

// when
final Map<String, ServerImpl> servers = strategy.getServers(containerInfo,
DEFAULT_HOSTNAME,
serverConfs);

// then
assertEquals(servers, expectedServers);
}

private Map<String, ServerImpl> getExpectedServers(String externalAddress,
String internalAddress,
boolean useExposedPorts) {
String port1;
String port2;
if (useExposedPorts) {
port1 = ":4301";
port2 = ":4305";
} else {
port1 = ":32100";
port2 = ":32103";
}
Map<String, ServerImpl> expectedServers = new HashMap<>();
expectedServers.put("4301/tcp", new ServerImpl("sysServer1-tcp",
"http",
externalAddress + ":32100",
"http://" + externalAddress + ":32100/some/path1",
new ServerPropertiesImpl("/some/path1",
internalAddress + port1,
"http://" + internalAddress + port1 + "/some/path1")));
expectedServers.put("4305/udp", new ServerImpl("devSysServer1-udp",
null,
externalAddress + ":32103",
null,
new ServerPropertiesImpl("some/path4",
internalAddress + port2,
null)));
return expectedServers;
}
}
Loading

0 comments on commit 4e8b81a

Please sign in to comment.