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/incubator-dubbo.git
commit ddf0cbaf2bec5d9a0844a1cff791113e017392a4 Author: ken.lj <[email protected]> AuthorDate: Tue Dec 25 13:55:05 2018 +0800 merge UT into one file --- .../registry/integration/RegistryProtocol.java | 2 +- .../dubbo/registry/dubbo/RegistryProtocolTest.java | 11 +++++++++++ .../registry/integration/RegistryProtocolTest.java | 23 ---------------------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java index 9fe8b4e..438d319 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java @@ -376,7 +376,7 @@ public class RegistryProtocol implements Protocol { } // available to test - String[] getParamsToRegistry(String[] defaultKeys, String[] addionalParameterKeys) { + public String[] getParamsToRegistry(String[] defaultKeys, String[] addionalParameterKeys) { int additionalLen = addionalParameterKeys.length; String[] registryParams = new String[defaultKeys.length + additionalLen]; System.arraycopy(defaultKeys, 0, registryParams, 0, defaultKeys.length); diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java index 5e6cf41..1c10289 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java @@ -35,12 +35,14 @@ import org.apache.dubbo.rpc.protocol.AbstractInvoker; import org.apache.dubbo.rpc.protocol.dubbo.DubboInvoker; import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.commons.lang3.ArrayUtils; import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; import java.util.List; +import static org.apache.dubbo.common.Constants.DEFAULT_REGISTER_PROVIDER_KEYS; import static org.junit.Assert.assertEquals; /** @@ -160,6 +162,15 @@ public class RegistryProtocolTest { } + @Test + public void testGetParamsToRegistry() { + RegistryProtocol registryProtocol = new RegistryProtocol(); + String[] additionalParams = new String[]{"key1", "key2"}; + String[] registryParams = registryProtocol.getParamsToRegistry(DEFAULT_REGISTER_PROVIDER_KEYS, additionalParams); + String[] expectParams = ArrayUtils.addAll(DEFAULT_REGISTER_PROVIDER_KEYS, additionalParams); + Assert.assertArrayEquals(expectParams, registryParams); + } + private void destroyRegistryProtocol() { Protocol registry = RegistryProtocol.getRegistryProtocol(); registry.destroy(); diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/integration/RegistryProtocolTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/integration/RegistryProtocolTest.java deleted file mode 100644 index 3b6ec31..0000000 --- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/integration/RegistryProtocolTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apache.dubbo.registry.integration; - -import org.apache.commons.lang3.ArrayUtils; -import org.junit.Assert; -import org.junit.Test; - -import static org.apache.dubbo.common.Constants.DEFAULT_REGISTER_PROVIDER_KEYS; - -/** - * @author cvictory ON 2018/11/14 - */ -public class RegistryProtocolTest { - - @Test - public void testGetParamsToRegistry() { - RegistryProtocol registryProtocol = new RegistryProtocol(); - String[] additionalParams = new String[]{"key1", "key2"}; - String[] registryParams = registryProtocol.getParamsToRegistry(DEFAULT_REGISTER_PROVIDER_KEYS, additionalParams); - String[] expectParams = ArrayUtils.addAll(DEFAULT_REGISTER_PROVIDER_KEYS, additionalParams); - Assert.assertArrayEquals(expectParams, registryParams); - } -} -
