Separate tests

vuminhkh · vuminhkh · commit 89330387bf90 · 2016-04-30T14:24:44.000+02:00
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -5,11 +5,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
 
 import java.lang.reflect.Method;
 
@@ -39,6 +35,20 @@ public void afterMethod(ITestResult result) {
     @Test
     public void createNetwork() throws DockerException {
 
+        String networkName = "testNetwork";
+
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getName(), networkName);
+        assertEquals(network.getDriver(), "bridge");
+    }
+
+    @Test
+    public void createNetworkWithCustomConfig() throws DockerException {
+
         String networkName = "testNetwork";
         Network.Ipam.Config config = new Network.Ipam.Config();
         config.setSubnet("10.67.79.0/24");
@@ -49,5 +59,6 @@ public void createNetwork() throws DockerException {
         Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
         assertEquals(network.getName(), networkName);
         assertEquals(network.getDriver(), "bridge");
+        assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
@@ -5,11 +5,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
 
 import java.lang.reflect.Method;
 
@@ -39,6 +35,20 @@ public void afterMethod(ITestResult result) {
     @Test
     public void createNetwork() throws DockerException {
 
+        String networkName = "testNetwork";
+
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getName(), networkName);
+        assertEquals(network.getDriver(), "bridge");
+    }
+
+    @Test
+    public void createNetworkWithCustomConfig() throws DockerException {
+
         String networkName = "testNetwork";
         Network.Ipam.Config config = new Network.Ipam.Config();
         config.setSubnet("10.67.79.0/24");
@@ -49,5 +59,6 @@ public void createNetwork() throws DockerException {
         Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
         assertEquals(network.getName(), networkName);
         assertEquals(network.getDriver(), "bridge");
+        assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
     }
 }
