From 36ce4efa746541f3253d4f751cd2aed392e0103a Mon Sep 17 00:00:00 2001
From: "william.liangf" <william.liangf@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Tue, 20 Mar 2012 14:45:27 +0000
Subject: [PATCH] =?UTF-8?q?DUBBO-290=20Validation=E5=8F=AA=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E4=BA=86=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@1296 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 .../config/validation/ValidationService.java  |  3 ++-
 .../validation/ValidationServiceImpl.java     |  2 +-
 .../config/validation/ValidationTest.java     | 25 ++++++++++++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java
index 36114d497..d031b04a1 100644
--- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java
+++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java
@@ -16,6 +16,7 @@
 package com.alibaba.dubbo.config.validation;
 
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 
 
 /**
@@ -31,6 +32,6 @@ public interface ValidationService { // 缺省可按服务接口区分验证场
     @interface Update{} // 与方法同名接口，首字母大写，用于区分验证场景，如：@NotNull(groups = ValidationService.Update.class)，可选
     void update(ValidationParameter parameter);
     
-    void delete(@Min(1) long id);
+    void delete(@Min(1) long id, @NotNull String operator);
 
 }
diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java
index 552d1f7b0..6a47f2d6f 100644
--- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java
+++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java
@@ -28,7 +28,7 @@ public class ValidationServiceImpl implements ValidationService {
     public void update(ValidationParameter parameter) {
     }
 
-    public void delete(long id) {
+    public void delete(long id, String operator) {
     }
 
 }
diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java
index 31a9e250e..f1162b20e 100644
--- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java
+++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java
@@ -55,7 +55,7 @@ public class ValidationTest {
             ValidationService validationService = reference.get();
             try {
                 // Save OK
-                ValidationParameter parameter = new ValidationParameter();
+                /*ValidationParameter parameter = new ValidationParameter();
                 parameter.setName("liangfei");
                 parameter.setEmail("liangfei@liang.fei");
                 parameter.setAge(50);
@@ -76,16 +76,35 @@ public class ValidationTest {
                 }
                 
                 // Delete OK
-                validationService.delete(2);
+                validationService.delete(2, "abc");*/
                 
                 // Delete Error
                 try {
-                    validationService.delete(0);
+                    validationService.delete(0, "abc");
                     Assert.fail();
                 } catch (RpcException e) {
                     ConstraintViolationException ve = (ConstraintViolationException)e.getCause();
                     Set<ConstraintViolation<?>> violations = ve.getConstraintViolations();
                     Assert.assertNotNull(violations);
+                    Assert.assertEquals(1, violations.size());
+                }
+                try {
+                    validationService.delete(2, null);
+                    Assert.fail();
+                } catch (RpcException e) {
+                    ConstraintViolationException ve = (ConstraintViolationException)e.getCause();
+                    Set<ConstraintViolation<?>> violations = ve.getConstraintViolations();
+                    Assert.assertNotNull(violations);
+                    Assert.assertEquals(1, violations.size());
+                }
+                try {
+                    validationService.delete(0, null);
+                    Assert.fail();
+                } catch (RpcException e) {
+                    ConstraintViolationException ve = (ConstraintViolationException)e.getCause();
+                    Set<ConstraintViolation<?>> violations = ve.getConstraintViolations();
+                    Assert.assertNotNull(violations);
+                    Assert.assertEquals(2, violations.size());
                 }
             } finally {
                 reference.destroy();
-- 
GitLab