Upstream (gogo#399): Merging upstream from golang/protobuf into dev b…

…ranch golang/protobuf@8cc9e46

* merging 8cc9e46429bfb16289d40d30b2ee3f4923b47345from golang/protobuf: add remap

* merging 8cc9e46429bfb16289d40d30b2ee3f4923b47345 from golang/protobuf: moved testdata to test_proto, merged some tests and some prototext stuff

* merging 8cc9e46429bfb16289d40d30b2ee3f4923b47345 from golang/protobuf: equal and equal_test

* update golden

* only golden test protoc 3 and up

* dont do golden test if file was not generated

* merging 8cc9e46429bfb16289d40d30b2ee3f4923b47345 from golang/protobuf: clone and clone_test

* merging 8cc9e46429bfb16289d40d30b2ee3f4923b47345 from golang/protobuf size_test and size2_test

* merging 8cc9e46429bfb16289d40d30b2ee3f4923b47345 from golang/protobuf: conformance.go

* merge extensions_test.go 8cc9e46429bfb16289d40d30b2ee3f4923b47345 from golang/protobuf

* merge 8cc9e46429bfb16289d40d30b2ee3f4923b47345 from golang/protobuf: the biggest chunk

* upstream: more extensions test are passing

* marshal and unmarshal nullable=false messages and slices of messages

* merge 8cc9e46429bfb16289d40d30b2ee3f4923b47345 from golang/protobuf rest of all_test.go

* upstream: add NewRequiredNotSetError back

* upstream: simplify remove properties_gogo and fix NidRepNative size

* upstream: fix customtypes

* upstream: forgot customtype

* upstream: fix customtypes in maps

* upstream: add time.Time and time.Duration again

* merge 8cc9e46429bfb16289d40d30b2ee3f4923b47345 from golang/protobuf: generator.go

* merge 925541529c1fa6821df4e44ce2723319eb2be768 from golang/protobuf: add unrecognized for proto3, merge discard_test.go and finish merging all_test.go

* disable asymetric-issue125 since gogo#388 is broken

* upstream: fix for embedded oneof

* upstream: vet fixes and stable marshaler

* merge: non nullable struct

* fix for extensions no map test

Makefile

@@ -62,7 +62,8 @@ regenerate:
 	make -C protoc-gen-gogo/plugin regenerate
 	make -C protoc-gen-gogo/testdata regenerate
 	make -C gogoproto regenerate
-	make -C proto/testdata regenerate
+	make -C proto/test_proto regenerate
+	make -C proto/proto3_proto regenerate
 	make -C jsonpb/jsonpb_test_proto regenerate
 	make -C _conformance regenerate
 	make -C protobuf regenerate
@@ -119,6 +120,7 @@ regenerate:
 	make -C test/issue322 regenerate
 	make -C test/issue330 regenerate
 	make -C test/importcustom-issue389 regenerate
+	make -C test/merge regenerate
 	make gofmt
 
 tests:

_conformance/conformance.go

@@ -95,19 +95,18 @@ var jsonMarshaler = jsonpb.Marshaler{
 
 func handle(req *pb.ConformanceRequest) *pb.ConformanceResponse {
 	var err error
-	var msg pb.TestAllTypes
+	var msg pb.TestAllTypesProto3
+	var msg1 pb.TestAllTypesProto2
+	var isProto3 bool = bool(req.MessageType == "protobuf_test_messages.proto3.TestAllTypesProto3")
 	switch p := req.Payload.(type) {
 	case *pb.ConformanceRequest_ProtobufPayload:
-		err = proto.Unmarshal(p.ProtobufPayload, &msg)
+		if isProto3 {
+			err = proto.Unmarshal(p.ProtobufPayload, &msg)
+		} else {
+			err = proto.Unmarshal(p.ProtobufPayload, &msg1)
+		}
 	case *pb.ConformanceRequest_JsonPayload:
 		err = jsonpb.UnmarshalString(p.JsonPayload, &msg)
-		if err != nil && err.Error() == "unmarshaling Any not supported yet" {
-			return &pb.ConformanceResponse{
-				Result: &pb.ConformanceResponse_Skipped{
-					Skipped: err.Error(),
-				},
-			}
-		}
 	default:
 		return &pb.ConformanceResponse{
 			Result: &pb.ConformanceResponse_RuntimeError{
@@ -124,7 +123,12 @@ func handle(req *pb.ConformanceRequest) *pb.ConformanceResponse {
 	}
 	switch req.RequestedOutputFormat {
 	case pb.WireFormat_PROTOBUF:
-		p, err := proto.Marshal(&msg)
+		var p []byte
+		if isProto3 {
+			p, err = proto.Marshal(&msg)
+		} else {
+			p, err = proto.Marshal(&msg1)
+		}
 		if err != nil {
 			return &pb.ConformanceResponse{
 				Result: &pb.ConformanceResponse_SerializeError{

gogoproto/helper.go

@@ -334,9 +334,6 @@ func HasExtensionsMap(file *google_protobuf.FileDescriptorProto, message *google
 }
 
 func HasUnrecognized(file *google_protobuf.FileDescriptorProto, message *google_protobuf.DescriptorProto) bool {
-	if IsProto3(file) {
-		return false
-	}
 	return proto.GetBoolExtension(message.Options, E_GoprotoUnrecognized, proto.GetBoolExtension(file.Options, E_GoprotoUnrecognizedAll, true))
 }
 

jsonpb/jsonpb_test.go

@@ -815,7 +815,7 @@ func TestUnmarshalAnyJSONPBUnmarshaler(t *testing.T) {
 	}
 
 	if !proto.Equal(&got, &want) {
-		t.Errorf("message contents not set correctly after unmarshalling JSON: got %s, wanted %s", got, want)
+		t.Errorf("message contents not set correctly after unmarshalling JSON: got %v, wanted %v", got, want)
 	}
 }