You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/05/08 04:55:09 UTC
[dubbo] branch master updated: Fix compilation (#6117)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new dd8dacd Fix compilation (#6117)
dd8dacd is described below
commit dd8dacdc1766e8fd118404830e60d9d7eb32d5f6
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri May 8 12:54:51 2020 +0800
Fix compilation (#6117)
---
.../dubbo/registry/dubbo/RegistryDirectoryTest.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java
index 3d7225c..baf8670 100644
--- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java
+++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java
@@ -20,6 +20,7 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.utils.LogUtil;
import org.apache.dubbo.common.utils.NetUtils;
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.registry.NotifyListener;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.RegistryFactory;
@@ -46,6 +47,7 @@ import org.mockito.Mockito;
import javax.script.ScriptEngineManager;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -96,7 +98,8 @@ public class RegistryDirectoryTest {
}
private RegistryDirectory getRegistryDirectory(URL url) {
- RegistryDirectory registryDirectory = new RegistryDirectory(URL.class, url);
+ Map<String, String> qs = Collections.unmodifiableMap(StringUtils.parseQueryString(url.getParameterAndDecoded(REFER_KEY)));
+ RegistryDirectory registryDirectory = new RegistryDirectory(URL.class, url, qs);
registryDirectory.setProtocol(protocol);
registryDirectory.setRegistry(registry);
registryDirectory.setRouterChain(RouterChain.buildChain(url));
@@ -115,21 +118,22 @@ public class RegistryDirectoryTest {
@Test
public void test_Constructor_WithErrorParam() {
try {
- new RegistryDirectory(null, null);
+ new RegistryDirectory(null, null, null);
fail();
} catch (IllegalArgumentException e) {
}
try {
+ Map<String, String> qs = Collections.unmodifiableMap(StringUtils.parseQueryString(noMeaningUrl.getParameterAndDecoded(REFER_KEY)));
// null url
- new RegistryDirectory(null, noMeaningUrl);
+ new RegistryDirectory(null, noMeaningUrl, qs);
fail();
} catch (IllegalArgumentException e) {
}
try {
// no servicekey
- new RegistryDirectory(RegistryDirectoryTest.class, URL.valueOf("dubbo://10.20.30.40:9090"));
+ new RegistryDirectory(RegistryDirectoryTest.class, URL.valueOf("dubbo://10.20.30.40:9090"), new HashMap<>());
fail();
} catch (IllegalArgumentException e) {
@@ -333,9 +337,10 @@ public class RegistryDirectoryTest {
RegistryDirectory registryDirectory = getRegistryDirectory();
URL regurl = noMeaningUrl.addParameter("test", "reg").addParameterAndEncoded(REFER_KEY,
"key=query&" + LOADBALANCE_KEY + "=" + LeastActiveLoadBalance.NAME);
+ Map<String, String> qs = Collections.unmodifiableMap(StringUtils.parseQueryString(regurl.getParameterAndDecoded(REFER_KEY)));
RegistryDirectory<RegistryDirectoryTest> registryDirectory2 = new RegistryDirectory(
RegistryDirectoryTest.class,
- regurl);
+ regurl, qs);
registryDirectory2.setProtocol(protocol);
List<URL> serviceUrls = new ArrayList<URL>();