[SCB-1277]make sure demo and samples are normal

apache · May 5, 2019 · 8ef4ca9 · 8ef4ca9
1 parent cfd26b9
commit 8ef4ca9
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 85 deletions.
diff --git a/demo/demo-local/pom.xml b/demo/demo-local/pom.xml
diff --git a/demo/demo-local/src/main/java/org/apache/servicecomb/demo/local/DemoLocal.java b/demo/demo-local/src/main/java/org/apache/servicecomb/demo/local/DemoLocal.java
diff --git a/...sport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/TestMgr.java b/...sport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/TestMgr.java
@@ -47,6 +47,18 @@ public static void check(Object expect, Object real) {
     }
   }
 
+  public static void checkException(Throwable exception, String msg) {
+    String message = exception.getMessage();
+    if (!exception.getMessage().contains(msg)) {
+      errorList.add(new Error(
+          message + " | Expect " + message + " contains " + msg + " , but not"));
+    }
+  }
+
+  public static void fail(String msg) {
+    errorList.add(new Error(msg));
+  }
+
   public static void summary() {
     if (errorList.isEmpty()) {
       LOGGER.info("............. test finished ............");

diff --git a/...oot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java b/...oot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java
@@ -110,8 +110,19 @@ private static void testEmpty(Test test) {
   }
 
   private static void testNull(Test test) {
-    TestMgr.check("code is 'null'", test.getTestString(null));
-    TestMgr.check(null, test.wrapParam(null));
+    try {
+      test.getTestString(null);
+      TestMgr.fail("Should throw exception");
+    } catch (Throwable e) {
+      TestMgr.checkException(e, "Parameter is not valid for operation");
+    }
+
+    try {
+      test.wrapParam(null);
+      TestMgr.fail("Should throw exception");
+    } catch (Throwable e) {
+      TestMgr.checkException(e, "Parameter is not valid for operation");
+    }
   }
 
   private static void testChinese(Test test) {

diff --git a/...-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/server.yaml b/...-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/server.yaml
@@ -167,7 +167,7 @@ paths:
 definitions:
   Error:
     type: object
-    x-java-class: org.apache.servicecomb.core.exception.CommonExceptionData
+    x-java-class: org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData
     properties:
       message:
         type: string

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -33,7 +33,6 @@
   <modules>
     <module>docker-build-config</module>
     <module>docker-run-config</module>
-    <module>demo-local</module>
     <module>demo-server-servlet</module>
     <module>demo-pojo</module>
     <module>demo-jaxrs</module>

diff --git a/gpg-sec.tar.enc b/gpg-sec.tar.enc
diff --git a/...ollo-sample/src/main/java/MainServer.java → ...ervicecomb/samples/apollo/MainServer.java b/...ollo-sample/src/main/java/MainServer.java → ...ervicecomb/samples/apollo/MainServer.java
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.servicecomb.samples.apollo;
 
 import org.apache.servicecomb.foundation.common.utils.BeanUtils;