http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6cfb4351/docker/src/test/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadataTest.java ---------------------------------------------------------------------- diff --git a/docker/src/test/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadataTest.java b/docker/src/test/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadataTest.java index b062f2f..6e79685 100644 --- a/docker/src/test/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadataTest.java +++ b/docker/src/test/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadataTest.java @@ -21,6 +21,8 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; + +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Set; @@ -65,7 +67,7 @@ public class ContainerToNodeMetadataTest { public void setup() { Config containerConfig = Config.builder() .hostname("6d35806c1bd2") - .domainName("") + .domainname("") .user("") .memory(0) .memorySwap(0) @@ -79,27 +81,27 @@ public class ContainerToNodeMetadataTest { .stdinOnce(false) .env(null) .cmd(ImmutableList.of("/usr/sbin/sshd", "-D")) - .imageId("jclouds/ubuntu") + .image("jclouds/ubuntu") .volumesFrom("") .workingDir("") .entrypoint(null) .networkDisabled(false) .build(); - State state = State.builder() - .pid(3626) - .running(true) - .exitCode(0) - .startedAt("2014-03-24T20:28:37.537659054Z") - .finishedAt("0001-01-01T00:00:00Z") - .ghost(false) - .build(); + State state = State.create( // + 3626, // pid + true, // running + 0, // exitCode + "2014-03-24T20:28:37.537659054Z", // startedAt + "0001-01-01T00:00:00Z", // finishedAt + false // ghost + ); container = Container.builder() .id("6d35806c1bd2b25cd92bba2d2c2c5169dc2156f53ab45c2b62d76e2d2fee14a9") .name("/hopeful_mclean") .created("2014-03-22T07:16:45.784120972Z") .path("/usr/sbin/sshd") - .args(new String[] {"-D"}) - .containerConfig(containerConfig) + .args(Arrays.asList("-D")) + .config(containerConfig) .state(state) .image("af0f59f1c19eef9471c3b8c8d587c39b8f130560b54f3766931b37d76d5de4b6") .networkSettings(NetworkSettings.builder() @@ -190,12 +192,12 @@ public class ContainerToNodeMetadataTest { private Container mockContainer() { Container mockContainer = EasyMock.createMock(Container.class); - expect(mockContainer.getId()).andReturn(container.getId()); - expect(mockContainer.getName()).andReturn(container.getName()); - expect(mockContainer.getContainerConfig()).andReturn(container.getContainerConfig()).anyTimes(); - expect(mockContainer.getNetworkSettings()).andReturn(container.getNetworkSettings()).anyTimes(); - expect(mockContainer.getState()).andReturn(container.getState()); - expect(mockContainer.getImage()).andReturn(container.getImage()).anyTimes(); + expect(mockContainer.id()).andReturn(container.id()); + expect(mockContainer.name()).andReturn(container.name()); + expect(mockContainer.config()).andReturn(container.config()).anyTimes(); + expect(mockContainer.networkSettings()).andReturn(container.networkSettings()).anyTimes(); + expect(mockContainer.state()).andReturn(container.state()); + expect(mockContainer.image()).andReturn(container.image()).anyTimes(); replay(mockContainer); return mockContainer;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6cfb4351/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java ---------------------------------------------------------------------- diff --git a/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java b/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java index 0141c70..0d35792 100644 --- a/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java +++ b/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java @@ -39,14 +39,18 @@ public class ImageToImageTest { @BeforeMethod public void setup() { - image = org.jclouds.docker.domain.Image.builder() - .id("id") - .parent("parent") - .created("created") - .architecture("x86_64") - .repoTags(ImmutableList.of("repoTag1:version")) - .size(0l) - .build(); + image = org.jclouds.docker.domain.Image.create( + "id", // id + "parent", // parent + "created", // created + null, // container + null, // dockerVersion + "x86_64", // architecture + null, // os + 0l, // size + 0l, // virtualSize + ImmutableList.of("repoTag1:version") // repoTags + ); function = new ImageToImage(); } @@ -57,15 +61,15 @@ public class ImageToImageTest { verify(mockImage); - assertEquals(mockImage.getId(), image.getId().toString()); + assertEquals(mockImage.id(), image.getId().toString()); } private org.jclouds.docker.domain.Image mockImage() { org.jclouds.docker.domain.Image mockImage = EasyMock.createMock(org.jclouds.docker.domain.Image.class); - expect(mockImage.getId()).andReturn(image.getId()).anyTimes(); - expect(mockImage.getRepoTags()).andReturn(image.getRepoTags()).anyTimes(); - expect(mockImage.getArchitecture()).andReturn(image.getArchitecture()).anyTimes(); + expect(mockImage.id()).andReturn(image.id()).anyTimes(); + expect(mockImage.repoTags()).andReturn(image.repoTags()).anyTimes(); + expect(mockImage.architecture()).andReturn(image.architecture()).anyTimes(); replay(mockImage); return mockImage; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6cfb4351/docker/src/test/java/org/jclouds/docker/compute/functions/StateToStatusTest.java ---------------------------------------------------------------------- diff --git a/docker/src/test/java/org/jclouds/docker/compute/functions/StateToStatusTest.java b/docker/src/test/java/org/jclouds/docker/compute/functions/StateToStatusTest.java index b9739ab..f66f040 100644 --- a/docker/src/test/java/org/jclouds/docker/compute/functions/StateToStatusTest.java +++ b/docker/src/test/java/org/jclouds/docker/compute/functions/StateToStatusTest.java @@ -46,7 +46,7 @@ public class StateToStatusTest { verify(mockState); - assertEquals(mockState.isRunning(), true); + assertEquals(mockState.running(), true); assertEquals(status, NodeMetadata.Status.RUNNING); } @@ -57,14 +57,14 @@ public class StateToStatusTest { verify(mockState); - assertEquals(mockState.isRunning(), false); + assertEquals(mockState.running(), false); assertEquals(status, NodeMetadata.Status.TERMINATED); } private State mockStateRunning() { State mockState = EasyMock.createMock(State.class); - expect(mockState.isRunning()).andReturn(true).anyTimes(); + expect(mockState.running()).andReturn(true).anyTimes(); replay(mockState); return mockState; @@ -73,7 +73,7 @@ public class StateToStatusTest { private State mockStateNotRunning() { State mockState = EasyMock.createMock(State.class); - expect(mockState.isRunning()).andReturn(false).anyTimes(); + expect(mockState.running()).andReturn(false).anyTimes(); replay(mockState); return mockState; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6cfb4351/docker/src/test/java/org/jclouds/docker/config/DockerParserModuleTest.java ---------------------------------------------------------------------- diff --git a/docker/src/test/java/org/jclouds/docker/config/DockerParserModuleTest.java b/docker/src/test/java/org/jclouds/docker/config/DockerParserModuleTest.java index 4f5ba75..57659c5 100644 --- a/docker/src/test/java/org/jclouds/docker/config/DockerParserModuleTest.java +++ b/docker/src/test/java/org/jclouds/docker/config/DockerParserModuleTest.java @@ -16,15 +16,18 @@ */ package org.jclouds.docker.config; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + import org.jclouds.docker.domain.Container; -import org.testng.annotations.BeforeMethod; +import org.jclouds.docker.domain.NetworkSettings; +import org.jclouds.docker.domain.Port; +import org.jclouds.json.Json; +import org.jclouds.json.config.GsonModule; import org.testng.annotations.Test; -import static org.jclouds.docker.config.DockerParserModule.ContainerTypeAdapter; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import com.google.common.collect.ImmutableMap; +import com.google.inject.Guice; /** * Unit tests for the {@link org.jclouds.docker.config.DockerParserModule} class. @@ -32,21 +35,27 @@ import static org.testng.Assert.assertNotNull; @Test(groups = "unit", testName = "DockerParserModuleTest") public class DockerParserModuleTest { - private Gson gson; + private Json json = Guice.createInjector(new GsonModule(), new DockerParserModule()).getInstance(Json.class); - @BeforeMethod - public void setup() { - gson = new GsonBuilder() - .registerTypeAdapter(Container.class, new ContainerTypeAdapter()) - .create(); - } - - @Test public void testContainerWithVolumesNull() { - Container container = gson.fromJson( - "{ \"Volumes\": null }", Container.class); + Container container = json.fromJson("{ \"Id\": \"foo\", \"Volumes\": null }", Container.class); assertNotNull(container); - assertEquals(container.getVolumes(), null); + assertEquals(container.id(), "foo"); + assertEquals(container.volumes(), ImmutableMap.of()); } + public void port() { + // Note IP, not Ip + String text = "{\"IP\":\"0.0.0.0\",\"PrivatePort\":4567,\"PublicPort\":49155,\"Type\":\"tcp\"}"; + Port port = Port.create("0.0.0.0", 4567, 49155, "tcp"); + assertEquals(json.fromJson(text, Port.class), port); + assertEquals(json.toJson(port), text); + } + + public void networkSettings() { + String text = "{\"IPAddress\":\"XX.XX.206.98\",\"IPPrefixLen\":27,\"Gateway\":\"XX.XX.206.105\",\"Bridge\":\"public\",\"Ports\":{}}"; + NetworkSettings settings = NetworkSettings.create("XX.XX.206.98", 27, "XX.XX.206.105", "public", null, null); + assertEquals(json.fromJson(text, NetworkSettings.class), settings); + assertEquals(json.toJson(settings), text); + } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6cfb4351/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java ---------------------------------------------------------------------- diff --git a/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java b/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java index 34feddd..30fd171 100644 --- a/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java +++ b/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java @@ -50,7 +50,7 @@ public class RemoteApiLiveTest extends BaseDockerApiLiveTest { @Test public void testVersion() { - assertEquals(api().getVersion().getVersion(), "1.0.0"); + assertEquals(api().getVersion().version(), "1.0.0"); } @Test(dependsOnMethods = "testVersion") @@ -69,37 +69,37 @@ public class RemoteApiLiveTest extends BaseDockerApiLiveTest { @Test(dependsOnMethods = "testListImages") public void testCreateContainer() throws IOException, InterruptedException { - Config containerConfig = Config.builder().imageId(image.getId()) + Config containerConfig = Config.builder().image(image.id()) .cmd(ImmutableList.of("/bin/sh", "-c", "while true; do echo hello world; sleep 1; done")) .build(); container = api().createContainer("testCreateContainer", containerConfig); assertNotNull(container); - assertNotNull(container.getId()); + assertNotNull(container.id()); } @Test(dependsOnMethods = "testCreateContainer") public void testStartContainer() throws IOException, InterruptedException { - api().startContainer(container.getId()); - assertTrue(api().inspectContainer(container.getId()).getState().isRunning()); + api().startContainer(container.id()); + assertTrue(api().inspectContainer(container.id()).state().running()); } @Test(dependsOnMethods = "testStartContainer") public void testStopContainer() { - api().stopContainer(container.getId()); - assertFalse(api().inspectContainer(container.getId()).getState().isRunning()); + api().stopContainer(container.id()); + assertFalse(api().inspectContainer(container.id()).state().running()); } @Test(dependsOnMethods = "testStopContainer", expectedExceptions = NullPointerException.class) public void testRemoveContainer() { - api().removeContainer(container.getId()); - assertFalse(api().inspectContainer(container.getId()).getState().isRunning()); + api().removeContainer(container.id()); + assertFalse(api().inspectContainer(container.id()).state().running()); } @Test(dependsOnMethods = "testRemoveContainer", expectedExceptions = ResourceNotFoundException.class) public void testDeleteImage() { - InputStream deleteImageStream = api().deleteImage(image.getId()); + InputStream deleteImageStream = api().deleteImage(image.id()); consumeStream(deleteImageStream, false); - assertNull(api().inspectImage(image.getId())); + assertNull(api().inspectImage(image.id())); } public void testBuildImage() throws IOException, InterruptedException, URISyntaxException { @@ -111,7 +111,7 @@ public class RemoteApiLiveTest extends BaseDockerApiLiveTest { String rawImageId = Iterables.getLast(Splitter.on("Successfully built ").split(lastStreamedLine)); String imageId = rawImageId.substring(0, 11); Image image = api().inspectImage(imageId); - api().deleteImage(image.getId(), DeleteImageOptions.Builder.force(true)); + api().deleteImage(image.id(), DeleteImageOptions.Builder.force(true)); } private RemoteApi api() { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6cfb4351/docker/src/test/java/org/jclouds/docker/features/RemoteApiMockTest.java ---------------------------------------------------------------------- diff --git a/docker/src/test/java/org/jclouds/docker/features/RemoteApiMockTest.java b/docker/src/test/java/org/jclouds/docker/features/RemoteApiMockTest.java index 760f723..515d98d 100644 --- a/docker/src/test/java/org/jclouds/docker/features/RemoteApiMockTest.java +++ b/docker/src/test/java/org/jclouds/docker/features/RemoteApiMockTest.java @@ -108,11 +108,11 @@ public class RemoteApiMockTest extends BaseDockerMockTest { Container container = remoteApi.inspectContainer(containerId); assertRequestHasCommonFields(server.takeRequest(), "/containers/" + containerId + "/json"); assertNotNull(container); - assertNotNull(container.getId(), containerId); - assertNotNull(container.getContainerConfig()); - assertNotNull(container.getHostConfig()); - assertEquals(container.getName(), "/tender_lumiere"); - assertEquals(container.getState().isRunning(), true); + assertNotNull(container.id(), containerId); + assertNotNull(container.config()); + assertNotNull(container.hostConfig()); + assertEquals(container.name(), "/tender_lumiere"); + assertEquals(container.state().running(), true); } finally { api.close(); server.shutdown(); @@ -126,7 +126,7 @@ public class RemoteApiMockTest extends BaseDockerMockTest { RemoteApi remoteApi = api.getRemoteApi(); String containerId = "notExisting"; try { - Container container = remoteApi.inspectContainer(containerId); + remoteApi.inspectContainer(containerId); assertRequestHasCommonFields(server.takeRequest(), "/containers/" + containerId + "/json"); } finally { api.close(); @@ -145,13 +145,13 @@ public class RemoteApiMockTest extends BaseDockerMockTest { .attachStderr(true) .attachStdout(true) .tty(false) - .imageId("base") + .image("base") .build(); try { Container container = remoteApi.createContainer("test", containerConfig); assertRequestHasCommonFields(server.takeRequest(), "POST", "/containers/create?name=test"); assertNotNull(container); - assertEquals(container.getId(), "c6c74153ae4b1d1633d68890a68d89c40aa5e284a1ea016cbc6ef0e634ee37b2"); + assertEquals(container.id(), "c6c74153ae4b1d1633d68890a68d89c40aa5e284a1ea016cbc6ef0e634ee37b2"); } finally { api.close(); server.shutdown();
