updated to protoc 3.1.0 and fixed casttype string populate

gogo · Oct 27, 2016 · a9cd0c3 · a9cd0c3
1 parent 91cc249
commit a9cd0c3
Show file tree

Hide file tree

Showing 96 changed files with 21,207 additions and 20,914 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 env:
-  - PROTOBUF_VERSION=2.5.0
   - PROTOBUF_VERSION=2.6.1
   - PROTOBUF_VERSION=3.0.2
+  - PROTOBUF_VERSION=3.1.0
 
 before_install:
   - ./install-protobuf.sh
@@ -10,7 +10,7 @@ before_install:
 script:
   - PATH=/home/travis/bin:$PATH make buildserverall
   - echo $TRAVIS_GO_VERSION
-  - if [ "$TRAVIS_GO_VERSION" == 1.7.1 ] && [[ "$PROTOBUF_VERSION" == 3.0.2 ]]; then ! git status --porcelain | read || (git status; git diff; exit 1); fi
+  - if [ "$TRAVIS_GO_VERSION" == 1.7.1 ] && [[ "$PROTOBUF_VERSION" == 3.1.0 ]]; then ! git status --porcelain | read || (git status; git diff; exit 1); fi
 
 language: go
 

diff --git a/_conformance/conformance_proto/conformance.pb.go b/_conformance/conformance_proto/conformance.pb.go
diff --git a/jsonpb/jsonpb_test_proto/test_objects.pb.go b/jsonpb/jsonpb_test_proto/test_objects.pb.go
diff --git a/plugin/populate/populate.go b/plugin/populate/populate.go
@@ -387,7 +387,8 @@ func (p *plugin) GenerateField(file *generator.FileDescriptor, message *generato
 				p.P(`}`)
 			}
 		} else if field.IsString() {
-			val := fmt.Sprintf("randString%v(r)", p.localName)
+			typName := generator.GoTypeToName(goTyp)
+			val := fmt.Sprintf("%s(randString%v(r))", typName, p.localName)
 			if field.IsRepeated() {
 				p.P(p.varGen.Next(), ` := r.Intn(10)`)
 				p.P(`this.`, fieldname, ` = make(`, goTyp, `, `, p.varGen.Current(), `)`)