Protobuf: reformatted tests for convinience of testing. Removed tests for fixed types (not needed at the moment)

proto/compiler/google/src/google/protobuf/compiler/kotlin/test/cross_branch.proto

@@ -1,23 +1,25 @@
 syntax = "proto3";
 
-message Grandfather {
+message CrossBranch {
-  message LeftFather {
+  message Grandfather {
-    message LeftLeftSon {
+    message LeftFather {
-      int32 son_field = 1;
+      message LeftLeftSon {
+        int32 son_field = 1;
+      }
+
+      message LeftRightSon {
+        int32 son_field = 1;
+      }
     }
 
-    message LeftRightSon {
+    message RightFather {
-      int32 son_field = 1;
+      message RightLeftSon {
+        Grandfather.LeftFather.LeftLeftSon son_field = 1;
+      }
+
+      message RightRightSon {
+        Grandfather.LeftFather.LeftRightSon son_field = 1;
+      }
     }
   }
-
+}
-  message RightFather {
-    message RightLeftSon {
-      Grandfather.LeftFather.LeftLeftSon son_field = 1;
-    }
-
-    message RightRightSon {
-      Grandfather.LeftFather.LeftRightSon son_field = 1;
-    }
-  }
-}

proto/compiler/google/src/google/protobuf/compiler/kotlin/test/fixed.proto

@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-message MessageFixed {
-  fixed32 fix32 = 1;
-  fixed64 fix64 = 2;
-  sfixed32 sfix32 = 3;
-  sfixed64 sfix64 = 4;
-}

proto/compiler/google/src/google/protobuf/compiler/kotlin/test/max_tag_val.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-message Msg {
+message MaxTagVal {
   int32 int = 536870911;
 
-  repeated Enum enum_array = 536870910;
+  repeated sint64 slong_array = 536870910;
 
   sint32 sint = 536870909;
 

proto/compiler/google/src/google/protobuf/compiler/kotlin/test/nested_messaged.proto

@@ -1,15 +1,17 @@
 syntax = "proto3";
 
-message Grandfather {
+message NestedMessage {
-  message Father {
+	message Grandfather {
-    message Son {
+	  message Father {
-      int32 son_field = 1;
+	    message Son {
-    }
+	      int32 son_field = 1;
+	    }
 
-    Son first_son = 1;
+	    Son first_son = 1;
-    Son second_son = 2;
+	    Son second_son = 2;
-  }
+	  }
 
-  Father first_father = 1;
+	  Father first_father = 1;
-  Father second_father = 2;
+	  Father second_father = 2;
-}
+	}
+}

proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_fixed.proto

@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-message MessageRepeateFixed {
-  repeated fixed32 fix32 = 1;
-  repeated fixed64 fix64 = 2;
-  repeated sfixed32 sfix32 = 3;
-  repeated sfixed64 sfix64 = 4;
-}

proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_varints.proto

@@ -8,13 +8,4 @@ message MessageRepeatedVarints {
   repeated bool bl = 5;
   repeated uint32 uint = 7;
   repeated uint64 ulong = 8;
-
-  enum TestEnum {
-    firstVal = 0;
-    secondVal = 1;
-    thirdVal = 2;
-  }
-
-  repeated TestEnum enumField = 6;
-
 }

proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_zigzag.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-message MessageZigZag {
+message MessageRepeatedZigZag {
   repeated sint32 int = 1;
   repeated sint64 long = 2;
 }

proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-message Msg {
+message TagOrder {
   int32 int = 3423;
-  repeated Enum enum_array = 12321;
+  repeated sint64 slong_array = 12321;
   sint32 sint = 8;
 
   enum Enum {

proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order_shuffled.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
 
-message Msg {
+message TagOrderShuffled {
   sint32 sint = 8;
   Enum enum_field = 938423;
 
-  repeated Enum enum_array = 12321;
+  repeated sint64 slong_array = 12321;
   int32 int = 3423;
   enum Enum {
     first_val = 0;