Skip to content

Commit

Permalink
Merge pull request #2744, metadata unit test and generic test, refact…
Browse files Browse the repository at this point in the history 
…or zk store.
  • Loading branch information
@cvictory @chickenlj
cvictory authored and chickenlj committed Nov 6, 2018
1 parent 4097405 commit 072b51e
Show file tree
Hide file tree
Showing 61 changed files with 1,168 additions and 1,357 deletions.
7 changes: 6 additions & 1 deletion dubbo-compatible/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,10 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
181 changes: 177 additions & 4 deletions dubbo-compatible/src/test/java/org/apache/dubbo/generic/GenericServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,32 @@

package org.apache.dubbo.generic;

import com.alibaba.dubbo.rpc.service.GenericService;

import com.alibaba.fastjson.JSON;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.service.DemoService;
import org.apache.dubbo.service.DemoServiceImpl;
import org.apache.dubbo.metadata.definition.ServiceDefinitionBuilder;
import org.apache.dubbo.metadata.definition.model.FullServiceDefinition;
import org.apache.dubbo.metadata.definition.model.MethodDefinition;
import org.apache.dubbo.metadata.definition.model.TypeDefinition;
import org.apache.dubbo.rpc.Exporter;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.ProxyFactory;

import org.apache.dubbo.rpc.service.GenericService;
import org.apache.dubbo.service.ComplexObject;
import org.apache.dubbo.service.DemoService;
import org.apache.dubbo.service.DemoServiceImpl;
import org.junit.Assert;
import org.junit.Test;

import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

public class GenericServiceTest {

@Test
Expand Down Expand Up @@ -75,4 +87,165 @@ public void testGeneric2() {
invoker.destroy();
exporter.unexport();
}

@Test
public void testGenericComplexCompute4FullServiceMetadata() {
DemoService server = new DemoServiceImpl();
ProxyFactory proxyFactory = ExtensionLoader.getExtensionLoader(ProxyFactory.class).getAdaptiveExtension();
Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension();
URL url = URL.valueOf("dubbo://127.0.0.1:5342/" + DemoService.class.getName() + "?version=1.0.0&generic=true$timeout=3000");
Exporter<DemoService> exporter = protocol.export(proxyFactory.getInvoker(server, DemoService.class, url));


String var1 = "v1";
int var2 = 234;
long l = 555;
String[] var3 = {"var31", "var32"};
List<Integer> var4 = Arrays.asList(2, 4, 8);
ComplexObject.TestEnum testEnum = ComplexObject.TestEnum.VALUE2;

FullServiceDefinition fullServiceDefinition = ServiceDefinitionBuilder.buildFullDefinition(DemoService.class);
MethodDefinition methodDefinition = getMethod("complexCompute", fullServiceDefinition.getMethods());
Map parm2= createComplextObject(fullServiceDefinition,var1, var2, l, var3, var4, testEnum);
ComplexObject complexObject = map2bean(parm2);

Invoker<GenericService> invoker = protocol.refer(GenericService.class, url);


GenericService client = proxyFactory.getProxy(invoker, true);
Object result = client.$invoke(methodDefinition.getName(), methodDefinition.getParameterTypes(), new Object[]{"haha", parm2});
Assert.assertEquals("haha###" + complexObject.toString(), result);


Invoker<DemoService> invoker2 = protocol.refer(DemoService.class, url);
GenericService client2 = (GenericService) proxyFactory.getProxy(invoker2, true);
Object result2 = client2.$invoke("complexCompute", methodDefinition.getParameterTypes(), new Object[]{"haha2", parm2});
Assert.assertEquals("haha2###" + complexObject.toString(), result2);

invoker.destroy();
exporter.unexport();
}

@Test
public void testGenericFindComplexObject4FullServiceMetadata() {
DemoService server = new DemoServiceImpl();
ProxyFactory proxyFactory = ExtensionLoader.getExtensionLoader(ProxyFactory.class).getAdaptiveExtension();
Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension();
URL url = URL.valueOf("dubbo://127.0.0.1:5342/" + DemoService.class.getName() + "?version=1.0.0&generic=true$timeout=3000");
Exporter<DemoService> exporter = protocol.export(proxyFactory.getInvoker(server, DemoService.class, url));


String var1 = "v1";
int var2 = 234;
long l = 555;
String[] var3 = {"var31", "var32"};
List<Integer> var4 = Arrays.asList(2, 4, 8);
ComplexObject.TestEnum testEnum = ComplexObject.TestEnum.VALUE2;
//ComplexObject complexObject = createComplexObject(var1, var2, l, var3, var4, testEnum);

Invoker<GenericService> invoker = protocol.refer(GenericService.class, url);

GenericService client = proxyFactory.getProxy(invoker, true);
Object result = client.$invoke("findComplexObject", new String[]{"java.lang.String", "int", "long", "java.lang.String[]", "java.util.List", "org.apache.dubbo.service.ComplexObject$TestEnum"},
new Object[]{var1, var2, l, var3, var4, testEnum});
Assert.assertNotNull(result);
ComplexObject r = map2bean((Map) result);
Assert.assertEquals(r, createComplexObject(var1, var2, l, var3, var4, testEnum));

invoker.destroy();
exporter.unexport();
}

MethodDefinition getMethod(String methodName, List<MethodDefinition> list) {
for (MethodDefinition methodDefinition : list) {
if (methodDefinition.getName().equals(methodName)) {
return methodDefinition;
}
}
return null;
}

Map<String, Object> createComplextObject(FullServiceDefinition fullServiceDefinition, String var1, int var2, long l, String[] var3, List<Integer> var4, ComplexObject.TestEnum testEnum) {
List<TypeDefinition> typeDefinitions = fullServiceDefinition.getTypes();
TypeDefinition topTypeDefinition = null;
TypeDefinition innerTypeDefinition = null;
TypeDefinition inner2TypeDefinition = null;
TypeDefinition inner3TypeDefinition = null;
for (TypeDefinition typeDefinition : typeDefinitions) {
if (typeDefinition.getType().equals(ComplexObject.class.getName())) {
topTypeDefinition = typeDefinition;
} else if (typeDefinition.getType().equals(ComplexObject.InnerObject.class.getName())) {
innerTypeDefinition = typeDefinition;
} else if (typeDefinition.getType().contains(ComplexObject.InnerObject2.class.getName())) {
inner2TypeDefinition = typeDefinition;
} else if (typeDefinition.getType().equals(ComplexObject.InnerObject3.class.getName())) {
inner3TypeDefinition = typeDefinition;
}
}
Assert.assertEquals(topTypeDefinition.getProperties().get("v").getType(), "long");
Assert.assertEquals(topTypeDefinition.getProperties().get("maps").getType(), "java.util.Map<java.lang.String, java.lang.String>");
Assert.assertEquals(topTypeDefinition.getProperties().get("innerObject").getType(), "org.apache.dubbo.service.ComplexObject$InnerObject");
Assert.assertEquals(topTypeDefinition.getProperties().get("intList").getType(), "java.util.List<java.lang.Integer>");
Assert.assertEquals(topTypeDefinition.getProperties().get("strArrays").getType(), "java.lang.String[]");
Assert.assertEquals(topTypeDefinition.getProperties().get("innerObject3").getType(), "org.apache.dubbo.service.ComplexObject.InnerObject3[]");
Assert.assertEquals(topTypeDefinition.getProperties().get("testEnum").getType(), "org.apache.dubbo.service.ComplexObject.TestEnum");
Assert.assertEquals(topTypeDefinition.getProperties().get("innerObject2").getType(), "java.util.Set<org.apache.dubbo.service.ComplexObject$InnerObject2>");

Assert.assertSame(innerTypeDefinition.getProperties().get("innerA").getType(), "java.lang.String");
Assert.assertSame(innerTypeDefinition.getProperties().get("innerB").getType(), "int");

Assert.assertSame(inner2TypeDefinition.getProperties().get("innerA2").getType(), "java.lang.String");
Assert.assertSame(inner2TypeDefinition.getProperties().get("innerB2").getType(), "int");

Assert.assertSame(inner3TypeDefinition.getProperties().get("innerA3").getType(), "java.lang.String");

Map<String, Object> result = new HashMap<>();
result.put("v", l);
Map maps = new HashMap<>(4);
maps.put(var1 + "_k1", var1 + "_v1");
maps.put(var1 + "_k2", var1 + "_v2");
result.put("maps", maps);
result.put("intList", var4);
result.put("strArrays", var3);
result.put("testEnum", testEnum.name());

Map innerObjectMap = new HashMap<>(4);
result.put("innerObject", innerObjectMap);
innerObjectMap.put("innerA", var1);
innerObjectMap.put("innerB", var2);

Set<Map> innerObject2Set = new HashSet<>(4);
result.put("innerObject2", innerObject2Set);
Map innerObject2Tmp1 = new HashMap<>(4);
innerObject2Tmp1.put("innerA2", var1 + "_21");
innerObject2Tmp1.put("innerB2", var2 + 100000);
Map innerObject2Tmp2 = new HashMap<>(4);
innerObject2Tmp2.put("innerA2", var1 + "_22");
innerObject2Tmp2.put("innerB2", var2 + 200000);
innerObject2Set.add(innerObject2Tmp1);
innerObject2Set.add(innerObject2Tmp2);

Map innerObject3Tmp1 = new HashMap<>(4);
innerObject3Tmp1.put("innerA3", var1 + "_31");
Map innerObject3Tmp2 = new HashMap<>(4);
innerObject3Tmp2.put("innerA3", var1 + "_32");
Map innerObject3Tmp3 = new HashMap<>(4);
innerObject3Tmp3.put("innerA3", var1 + "_32");
result.put("innerObject3", new Map[]{innerObject3Tmp1, innerObject3Tmp2, innerObject3Tmp3});

return result;
}

Map<String, Object> bean2Map(ComplexObject complexObject) {
return JSON.parseObject(JSON.toJSONString(complexObject), Map.class);
}

ComplexObject map2bean(Map<String, Object> map) {
return JSON.parseObject(JSON.toJSONString(map), ComplexObject.class);
}

ComplexObject createComplexObject(String var1, int var2, long l, String[] var3, List<Integer> var4, ComplexObject.TestEnum testEnum) {
return new ComplexObject(var1, var2, l, var3, var4, testEnum);
}

}
Loading

0 comments on commit 072b51e

Please sign in to comment.