This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-integration-cases.git
The following commit(s) were added to refs/heads/main by this push:
new 9c11bbd3 Update prefer serialization related cases (#32)
9c11bbd3 is described below
commit 9c11bbd322cb540fb60945af380b62e03d19df56
Author: Albumen Kevin <[email protected]>
AuthorDate: Tue May 21 14:45:18 2024 +0800
Update prefer serialization related cases (#32)
---
.../apache/dubbo/samples/prefer/serialization/ConsumerIT.java | 9 ++++++---
.../dubbo-samples-test-13441-2-provider/pom.xml | 4 ++++
.../dubbo-samples-test-13441-7-provider/pom.xml | 4 ++++
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git
a/99-integration/dubbo-samples-prefer-serialization-test/dubbo-samples-prefer-serialization-test-consumer/src/test/java/org/apache/dubbo/samples/prefer/serialization/ConsumerIT.java
b/99-integration/dubbo-samples-prefer-serialization-test/dubbo-samples-prefer-serialization-test-consumer/src/test/java/org/apache/dubbo/samples/prefer/serialization/ConsumerIT.java
index 68aa0b11..efd37fce 100644
---
a/99-integration/dubbo-samples-prefer-serialization-test/dubbo-samples-prefer-serialization-test-consumer/src/test/java/org/apache/dubbo/samples/prefer/serialization/ConsumerIT.java
+++
b/99-integration/dubbo-samples-prefer-serialization-test/dubbo-samples-prefer-serialization-test-consumer/src/test/java/org/apache/dubbo/samples/prefer/serialization/ConsumerIT.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.samples.prefer.serialization;
+import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.serialize.Serialization;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ReferenceConfig;
@@ -24,12 +25,12 @@ import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.FrameworkModel;
import org.apache.dubbo.samples.prefer.serialization.api.DemoService;
+
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-
// in 3.1.x, service config's serialization > protocol config's serialization
// in 3.2.x, service config's prefer serialization > service config's
serialization >
// protocol config's prefer serialization > protocol config's
serialization
@@ -66,10 +67,11 @@ public class ConsumerIT {
public void test1() {
DemoService demoService = getDemoService("1.0.0");
Assert.assertEquals("Hello world", demoService.sayHello("world"));
-
Assert.assertTrue(SerializationWrapper.getUsedSerialization().stream().allMatch(s
-> s.equals(FASTJSON2_SERIALIZATION_ID)));
+ Byte expectedId = Version.getVersion().startsWith("3.2")
+ ? FASTJSON2_SERIALIZATION_ID : HESSIAN2_SERIALIZATION_ID;
+
Assert.assertTrue(SerializationWrapper.getUsedSerialization().stream().allMatch(s
-> s.equals(expectedId)));
}
-
// protocol config set serialization as java, prefer serialization is set
as null
// service config set serialization as null, prefer serialization is set
as null
// in 3.1.x, will use java serialization
@@ -245,4 +247,5 @@ public class ConsumerIT {
SerializationWrapper.getUsedSerialization().clear();
}
}
+
}
diff --git
a/99-integration/dubbo-samples-test-13441-2/dubbo-samples-test-13441-2-provider/pom.xml
b/99-integration/dubbo-samples-test-13441-2/dubbo-samples-test-13441-2-provider/pom.xml
index ba6b0839..26090d82 100644
---
a/99-integration/dubbo-samples-test-13441-2/dubbo-samples-test-13441-2-provider/pom.xml
+++
b/99-integration/dubbo-samples-test-13441-2/dubbo-samples-test-13441-2-provider/pom.xml
@@ -47,6 +47,10 @@
<artifactId>hessian-lite</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>hessian-lite</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
</exclusions>
</dependency>
diff --git
a/99-integration/dubbo-samples-test-13441-7/dubbo-samples-test-13441-7-provider/pom.xml
b/99-integration/dubbo-samples-test-13441-7/dubbo-samples-test-13441-7-provider/pom.xml
index 16b27ccb..78451a8c 100644
---
a/99-integration/dubbo-samples-test-13441-7/dubbo-samples-test-13441-7-provider/pom.xml
+++
b/99-integration/dubbo-samples-test-13441-7/dubbo-samples-test-13441-7-provider/pom.xml
@@ -47,6 +47,10 @@
<artifactId>hessian-lite</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>hessian-lite</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
</exclusions>
</dependency>
