소스 검색

Delete camel style from field naming

- Update and implement tests
Tatyana Borisova 5 년 전
부모
커밋
e0c89b7ece
3개의 변경된 파일50개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      src/generator/protobufclassgenerator.cpp
  2. 24 0
      tests/test_protobuf/proto/simpletest.proto
  3. 24 0
      tests/test_protobuf/simpletest.cpp

+ 2 - 2
src/generator/protobufclassgenerator.cpp

@@ -242,7 +242,7 @@ bool ProtobufClassGenerator::producePropertyMap(const FieldDescriptor *field, Pr
     std::string typeNameLower(typeName);
     utils::tolower(typeNameLower);
 
-    std::string capProperty = field->camelcase_name();
+    std::string capProperty = field->name();
     capProperty[0] = static_cast<char>(::toupper(capProperty[0]));
 
     std::string typeNameNoList = typeName;
@@ -256,7 +256,7 @@ bool ProtobufClassGenerator::producePropertyMap(const FieldDescriptor *field, Pr
     }
     propertyMap = {{"type", typeName},
                    {"type_lower", typeNameLower},
-                   {"property_name", field->camelcase_name()},
+                   {"property_name", field->name()},
                    {"property_name_cap", capProperty},
                    {"type_nolist", typeNameNoList}
                   };

+ 24 - 0
tests/test_protobuf/proto/simpletest.proto

@@ -562,3 +562,27 @@ message FieldIndexTest3Message {
 message FieldIndexTest4Message {
     sint32 testField = 536870911;
 }
+
+message Message_Uderscore_name {
+    sint32 testField = 1;
+}
+
+message MessageUderscorename {
+    sint32 testField = 1;
+}
+
+message MessageUnderscoreField {
+    sint32 underScore_Message_field = 1;
+}
+
+message PriorMessageUnderscoreField {
+    sint32 _underScoreMessageField = 1;
+}
+
+message FollowingMessageUnderscoreField {
+    sint32 underScoreMessageField_ = 1;
+}
+
+message CombinedMessageUnderscoreField {
+    sint32 _underScoreMessage_Field_ = 1;
+}

+ 24 - 0
tests/test_protobuf/simpletest.cpp

@@ -64,6 +64,12 @@
 #include "simplesint32stringmapmessage.h"
 #include "simplestringstringmapmessage.h"
 #include "emptymessage.h"
+#include "message_uderscore_name.h"
+#include "messageuderscorename.h"
+#include "messageunderscorefield.h"
+#include "priormessageunderscorefield.h"
+#include "followingmessageunderscorefield.h"
+#include "combinedmessageunderscorefield.h"
 
 #include "globalenums.h"
 #include <QVariantList>
@@ -780,5 +786,23 @@ TEST_F(SimpleTest, MoveOperatorTest)
     ASSERT_EQ(3, updateSpy.count());
     ASSERT_EQ(3, movedUpdateSpy.count());
 }
+
+TEST_F(SimpleTest, UnderscoresTest)
+{
+    //Sanity compilation checks
+    Message_Uderscore_name msg1;
+    MessageUderscorename msg2;
+    MessageUnderscoreField msg3;
+    PriorMessageUnderscoreField msg4;
+    FollowingMessageUnderscoreField msg5;
+    CombinedMessageUnderscoreField msg6;
+
+    assertMessagePropertyRegistered<MessageUnderscoreField, sint32>(1, "QtProtobuf::sint32", "underScore_Message_field");
+    assertMessagePropertyRegistered<PriorMessageUnderscoreField, sint32>(1, "QtProtobuf::sint32", "_underScoreMessageField");
+    assertMessagePropertyRegistered<PriorMessageUnderscoreField, sint32>(1, "QtProtobuf::sint32", "_underScoreMessageField");
+    assertMessagePropertyRegistered<FollowingMessageUnderscoreField , sint32>(1, "QtProtobuf::sint32", "underScoreMessageField_");
+    assertMessagePropertyRegistered<CombinedMessageUnderscoreField , sint32>(1, "QtProtobuf::sint32", "_underScoreMessage_Field_");
+}
+
 } // tests
 } // qtprotobuf