You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2022/10/18 03:24:26 UTC
[dubbo-samples] branch master updated: feat: change expect exception (#533)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 913475d9 feat: change expect exception (#533)
913475d9 is described below
commit 913475d9f8835554fbb4f5bfdc71731db3db192a
Author: aamingaa <49...@users.noreply.github.com>
AuthorDate: Tue Oct 18 11:24:20 2022 +0800
feat: change expect exception (#533)
---
.../org/apache/dubbo/sample/tri/pojo/PojoGreeterImpl.java | 2 ++
.../org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java | 13 +++++++++++--
.../java/org/apache/dubbo/sample/tri/TriGenericTest.java | 12 +++++++++++-
.../java/org/apache/dubbo/sample/tri/TriPojoClientTest.java | 13 +++++++++++--
4 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/pojo/PojoGreeterImpl.java b/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/pojo/PojoGreeterImpl.java
index 8a8720e4..12adaab5 100644
--- a/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/pojo/PojoGreeterImpl.java
+++ b/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/pojo/PojoGreeterImpl.java
@@ -1,7 +1,9 @@
package org.apache.dubbo.sample.tri.pojo;
+import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.stream.StreamObserver;
import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.sample.tri.Greeter;
import org.apache.dubbo.sample.tri.api.PojoGreeter;
import org.apache.dubbo.sample.tri.stub.GreeterImpl;
diff --git a/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java b/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java
index a852056c..97e2443a 100644
--- a/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java
+++ b/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java
@@ -1,5 +1,6 @@
package org.apache.dubbo.sample.tri;
+import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.stream.StreamObserver;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.rpc.RpcException;
@@ -49,9 +50,17 @@ public abstract class BaseTriPojoClientTest {
Assert.assertEquals("hello,unary", delegate.greet("unary"));
}
- @Test(expected = RpcException.class)
+ @Test
public void greetException() {
- delegate.greetException("exception");
+ boolean isSupportSelfDefineException = Version.getVersion().compareTo("3.2.0") < 0;
+ try {
+ delegate.greetException("exception");
+ Assert.fail();
+ } catch (RpcException e) {
+ Assert.assertEquals(isSupportSelfDefineException, true);
+ } catch (IllegalStateException e) {
+ Assert.assertEquals(isSupportSelfDefineException, false);
+ }
}
@Test
diff --git a/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriGenericTest.java b/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriGenericTest.java
index 2b37eb1b..3f349bcf 100644
--- a/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriGenericTest.java
+++ b/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriGenericTest.java
@@ -1,11 +1,13 @@
package org.apache.dubbo.sample.tri;
+import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.service.GenericException;
import org.apache.dubbo.rpc.service.GenericService;
import org.apache.dubbo.sample.tri.api.PojoGreeter;
@@ -67,10 +69,18 @@ public class TriGenericTest {
new String[]{String.class.getName()}, new Object[]{"unary"}));
}
- @Test(expected = RpcException.class)
+ @Test
public void greetException() {
+ boolean isSupportSelfDefineException = Version.getVersion().compareTo("3.2.0") < 0;
+ try {
generic.$invoke("greetException", new String[]{String.class.getName()},
new Object[]{"exception"});
+ Assert.fail();
+ } catch (RpcException e) {
+ Assert.assertEquals(isSupportSelfDefineException, true);
+ } catch (GenericException e) {
+ Assert.assertEquals(isSupportSelfDefineException, false);
+ }
}
@Test(expected = RpcException.class)
diff --git a/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriPojoClientTest.java b/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriPojoClientTest.java
index 0476240a..1990872e 100644
--- a/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriPojoClientTest.java
+++ b/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriPojoClientTest.java
@@ -1,5 +1,6 @@
package org.apache.dubbo.sample.tri;
+import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.stream.StreamObserver;
import org.apache.dubbo.config.ApplicationConfig;
@@ -74,9 +75,17 @@ public class TriPojoClientTest {
Assert.assertEquals("hello,unary", delegate.greet("unary"));
}
- @Test(expected = RpcException.class)
+ @Test
public void greetException() {
- delegate.greetException("exception");
+ boolean isSupportSelfDefineException = Version.getVersion().compareTo("3.2.0") < 0;
+ try {
+ delegate.greetException("exception");
+ Assert.fail();
+ } catch (RpcException e) {
+ Assert.assertEquals(isSupportSelfDefineException, true);
+ } catch (IllegalStateException e) {
+ Assert.assertEquals(isSupportSelfDefineException, false);
+ }
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org