fix utils tests bug

cnf-utils/src/main/java/top/ninwoo/utils/config/UtilsProperties.java

@@ -4,7 +4,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "cnf.utils")
 public class UtilsProperties {
-    private String passwd = "admin";
+    private String passwd = "Vudo3423";
 
     public String getPasswd() {
         return passwd;

cnf-utils/src/main/resources/META-INF/spring.factories

-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  top.ninwoo.utils.config.CNFUtilsAutoConfiguration
\ No newline at end of file

cnf-utils/src/test/java/top/ninwoo/utils/DockerUtilsTest.java

 package top.ninwoo.utils;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +12,9 @@ import top.ninwoo.common.entity.DockerContainer;
 import top.ninwoo.utils.config.CNFUtilsAutoConfiguration;
 import top.ninwoo.utils.util.DockerUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author joliu
  * @Description
@@ -18,13 +23,23 @@ import top.ninwoo.utils.util.DockerUtils;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = CNFUtilsAutoConfiguration.class)
 public class DockerUtilsTest {
+    private static String cid = null;
     @Autowired
     DockerUtils dockerUtils;
 
+    @Before
+    public void prepare() {
+        DockerContainer container = new DockerContainer();
+        container.setName("Router_4");
+        container.setImage("joliu/networktest");
+        container.setCommand("sh");
+        cid = dockerUtils.runDocker(container).getId();
+    }
+
     @Test
     public void testGetDockerById() {
-        DockerContainer dockerById = dockerUtils.getDockerById("123123");
-        Assert.isNull(dockerById);
+        DockerContainer dockerById = dockerUtils.getDockerById(cid);
+        Assert.isTrue(dockerById != null);
     }
 
 
@@ -32,6 +47,12 @@ public class DockerUtilsTest {
     public void testExecInDocker() {
         final String s =
                 dockerUtils.execInDocker("Router_4", new String[]{"ifconfig"});
-        System.out.println(s);
+        Assert.isTrue(!("".equals(s)));
+    }
+
+    @After
+    public void close() {
+        boolean result = dockerUtils.deleteDockerById(cid);
+        Assert.isTrue(result);
     }
 }

cnf-utils/src/test/java/top/ninwoo/utils/EntityTests.java

-package top.ninwoo.utils;
-
-/**
- * @Author joliu
- * @Description
- * @Date　Create in 下午10:50 2019/10/27
- */
-public class EntityTests {
-}

cnf-utils/src/test/java/top/ninwoo/utils/IptablesServiceTests.java

-package top.ninwoo.utils;
-
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import top.ninwoo.utils.config.CNFUtilsAutoConfiguration;
-import top.ninwoo.utils.service.IptablesService;
-
-/**
- * @Author joliu
- * @Description
- * @Date　Create in 下午3:15 2019/10/30
- */
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = CNFUtilsAutoConfiguration.class)
-public class IptablesServiceTests {
-    @Autowired
-    IptablesService iptablesService;
-}

cnf-utils/src/test/java/top/ninwoo/utils/OsUtilsTests.java

@@ -26,7 +26,7 @@ public class OsUtilsTests {
         System.out.println("CPU:" + osUtils.cpuUsage() + "%");
         System.out.println("MEM:" + osUtils.memoryUsage() + "%");
         int i = 0;
-        while(i < 10) {
+        while(i++ < 10) {
             System.out.println("NET:" + osUtils.networkUsage() + "%");
         }
     }

cnf-utils/src/test/java/top/ninwoo/utils/SpringMain.java

-package top.ninwoo.utils;
-
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import top.ninwoo.utils.config.CNFUtilsAutoConfiguration;
-
-public class SpringMain {
-    public static void main(String[] args) {
-        AnnotationConfigApplicationContext context =
-                new AnnotationConfigApplicationContext(CNFUtilsAutoConfiguration.class);
-
-    }
-}

cnf-utils/src/test/java/top/ninwoo/utils/TcUtilsTests.java

-package top.ninwoo.utils;
-
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import top.ninwoo.utils.config.CNFUtilsAutoConfiguration;
-import top.ninwoo.utils.util.DockerUtils;
-
-/**
- * @Author joliu
- * @Description 这个测试迁移到集群服务中
- * @Date　Create in 下午4:06 2019/10/30
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = CNFUtilsAutoConfiguration.class)
-public class TcUtilsTests {
-    @Autowired
-    DockerUtils dockerUtils;
-
-    @Before
-    public void init() {
-        // 创建两个容器
-
-        // 创建一个ovs网桥
-    }
-}