Broke up PackageInfoLookup test, added tests for package-info.class f…

…iles.

	Change on 2017/07/28 by tball <tball@google.com>

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163514225

translator/src/test/java/com/google/devtools/j2objc/GenerationTest.java

@@ -217,7 +217,47 @@ protected CompilationUnit compileAsClassFile(String name, String source,
       String... flags) throws IOException {
     assertTrue("Classfile translation not enabled", options.translateClassfiles());
 
-    String path = name.replace('.', '/') + ".java";
+    InputFile input = createClassFile(name, source, flags);
+    if (input == null) {
+      // Class file compilation failed.
+      return null;
+    }
+    int errors = ErrorUtil.errorCount();
+    CompilationUnit unit = parser.parse(input);
+    if (ErrorUtil.errorCount() > errors) {
+      int newErrorCount = ErrorUtil.errorCount() - errors;
+      String info = String.format(
+          "%d test compilation error%s", newErrorCount, (newErrorCount == 1 ? "" : "s"));
+      failWithMessages(info, ErrorUtil.getErrorMessages().subList(errors, ErrorUtil.errorCount()));
+    }
+    return unit;
+  }
+
+  /**
+   * Compiles Java source to a JVM class file.
+   *
+   * @param typeName the name of the type being declared
+   * @param source the source code
+   * @return the InputFile defining the class file
+   */
+  protected InputFile createClassFile(String typeName, String source) throws IOException {
+    String tempPath = tempDir.getAbsolutePath();
+    List<String> classpath = getComGoogleDevtoolsJ2objcPath();
+    classpath.add(0, tempPath);
+    return createClassFile(typeName, source, "-d", tempPath, "-cp", String.join(":", classpath));
+  }
+
+  /**
+   * Compiles Java source to a JVM class file.
+   *
+   * @param typeName the name of the type being declared
+   * @param source the source code
+   * @param flags which javac flags to use
+   * @return the InputFile defining the class file
+   */
+  protected InputFile createClassFile(String typeName, String source, String... flags)
+      throws IOException {
+    String path = typeName.replace('.', '/') + ".java";
     File srcFile = new File(tempDir, path);
     srcFile.getParentFile().mkdirs();
     try (FileWriter fw = new FileWriter(srcFile)) {
@@ -241,16 +281,7 @@ protected CompilationUnit compileAsClassFile(String name, String source,
     File classFile = new File(tempDir, path.replace(".java", ".class"));
     assertTrue(classFile.exists());
 
-    InputFile input = new RegularInputFile(classFile.getAbsolutePath(), name);
-    int errors = ErrorUtil.errorCount();
-    CompilationUnit unit = parser.parse(input);
-    if (ErrorUtil.errorCount() > errors) {
-      int newErrorCount = ErrorUtil.errorCount() - errors;
-      String info = String.format(
-          "%d test compilation error%s", newErrorCount, (newErrorCount == 1 ? "" : "s"));
-      failWithMessages(info, ErrorUtil.getErrorMessages().subList(errors, ErrorUtil.errorCount()));
-    }
-    return unit;
+    return new RegularInputFile(classFile.getAbsolutePath(), typeName);
   }
 
   protected static List<String> getComGoogleDevtoolsJ2objcPath() {

translator/src/test/java/com/google/devtools/j2objc/util/PackageInfoLookupTest.java

@@ -26,34 +26,92 @@
  */
 public class PackageInfoLookupTest extends GenerationTest {
 
-  public void testReflectionSupportAnnotation() throws IOException {
+  public void testFullReflectionSupportSetValue() throws IOException {
     addSourceFile("@ReflectionSupport(value = ReflectionSupport.Level.FULL) package foo;"
         + "import com.google.j2objc.annotations.ReflectionSupport;", "foo/package-info.java");
     CompilationUnit unit = translateType("foo.A", "package foo; public class A {}");
     PackageInfoLookup packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
-    assert packageInfoLookup.getReflectionSupportLevel("foo") == ReflectionSupport.Level.FULL;
+    assertSame(ReflectionSupport.Level.FULL, packageInfoLookup.getReflectionSupportLevel("foo"));
+  }
 
+  public void testFullReflectionSupport() throws IOException {
     addSourceFile("@ReflectionSupport(ReflectionSupport.Level.FULL) package bar;"
         + "import com.google.j2objc.annotations.*;", "bar/package-info.java");
-    unit = translateType("bar.A", "package bar; public class A {}");
-    packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
-    assert packageInfoLookup.getReflectionSupportLevel("bar") == ReflectionSupport.Level.FULL;
+    CompilationUnit unit = translateType("bar.A", "package bar; public class A {}");
+    PackageInfoLookup packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
+    assertSame(ReflectionSupport.Level.FULL, packageInfoLookup.getReflectionSupportLevel("bar"));
+  }
 
+  public void testNativeOnlyReflectionSupport() throws IOException {
     addSourceFile("@com.google.j2objc.annotations.ReflectionSupport"
         + "(com.google.j2objc.annotations.ReflectionSupport.Level.NATIVE_ONLY) package baz;",
         "baz/package-info.java");
-    unit = translateType("baz.A", "package baz; public class A {}");
-    packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
-    assert
-        packageInfoLookup.getReflectionSupportLevel("baz") == ReflectionSupport.Level.NATIVE_ONLY;
+    CompilationUnit unit = translateType("baz.A", "package baz; public class A {}");
+    PackageInfoLookup packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
+    assertSame(ReflectionSupport.Level.NATIVE_ONLY,
+        packageInfoLookup.getReflectionSupportLevel("baz"));
+  }
 
-    // Verify that ReflectionSupport annotation can be parsed from class files
+  // Verify that ReflectionSupport annotation can be parsed from a compiled jar file.
+  public void testReflectionSupportInJarFile() throws IOException {
     String jarFilePath = getResourceAsFile("packageInfoLookupTest.jar");
     options.fileUtil().getClassPathEntries().add(jarFilePath);
-    unit = translateType("com.google.test.packageInfoLookupTest.A",
+    CompilationUnit unit = translateType("com.google.test.packageInfoLookupTest.A",
         "package com.google.test.packageInfoLookupTest; public class A {}");
-    packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
-    assert packageInfoLookup.getReflectionSupportLevel(unit.getPackage().getName().toString())
-        == ReflectionSupport.Level.FULL;
+    PackageInfoLookup packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
+    assertSame(ReflectionSupport.Level.FULL,
+        packageInfoLookup.getReflectionSupportLevel(unit.getPackage().getName().toString()));
+  }
+
+  public void testFullReflectionSupportSetValueCompiled() throws IOException {
+    createClassFile("foo.package-info",
+        "@ReflectionSupport(value = ReflectionSupport.Level.FULL) package foo;"
+        + "import com.google.j2objc.annotations.ReflectionSupport;");
+    CompilationUnit unit = translateType("foo.A", "package foo; public class A {}");
+    PackageInfoLookup packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
+    assertSame(ReflectionSupport.Level.FULL, packageInfoLookup.getReflectionSupportLevel("foo"));
+  }
+
+  public void testFullReflectionSupportCompiled() throws IOException {
+    createClassFile("bar.package-info",
+        "@ReflectionSupport(ReflectionSupport.Level.FULL) package bar;"
+        + "import com.google.j2objc.annotations.ReflectionSupport;");
+    CompilationUnit unit = translateType("bar.A", "package bar; public class A {}");
+    PackageInfoLookup packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
+    assertSame(ReflectionSupport.Level.FULL, packageInfoLookup.getReflectionSupportLevel("bar"));
+  }
+
+  public void testNativeOnlyReflectionSupportCompiled() throws IOException {
+    createClassFile("baz.package-info",
+        "@com.google.j2objc.annotations.ReflectionSupport"
+        + "(com.google.j2objc.annotations.ReflectionSupport.Level.NATIVE_ONLY) package baz;");
+    CompilationUnit unit = translateType("baz.A", "package baz; public class A {}");
+    PackageInfoLookup packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
+    assertSame(ReflectionSupport.Level.NATIVE_ONLY,
+        packageInfoLookup.getReflectionSupportLevel("baz"));
+  }
+
+  public void testPackageRenameCompiled() throws IOException {
+    createClassFile("foo.package-info",
+        "@ObjectiveCName(\"XYZ\") package foo; "
+        + "import com.google.j2objc.annotations.ObjectiveCName;");
+    String translation = translateSourceFile("package foo; public class A {}", "foo.A", "foo/A.h");
+    assertTranslation(translation, "@interface XYZA");
+  }
+
+  // Verify that ParametersAreNonnullByDefault is not set on packages by default.
+  public void testParametersAreNonnullByDefaultNotSet() throws IOException {
+    CompilationUnit unit = translateType("foo.A", "package foo; public class A {}");
+    PackageInfoLookup packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
+    assertFalse(packageInfoLookup.hasParametersAreNonnullByDefault("foo"));
+  }
+
+  public void testParametersAreNonnullByDefault() throws IOException {
+    createClassFile("bar.package-info",
+        "@ParametersAreNonnullByDefault package bar;"
+        + "import javax.annotation.ParametersAreNonnullByDefault;");
+    CompilationUnit unit = translateType("bar.A", "package bar; public class A {}");
+    PackageInfoLookup packageInfoLookup = unit.getEnv().options().getPackageInfoLookup();
+    assertTrue(packageInfoLookup.hasParametersAreNonnullByDefault("bar"));
   }
 }