diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbb-provider.properties b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbb-provider.properties index 2ef6638dc9de..f2e20c4df972 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbb-provider.properties +++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbb-provider.properties @@ -1,7 +1,7 @@ # Dubbo Provider Properties as an alternative for # Spring XML Bean definition : META-INF/spring/dubbo-annotation-provider.xml -## Service Providers' Placeholders for com.alibaba.dubbo.config.spring.context.annotation.provider.DemoServiceImpl +## Service Providers' Placeholders for org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl demo.service.application = dubbo-demo-application demo.service.protocol = dubbo diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericFilterTest.java index e09afe6e776a..bd680e7502ee 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericFilterTest.java @@ -49,7 +49,7 @@ public void testInvokeWithDefault() throws Exception { RpcInvocation invocation = new RpcInvocation(Constants.$INVOKE, genericInvoke.getParameterTypes(), new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}, new Object[]{person}}); - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" + + URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" + "accesslog=true&group=dubbo&version=1.1"); Invoker invoker = Mockito.mock(Invoker.class); when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10))); @@ -76,7 +76,7 @@ public void testInvokeWithJavaException() throws Exception { new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}, new Object[]{person}}); invocation.setAttachment(Constants.GENERIC_KEY, Constants.GENERIC_SERIALIZATION_NATIVE_JAVA); - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" + + URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" + "accesslog=true&group=dubbo&version=1.1"); Invoker invoker = Mockito.mock(Invoker.class); when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10))); @@ -99,7 +99,7 @@ public void testInvokeWithJavaException() throws Exception { RpcInvocation invocation = new RpcInvocation("sayHi", genericInvoke.getParameterTypes() , new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}, new Object[]{person}}); - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" + + URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" + "accesslog=true&group=dubbo&version=1.1"); Invoker invoker = Mockito.mock(Invoker.class); when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10))); @@ -123,7 +123,7 @@ public void testInvokeWithMethodArgumentSizeIsNot3() { RpcInvocation invocation = new RpcInvocation(Constants.$INVOKE, genericInvoke.getParameterTypes() , new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}}); - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" + + URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" + "accesslog=true&group=dubbo&version=1.1"); Invoker invoker = Mockito.mock(Invoker.class); when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10))); diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericImplFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericImplFilterTest.java index fbeb84ef6d08..43930ef66059 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericImplFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericImplFilterTest.java @@ -50,7 +50,7 @@ public void testInvoke() throws Exception { new Class[]{Person.class}, new Object[]{new Person("dubbo", 10)}); - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" + + URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" + "accesslog=true&group=dubbo&version=1.1&generic=true"); Invoker invoker = Mockito.mock(Invoker.class); @@ -74,7 +74,7 @@ public void testInvokeWithException() throws Exception { RpcInvocation invocation = new RpcInvocation("getPerson", new Class[]{Person.class}, new Object[]{new Person("dubbo", 10)}); - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" + + URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" + "accesslog=true&group=dubbo&version=1.1&generic=true"); Invoker invoker = Mockito.mock(Invoker.class); @@ -100,7 +100,7 @@ public void testInvokeWithException() throws Exception { RpcInvocation invocation = new RpcInvocation(Constants.$INVOKE, genericInvoke.getParameterTypes(), new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}, new Object[]{person}}); - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" + + URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" + "accesslog=true&group=dubbo&version=1.1&generic=true"); Invoker invoker = Mockito.mock(Invoker.class); when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10)));