Fix test class generation fields ordering

vam-google · vam-google · commit 8e3545900718 · 2021-05-21T19:39:56.000-07:00
diff --git a/dependencies.properties b/dependencies.properties
@@ -15,7 +15,7 @@ version.com_google_gax_java=1.62.0
 version.io_grpc_java=1.30.2
 
 # Common deps.
-maven.com_google_guava_guava=com.google.guava:guava:26.0-jre
+maven.com_google_guava_guava=com.google.guava:guava:30.1-android
 maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.0
 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.7.2
 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.2
diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java
@@ -53,6 +53,7 @@
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
 import com.google.protobuf.AbstractMessage;
 import io.grpc.StatusRuntimeException;
 import java.util.ArrayList;
@@ -125,8 +126,14 @@ protected Map<String, VariableExpr> createClassMemberVarExprs(
     fields.put(SERVICE_HELPER_VAR_NAME, FIXED_GRPC_TYPESTORE.get("MockServiceHelper"));
     fields.put(CLIENT_VAR_NAME, typeStore.get(ClassNames.getServiceClientClassName(service)));
     fields.put(CHANNEL_PROVIDER_VAR_NAME, FIXED_GRPC_TYPESTORE.get("LocalChannelProvider"));
+
     return fields.entrySet().stream()
-        .collect(Collectors.toMap(e -> e.getKey(), e -> varExprFn.apply(e.getKey(), e.getValue())));
+        .collect(
+            Collectors.toMap(
+                Map.Entry::getKey,
+                e -> varExprFn.apply(e.getKey(), e.getValue()),
+                (u, v) -> {throw new IllegalStateException();},
+                LinkedHashMap::new));
   }
 
   @Override
@@ -193,8 +200,7 @@ protected MethodDefinition createStartStaticServerMethod(
     varInitExprs.add(startServiceHelperExpr);
 
     return MethodDefinition.builder()
-        .setAnnotations(
-            Arrays.asList(AnnotationNode.withType(FIXED_TYPESTORE.get("BeforeClass"))))
+        .setAnnotations(Arrays.asList(AnnotationNode.withType(FIXED_TYPESTORE.get("BeforeClass"))))
         .setScope(ScopeNode.PUBLIC)
         .setIsStatic(true)
         .setReturnType(TypeNode.VOID)
@@ -208,8 +214,7 @@ protected MethodDefinition createStartStaticServerMethod(
   protected MethodDefinition createStopServerMethod(
       Service service, Map<String, VariableExpr> classMemberVarExprs) {
     return MethodDefinition.builder()
-        .setAnnotations(
-            Arrays.asList(AnnotationNode.withType(FIXED_TYPESTORE.get("AfterClass"))))
+        .setAnnotations(Arrays.asList(AnnotationNode.withType(FIXED_TYPESTORE.get("AfterClass"))))
         .setScope(ScopeNode.PUBLIC)
         .setIsStatic(true)
         .setReturnType(TypeNode.VOID)
diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClientTest.golden
@@ -40,8 +40,8 @@ import org.junit.Test;
 
 @Generated("by gapic-generator-java")
 public class EchoClientTest {
-  private static MockServiceHelper mockServiceHelper;
   private static MockEcho mockEcho;
+  private static MockServiceHelper mockServiceHelper;
   private EchoClient client;
   private LocalChannelProvider channelProvider;
 
diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingClientTest.golden
@@ -43,8 +43,8 @@ import org.junit.Test;
 
 @Generated("by gapic-generator-java")
 public class LoggingServiceV2ClientTest {
-  private static MockServiceHelper mockServiceHelper;
   private static MockLoggingServiceV2 mockLoggingServiceV2;
+  private static MockServiceHelper mockServiceHelper;
   private LoggingServiceV2Client client;
   private LocalChannelProvider channelProvider;
 
diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden
@@ -36,8 +36,8 @@ import org.junit.Test;
 
 @Generated("by gapic-generator-java")
 public class SubscriberClientTest {
-  private static MockServiceHelper mockServiceHelper;
   private static MockSubscriber mockSubscriber;
+  private static MockServiceHelper mockServiceHelper;
   private SubscriberClient client;
   private LocalChannelProvider channelProvider;
 
diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/TestingClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/TestingClientTest.golden
@@ -31,9 +31,9 @@ import org.junit.Test;
 
 @Generated("by gapic-generator-java")
 public class TestingClientTest {
+  private static MockTesting mockTesting;
   private static MockServiceHelper mockServiceHelper;
   private TestingClient client;
-  private static MockTesting mockTesting;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
