diff --git a/.gitignore b/.gitignore index 7f60d60a3dd..a98a8a69457 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ target/ # system ignore .DS_Store Thumbs.db +*.orig diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java.orig b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java.orig deleted file mode 100644 index c22910bb93c..00000000000 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java.orig +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.dubbo.config; - -<<<<<<< HEAD -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.config.mock.MockProtocol2; -======= ->>>>>>> e201004e985f3ae43ee8c65baa16bcc0aecc0000 -import com.alibaba.dubbo.rpc.Protocol; -import org.junit.Test; -import org.mockito.Mockito; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasEntry; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - -public class ProtocolConfigTest { - - @Test - public void testDestroy() throws Exception { - Protocol protocol = Mockito.mock(Protocol.class); - MockProtocol2.delegate = protocol; - ProtocolConfig protocolConfig = new ProtocolConfig(); - protocolConfig.setName("mockprotocol2"); - protocolConfig.destory(); - Mockito.verify(protocol).destroy(); - } - - @Test - public void testName() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setName("name"); - Map parameters = new HashMap(); - ProtocolConfig.appendParameters(parameters, protocol); - assertThat(protocol.getName(), equalTo("name")); - assertThat(protocol.getId(), equalTo("name")); - assertThat(parameters.isEmpty(), is(true)); - } - - @Test - public void testHost() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setHost("host"); - Map parameters = new HashMap(); - ProtocolConfig.appendParameters(parameters, protocol); - assertThat(protocol.getHost(), equalTo("host")); - assertThat(parameters.isEmpty(), is(true)); - } - - @Test - public void testPort() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setPort(8080); - Map parameters = new HashMap(); - ProtocolConfig.appendParameters(parameters, protocol); - assertThat(protocol.getPort(), equalTo(8080)); - assertThat(parameters.isEmpty(), is(true)); - } - - @Test - public void testPath() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setContextpath("context-path"); - Map parameters = new HashMap(); - ProtocolConfig.appendParameters(parameters, protocol); - assertThat(protocol.getPath(), equalTo("context-path")); - assertThat(protocol.getContextpath(), equalTo("context-path")); - assertThat(parameters.isEmpty(), is(true)); - protocol.setPath("path"); - assertThat(protocol.getPath(), equalTo("path")); - assertThat(protocol.getContextpath(), equalTo("path")); - } - - @Test - public void testThreads() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setThreads(10); - assertThat(protocol.getThreads(), is(10)); - } - - @Test - public void testIothreads() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setIothreads(10); - assertThat(protocol.getIothreads(), is(10)); - } - - @Test - public void testQueues() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setQueues(10); - assertThat(protocol.getQueues(), is(10)); - } - - @Test - public void testAccepts() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setAccepts(10); - assertThat(protocol.getAccepts(), is(10)); - } - - @Test - public void testCodec() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setName("dubbo"); - protocol.setCodec("mockcodec"); - assertThat(protocol.getCodec(), equalTo("mockcodec")); - } - - @Test - public void testAccesslog() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setAccesslog("access.log"); - assertThat(protocol.getAccesslog(), equalTo("access.log")); - } - - @Test - public void testTelnet() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setTelnet("mocktelnethandler"); - assertThat(protocol.getTelnet(), equalTo("mocktelnethandler")); - } - - @Test - public void testRegister() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setRegister(true); - assertThat(protocol.isRegister(), is(true)); - } - - @Test - public void testTransporter() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setTransporter("mocktransporter"); - assertThat(protocol.getTransporter(), equalTo("mocktransporter")); - } - - @Test - public void testExchanger() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setExchanger("mockexchanger"); - assertThat(protocol.getExchanger(), equalTo("mockexchanger")); - } - - @Test - public void testDispatcher() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setDispatcher("mockdispatcher"); - assertThat(protocol.getDispatcher(), equalTo("mockdispatcher")); - } - - @Test - public void testNetworker() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setNetworker("networker"); - assertThat(protocol.getNetworker(), equalTo("networker")); - } - - @Test - public void testParameters() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setParameters(Collections.singletonMap("k1", "v1")); - assertThat(protocol.getParameters(), hasEntry("k1", "v1")); - } - - @Test - public void testDefault() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setDefault(true); - assertThat(protocol.isDefault(), is(true)); - } - - @Test - public void testKeepAlive() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setKeepAlive(true); - assertThat(protocol.getKeepAlive(), is(true)); - } - - @Test - public void testOptimizer() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setOptimizer("optimizer"); - assertThat(protocol.getOptimizer(), equalTo("optimizer")); - } - - @Test - public void testExtension() throws Exception { - ProtocolConfig protocol = new ProtocolConfig(); - protocol.setExtension("extension"); - assertThat(protocol.getExtension(), equalTo("extension")); - } -}