fix: Use the right composers in deprecation unit tests (#715)

googleapis · Apr 21, 2021 · 2318136 · 2318136
1 parent 42dedef
commit 2318136
Show file tree

Hide file tree

Showing 10 changed files with 453 additions and 990 deletions.
diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java
@@ -43,7 +43,7 @@ public void generateServiceClasses() {
   public void generateServiceClasses_deprecated() {
     GapicContext context = TestProtoLoaderUtil.parseDeprecatedService();
     Service protoService = context.services().get(0);
-    GapicClass clazz = ServiceClientClassComposer.instance().generate(context, protoService);
+    GapicClass clazz = MockServiceClassComposer.instance().generate(context, protoService);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);

diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java
@@ -43,7 +43,7 @@ public void generateServiceClasses() {
   public void generateServiceClasses_deprecated() {
     GapicContext context = TestProtoLoaderUtil.parseDeprecatedService();
     Service protoService = context.services().get(0);
-    GapicClass clazz = ServiceClientClassComposer.instance().generate(context, protoService);
+    GapicClass clazz = MockServiceImplClassComposer.instance().generate(context, protoService);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);

diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java
@@ -43,7 +43,7 @@ public void generateServiceClasses() {
   public void generateServiceClasses_deprecated() {
     GapicContext context = TestProtoLoaderUtil.parseDeprecatedService();
     Service protoService = context.services().get(0);
-    GapicClass clazz = ServiceClientClassComposer.instance().generate(context, protoService);
+    GapicClass clazz = ServiceSettingsClassComposer.instance().generate(context, protoService);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);

diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
@@ -43,7 +43,7 @@ public void generateServiceClasses() {
   public void generateServiceClasses_deprecated() {
     GapicContext context = TestProtoLoaderUtil.parseDeprecatedService();
     Service protoService = context.services().get(0);
-    GapicClass clazz = ServiceClientClassComposer.instance().generate(context, protoService);
+    GapicClass clazz = ServiceStubClassComposer.instance().generate(context, protoService);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);

diff --git a/...st/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java b/...st/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java
@@ -79,7 +79,7 @@ public void generateServiceStubSettingsClasses_basic() throws IOException {
   public void generateServiceStubSettingsClasses_deprecated() throws IOException {
     GapicContext context = TestProtoLoaderUtil.parseDeprecatedService();
     Service protoService = context.services().get(0);
-    GapicClass clazz = ServiceClientClassComposer.instance().generate(context, protoService);
+    GapicClass clazz = ServiceStubSettingsClassComposer.instance().generate(context, protoService);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);