test: add test cases to capture type and import writing for nested classes

emmileaf · emmileaf · commit f505036ad894 · 2023-05-24T14:28:57.000-04:00
* To illustrate current unintended behavior
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java b/gapic-generator-java/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java
@@ -58,6 +58,7 @@
 import com.google.api.generator.test.utils.LineFormatter;
 import com.google.common.base.Function;
 import com.google.common.base.Strings;
+import com.google.testgapic.v1beta1.Outer;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -428,6 +429,32 @@ public void writeVariableExprImports_annotationsWithDescription() {
         writerVisitor.write());
   }
 
+  @Test
+  public void writeImport_nestedClasses() {
+
+    VaporReference nestedVaporReference =
+        VaporReference.builder()
+            .setName("Inner")
+            .setEnclosingClassNames(Arrays.asList("Outer", "Middle"))
+            .setPakkage("com.google.testgapic.v1beta1")
+            .build();
+
+    TypeNode.withReference(nestedVaporReference).accept(writerVisitor);
+    // TODO: The import below causes compilation errors,
+    // since JavaWriterVisitor writes the corresponding type as Outer.Middle.Inner
+    // Need to change either Writer's behavior to align with the other
+    assertEquals("import com.google.testgapic.v1beta1.Outer.Middle;\n\n", writerVisitor.write());
+
+    writerVisitor.clear();
+
+    ConcreteReference nestedConcreteReference =
+        ConcreteReference.withClazz(Outer.Middle.Inner.class);
+    TypeNode.withReference(nestedConcreteReference).accept(writerVisitor);
+    // TODO: This is currently writing import com.google.testgapic.v1beta1.Middle.Outer;
+    // which is incorrect - uncomment assertion along with fix
+    // assertEquals("import com.google.testgapic.v1beta1.Outer.Middle;\n\n", writerVisitor.write());
+  }
+
   @Test
   public void writeAnonymousClassExprImports() {
     // [Constructing] Function<List<IOException>, MethodDefinition>
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/engine/writer/JavaWriterVisitorTest.java b/gapic-generator-java/src/test/java/com/google/api/generator/engine/writer/JavaWriterVisitorTest.java
@@ -74,6 +74,7 @@
 import com.google.api.generator.test.utils.LineFormatter;
 import com.google.api.generator.test.utils.TestExprBuilder;
 import com.google.common.base.Function;
+import com.google.testgapic.v1beta1.Outer;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -129,6 +130,31 @@ public void writeReferenceType_basic() {
     assertEquals("FooBar", writerVisitor.write());
   }
 
+  @Test
+  public void writeReferenceType_nestedClasses() {
+
+    VaporReference nestedVaporReference =
+        VaporReference.builder()
+            .setName("Inner")
+            .setEnclosingClassNames(Arrays.asList("Outer", "Middle"))
+            .setPakkage("com.google.testgapic.v1beta1")
+            .build();
+    TypeNode.withReference(nestedVaporReference).accept(writerVisitor);
+    // TODO: The behavior below causes compilation errors,
+    // since ImportWriterVisitor writes import of com.google.testgapic.v1beta1.Outer.Middle;
+    // Need to change either Writer's behavior to align with the other
+    assertEquals("Outer.Middle.Inner", writerVisitor.write());
+
+    writerVisitor.clear();
+
+    ConcreteReference nestedConcreteReference =
+        ConcreteReference.withClazz(Outer.Middle.Inner.class);
+    TypeNode.withReference(nestedConcreteReference).accept(writerVisitor);
+    // TODO: This is currently writing type as Middle.Outer.Inner;
+    // which is incorrect - update and uncomment assertion along with fix
+    // assertEquals("Outer.Middle.Inner", writerVisitor.write());
+  }
+
   @Test
   public void writeReferenceType_useFullName() {
     TypeNode.withReference(
