[SCB-2893]-Fixes flaky tests in TestSchemaToProtoGenerator (#4635)

Author: wtrzas2

common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/schema/SchemaToProtoGenerator.java

@@ -22,6 +22,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -354,8 +355,10 @@ public void createMessage(Schema<?> schema) {
     messages.add(schema.getName());
 
     appendLine(msgStringBuilder, "message %s {", schema.getName());
+    List<Map.Entry<String, Schema>> sortedProperties = new ArrayList<>(schema.getProperties().entrySet());
+    sortedProperties.sort(Comparator.comparing(Map.Entry::getKey));
     int tag = 1;
-    for (Entry<String, Schema> entry : schema.getProperties().entrySet()) {
+    for (Entry<String, Schema> entry : sortedProperties) {
       Schema property = entry.getValue();
       String propertyType = findSchemaType(property);
 

common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java

@@ -154,8 +154,8 @@ public void test_springmvc_model_schema_correct() {
         package test.model;
 
         message Model {
-          string name = 1;
-          sint32 age = 2;
+          sint32 age = 1;
+          string name = 2;
         }
 
         //@WrapProperty
@@ -175,8 +175,8 @@ public void test_springmvc_model_schema_correct() {
         package test.model;
 
         message Model {
-          string name = 1;
-          sint32 age = 2;
+          sint32 age = 1;
+          string name = 2;
         }
 
         //@WrapProperty
@@ -220,15 +220,15 @@ public void testNestedModelCorrect() {
        }
 
        message DeptInfo {
-         string name = 1;
-         string code = 2;
+         string code = 1;
+         string name = 2;
          repeated ScoreInfo scores = 3;
        }
 
        message UserInfo {
-         repeated DeptInfo subDeptInfos = 1;
-         repeated MapString extraInfos = 2;
-         repeated ListListString nestedLists = 3;
+         repeated MapString extraInfos = 1;
+         repeated ListListString nestedLists = 2;
+         repeated DeptInfo subDeptInfos = 3;
        }
 
        //@WrapProperty
@@ -267,8 +267,8 @@ public void testListMapTypeCorrect() {
        }
 
        message DeptInfo {
-         string name = 1;
-         string code = 2;
+         string code = 1;
+         string name = 2;
          repeated ScoreInfo scores = 3;
        }