Add tests confirming the handling enum prefixes.

There were tests on the Swift code used to generate the enum names, but they
didn't completely prove the TextFormat ane JSON format was getting the full
names even though the Swift interface has the prefix removed. Tests test
ensure the names are as expected yet the two string forms are stil the
complete names as expected.

Author: thomasvl

Makefile

@@ -118,6 +118,7 @@ TEST_PROTOS= \
 	Protos/unittest_swift_cycle.proto \
 	Protos/unittest_swift_enum.proto \
 	Protos/unittest_swift_enum_optional_default.proto \
+	Protos/unittest_swift_enum_proto3.proto \
 	Protos/unittest_swift_extension.proto \
 	Protos/unittest_swift_extension2.proto \
 	Protos/unittest_swift_extension3.proto \

Protos/unittest_swift_enum.proto

@@ -49,6 +49,11 @@ message SwiftEnumTest {
         ENUM_TEST_RESERVED_WORD_VAR = 1;
         ENUM_TEST_RESERVED_WORD_NOT_RESERVED = 2;
     }
+
+    repeated EnumTest1 values1 = 1;
+    repeated EnumTest2 values2 = 2;
+    repeated EnumTestNoStem values3 = 3;
+    repeated EnumTestReservedWord values4 = 4;
 }
 
 message SwiftEnumWithAliasTest {

Protos/unittest_swift_enum_proto3.proto

@@ -0,0 +1,68 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2015 Apple, Inc.  All Rights Reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package protobuf3_unittest;
+
+message SwiftEnumTest {
+    enum EnumTest1 {
+        ENUM_TEST_1_FIRST_VALUE = 0;
+        ENUM_TEST_1_SECOND_VALUE = 2;
+    }
+    enum EnumTest2 {
+        ENUM_TEST_2_FIRST_VALUE = 0;
+        SECOND_VALUE = 2;
+    }
+    enum EnumTestNoStem {
+        ENUM_TEST_NO_STEM_1 = 0;
+        ENUM_TEST_NO_STEM_2 = 2;
+    }
+    enum EnumTestReservedWord {
+        ENUM_TEST_RESERVED_WORD_VAR = 0;
+        ENUM_TEST_RESERVED_WORD_NOT_RESERVED = 2;
+    }
+
+    repeated EnumTest1 values1 = 1;
+    repeated EnumTest2 values2 = 2;
+    repeated EnumTestNoStem values3 = 3;
+    repeated EnumTestReservedWord values4 = 4;
+}
+
+message SwiftEnumWithAliasTest {
+    enum EnumWithAlias {
+        option allow_alias = true;
+        FOO1 = 0;
+        FOO2 = 0;
+        BAR1 = 2;
+        BAR2 = 2;
+    }
+    repeated EnumWithAlias values = 1 [packed=true];
+}

Reference/unittest_swift_enum.pb.swift

@@ -52,6 +52,14 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 struct ProtobufUnittest_SwiftEnumTest: SwiftProtobuf.Message {
   static let protoMessageName: String = _protobuf_package + ".SwiftEnumTest"
 
+  var values1: [ProtobufUnittest_SwiftEnumTest.EnumTest1] = []
+
+  var values2: [ProtobufUnittest_SwiftEnumTest.EnumTest2] = []
+
+  var values3: [ProtobufUnittest_SwiftEnumTest.EnumTestNoStem] = []
+
+  var values4: [ProtobufUnittest_SwiftEnumTest.EnumTestReservedWord] = []
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   enum EnumTest1: SwiftProtobuf.Enum {
@@ -165,7 +173,14 @@ struct ProtobufUnittest_SwiftEnumTest: SwiftProtobuf.Message {
   /// initializers are defined in the SwiftProtobuf library. See the Message and
   /// Message+*Additions` files.
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let _ = try decoder.nextFieldNumber() {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      switch fieldNumber {
+      case 1: try decoder.decodeRepeatedEnumField(value: &self.values1)
+      case 2: try decoder.decodeRepeatedEnumField(value: &self.values2)
+      case 3: try decoder.decodeRepeatedEnumField(value: &self.values3)
+      case 4: try decoder.decodeRepeatedEnumField(value: &self.values4)
+      default: break
+      }
     }
   }
 
@@ -174,6 +189,18 @@ struct ProtobufUnittest_SwiftEnumTest: SwiftProtobuf.Message {
   /// other serializer methods are defined in the SwiftProtobuf library. See the
   /// `Message` and `Message+*Additions` files.
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if !self.values1.isEmpty {
+      try visitor.visitRepeatedEnumField(value: self.values1, fieldNumber: 1)
+    }
+    if !self.values2.isEmpty {
+      try visitor.visitRepeatedEnumField(value: self.values2, fieldNumber: 2)
+    }
+    if !self.values3.isEmpty {
+      try visitor.visitRepeatedEnumField(value: self.values3, fieldNumber: 3)
+    }
+    if !self.values4.isEmpty {
+      try visitor.visitRepeatedEnumField(value: self.values4, fieldNumber: 4)
+    }
     try unknownFields.traverse(visitor: &visitor)
   }
 }
@@ -245,9 +272,18 @@ struct ProtobufUnittest_SwiftEnumWithAliasTest: SwiftProtobuf.Message {
 fileprivate let _protobuf_package = "protobuf_unittest"
 
 extension ProtobufUnittest_SwiftEnumTest: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "values1"),
+    2: .same(proto: "values2"),
+    3: .same(proto: "values3"),
+    4: .same(proto: "values4"),
+  ]
 
   func _protobuf_generated_isEqualTo(other: ProtobufUnittest_SwiftEnumTest) -> Bool {
+    if self.values1 != other.values1 {return false}
+    if self.values2 != other.values2 {return false}
+    if self.values3 != other.values3 {return false}
+    if self.values4 != other.values4 {return false}
     if unknownFields != other.unknownFields {return false}
     return true
   }