Validator: added manual tests, fixed bug with nil.

gogo · Oct 21, 2015 · e619e86 · e619e86
1 parent a8774db
commit e619e86
Show file tree

Hide file tree

Showing 6 changed files with 190 additions and 54 deletions.
diff --git a/plugin/validator/validator.go b/plugin/validator/validator.go
@@ -233,7 +233,10 @@ func (p *plugin) generateProto3Message(file *generator.FileDescriptor, message *
 					fmt.Fprintf(os.Stderr, "WARNING: field %v.%v is a nullable=false, validator.msg_exists has no effect\n",  ccTypeName, fieldName)
 				}
 			}
-			if !nullable {
+			if nullable {
+				p.P(`if `, variableName, ` != nil {`)
+				p.In()
+			} else {
 				// non-nullable fields in proto3 store actual structs, we need pointers to operate on interaces
 				variableName = "&(" + variableName + ")"
 			}
@@ -242,6 +245,10 @@ func (p *plugin) generateProto3Message(file *generator.FileDescriptor, message *
 			p.P(`return err`)
 			p.Out()
 			p.P(`}`)
+			if nullable {
+				p.Out()
+				p.P(`}`)
+			}
 		}
 		if repeated {
 			// end the repeated loop

diff --git a/test/validator/validator_proto2.pb.go b/test/validator/validator_proto2.pb.go
diff --git a/test/validator/validator_proto2.proto b/test/validator/validator_proto2.proto
@@ -25,24 +25,24 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 syntax = "proto2";
-package validator_test;
+package validatortest;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 message ValidatorMessage {
 	message Embedded {
-		optional string Identifier = 1 [(gogoproto.validator) = {regex: "[a-z]{2,5}"}];
+		optional string Identifier = 1 [(gogoproto.validator) = {regex: "^[a-z]{2,5}$"}];
 		required int64 SomeValue = 2 [(gogoproto.validator) = {int_gt: 0, int_lt: 100}];
 	}
 
-	required string StringReq = 1 [(gogoproto.validator) = {regex: ".{2,5}"}];
-	required string StringReqNonNull = 2 [(gogoproto.validator) = {regex: ".{2,5}"}, (gogoproto.nullable) = false];
-	optional string StringOpt = 3 [(gogoproto.validator) = {regex: ".{2,5}"}];
-	optional string StringOptNonNull = 4 [(gogoproto.validator) = {regex: ".{2,5}"}, (gogoproto.nullable) = false];
+	required string StringReq = 1 [(gogoproto.validator) = {regex: "^.{2,5}$"}];
+	required string StringReqNonNull = 2 [(gogoproto.validator) = {regex: "^.{2,5}$"}, (gogoproto.nullable) = false];
+	optional string StringOpt = 3 [(gogoproto.validator) = {regex: "^.{2,5}$"}];
+	optional string StringOptNonNull = 4 [(gogoproto.validator) = {regex: "^.{2,5}$"}, (gogoproto.nullable) = false];
 
-	required uint32 IntReq = 6 [(gogoproto.validator) = {int_gt: 0}];
+	required uint32 IntReq = 6 [(gogoproto.validator) = {int_gt: 10}];
 	required uint32 IntReqNonNull = 7 [(gogoproto.validator) = {int_gt: 0}, (gogoproto.nullable) = false];
-	repeated uint32 IntRep = 8 [(gogoproto.validator) = {int_gt: 0}];
+	repeated uint32 IntRep = 8 [(gogoproto.validator) = {int_gt: 10}];
 	repeated uint32 IntRepNonNull = 9 [(gogoproto.validator) = {int_gt: 0}, (gogoproto.nullable) = false];
 
 

diff --git a/test/validator/validator_proto3.pb.go b/test/validator/validator_proto3.pb.go
diff --git a/test/validator/validator_proto3.proto b/test/validator/validator_proto3.proto
@@ -25,21 +25,21 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 syntax = "proto3";
-package validator_test;
+package validatortest;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 message ValidatorMessage3 {
 	message Embedded {
-		string Identifier = 1 [(gogoproto.validator) = {regex: "[a-z]{2,5}"}];
+		string Identifier = 1 [(gogoproto.validator) = {regex: "^[a-z]{2,5}$"}];
 		int64 SomeValue = 2 [(gogoproto.validator) = {int_gt: 0, int_lt: 100}];
 	}
-	string SomeString = 1 [(gogoproto.validator) = {regex: ".{2,5}"}];
-	repeated string SomeStringRep = 2 [(gogoproto.validator) = {regex: ".{2,5}"}];
+	string SomeString = 1 [(gogoproto.validator) = {regex: "^.{2,5}$"}];
+	repeated string SomeStringRep = 2 [(gogoproto.validator) = {regex: "^.{2,5}$"}];
 
-	uint32 SomeInt = 6  [(gogoproto.validator) = {int_gt: 0}];
-	repeated uint32 SomeIntRep = 7  [(gogoproto.validator) = {int_gt: 0}];
-	repeated uint32 SomeIntRepNonNull = 8 [(gogoproto.validator) = {int_gt: 0}, (gogoproto.nullable) = false];
+	uint32 SomeInt = 6  [(gogoproto.validator) = {int_gt: 10}];
+	repeated uint32 SomeIntRep = 7  [(gogoproto.validator) = {int_gt: 10}];
+	repeated uint32 SomeIntRepNonNull = 8 [(gogoproto.validator) = {int_gt: 10}, (gogoproto.nullable) = false];
 
 	Embedded someEmbedded = 10;
 	Embedded someEmbeddedNonNullable = 11 [(gogoproto.nullable) = false];