From f7c8449d0af8427ea0b4a4217493d18139681df9 Mon Sep 17 00:00:00 2001 From: "william.liangf" Date: Sat, 10 Mar 2012 17:37:18 +0000 Subject: [PATCH] =?UTF-8?q?DUBBO-68=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@1237 1a56cb94-b969-4eaa-88fa-be21384802f2 --- .../java/com/alibaba/dubbo/common/URLTest.java | 2 +- .../dubbo/monitor/dubbo/DubboMonitorTest.java | 14 +++++++++++++- .../registry/dubbo/RegistryDirectoryTest.java | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java index 263ce66cc0..bff1227fc5 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java @@ -275,7 +275,7 @@ public class URLTest { Map params = new HashMap(); params.put("version", "1.0.0"); params.put("application", "morgan"); - URL url2 = new URL("dubbo", "10.20.130.230", 20880, "context/path", params); + URL url2 = new URL("dubbo", "admin", "hello1234", "10.20.130.230", 20880, "context/path", params); assertEquals(url1, url2); } diff --git a/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java b/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java index 68f6f1101b..4016bd1851 100644 --- a/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java +++ b/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java @@ -84,7 +84,19 @@ public class DubboMonitorTest { while (lastStatistics == null) { Thread.sleep(10); } - Assert.assertEquals(statistics, lastStatistics); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.APPLICATION), "morgan"); + Assert.assertEquals(lastStatistics.getProtocol(), "dubbo"); + Assert.assertEquals(lastStatistics.getHost(), "10.20.153.10"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.APPLICATION), "morgan"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.INTERFACE), "MemberService"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.METHOD), "findPerson"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.CONSUMER), "10.20.153.11"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.SUCCESS), "1"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.FAILURE), "0"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.ELAPSED), "3"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.MAX_ELAPSED), "3"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.CONCURRENT), "1"); + Assert.assertEquals(lastStatistics.getParameter(MonitorService.MAX_CONCURRENT), "1"); monitor.destroy(); } diff --git a/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java b/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java index 90d626ab01..ffc74a3c97 100644 --- a/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java +++ b/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java @@ -113,7 +113,7 @@ public class RegistryDirectoryTest { field.setAccessible(true); Map queryMap = (Map) field.get(reg); Assert.assertEquals("bar", queryMap.get("foo")); - Assert.assertEquals(url.removeParameter(Constants.REFER_KEY), reg.getUrl()); + Assert.assertEquals(url.removeParameter(Constants.REFER_KEY).addParameter("foo", "bar"), reg.getUrl()); } @Test @@ -451,7 +451,7 @@ public class RegistryDirectoryTest { List invokers = registryDirectory.list(invocation); Assert.assertEquals(1, invokers.size()); - Assert.assertEquals(serviceURL.setPath(service), invokers.get(0).getUrl()); + Assert.assertEquals(serviceURL.setPath(service).addParameter("check", "false"), invokers.get(0).getUrl()); }