From da3a1ea79647891ccb61328dacbbdd9c12975812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E7=BB=A7=E5=B3=B0?= Date: Sun, 25 Apr 2021 10:03:28 +0800 Subject: [PATCH] [ISSUE #5380] Use assert instead of System.out (#5472) * use assert instead of System.out * move test case, there is no file named ParamCheckUtil.java --- .../nacos/address/ParamCheckUtilTests.java | 32 ------------------- .../nacos/common/utils/IPUtilTest.java | 9 ++++++ .../java/com/alibaba/nacos/test/BaseTest.java | 8 ++++- .../nacos/test/common/HttpUtils_ITCase.java | 4 ++- 4 files changed, 19 insertions(+), 34 deletions(-) delete mode 100644 address/src/test/java/com/alibaba/nacos/address/ParamCheckUtilTests.java diff --git a/address/src/test/java/com/alibaba/nacos/address/ParamCheckUtilTests.java b/address/src/test/java/com/alibaba/nacos/address/ParamCheckUtilTests.java deleted file mode 100644 index 09f3f6f9d2b..00000000000 --- a/address/src/test/java/com/alibaba/nacos/address/ParamCheckUtilTests.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 1999-2018 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.alibaba.nacos.address; - -import com.alibaba.nacos.common.utils.IPUtil; -import org.junit.Test; - -public class ParamCheckUtilTests { - - @Test - public void checkIPs() { - String[] ips = {"127.0.0.1"}; - System.out.println(IPUtil.checkIPs(ips)); - - String[] illlegalIps = {"127.100.19", "127.0.0.1"}; - System.err.println(IPUtil.checkIPs(illlegalIps)); - } -} diff --git a/common/src/test/java/com/alibaba/nacos/common/utils/IPUtilTest.java b/common/src/test/java/com/alibaba/nacos/common/utils/IPUtilTest.java index f94ea3cbc0d..5eadbdbbd34 100644 --- a/common/src/test/java/com/alibaba/nacos/common/utils/IPUtilTest.java +++ b/common/src/test/java/com/alibaba/nacos/common/utils/IPUtilTest.java @@ -94,6 +94,15 @@ public void testSplitIpPort() { checkSplitIPPortStr("[127.0.0.1]:88", true); } + @Test + public void testCheckIPs() { + String[] ips = {"127.0.0.1"}; + Assert.assertEquals("ok", IPUtil.checkIPs(ips)); + + String[] illegalIps = {"127.100.19", "127.0.0.1"}; + Assert.assertEquals("illegal ip: 127.100.19", IPUtil.checkIPs(illegalIps)); + } + /** * checkSplitIpPortStr. * 2020/9/4 14:12 diff --git a/test/src/test/java/com/alibaba/nacos/test/BaseTest.java b/test/src/test/java/com/alibaba/nacos/test/BaseTest.java index b88465e031a..58c06650900 100644 --- a/test/src/test/java/com/alibaba/nacos/test/BaseTest.java +++ b/test/src/test/java/com/alibaba/nacos/test/BaseTest.java @@ -18,6 +18,7 @@ import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.naming.healthcheck.RsInfo; +import org.junit.Assert; import org.junit.Test; /** @@ -33,7 +34,12 @@ public class BaseTest { public void test_rs_json() { String json = "{\"cluster\":\"DEFAULT\",\"ip\":\"127.0.0.1\",\"metadata\":{},\"port\":60000,\"scheduled\":true,\"serviceName\":\"DEFAULT_GROUP@@jinhan9J7ye.Vj6hx.net\",\"weight\":1.0}"; RsInfo client = JacksonUtils.toObj(json, RsInfo.class); - System.out.println(client); + Assert.assertEquals(60000, client.getPort()); + Assert.assertEquals("DEFAULT_GROUP@@jinhan9J7ye.Vj6hx.net", client.getServiceName()); + Assert.assertEquals("DEFAULT", client.getCluster()); + Assert.assertEquals(1D, client.getWeight(), 0); + Assert.assertTrue(client.getMetadata().isEmpty()); + Assert.assertEquals("127.0.0.1", client.getIp()); } } diff --git a/test/src/test/java/com/alibaba/nacos/test/common/HttpUtils_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/common/HttpUtils_ITCase.java index bcd483e56c9..0a95c85e726 100644 --- a/test/src/test/java/com/alibaba/nacos/test/common/HttpUtils_ITCase.java +++ b/test/src/test/java/com/alibaba/nacos/test/common/HttpUtils_ITCase.java @@ -53,7 +53,9 @@ public void test_deserialization_type() throws Exception { public void test_rest_result() throws Exception { String json = "{\"code\":200,\"message\":null,\"data\":[{\"USERNAME\":\"nacos\",\"PASSWORD\":\"$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu\",\"ENABLED\":true}]}"; RestResult result = ResponseHandler.convert(json, new GenericType>(){}.getType()); - System.out.println(result); + Assert.assertEquals(200, result.getCode()); + Assert.assertNull(result.getMessage()); + Assert.assertNotNull(result.getData()); } @Test