Change HeaderMappingPreProcessor to correctly output all header mappi…

…ngs, deduplicate logic, and cleanup tests.

	Change on 2015/03/10 by mthvedt <mthvedt@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=88255681

translator/src/main/java/com/google/devtools/j2objc/HeaderMappingPreProcessor.java

@@ -14,13 +14,11 @@
 
 package com.google.devtools.j2objc;
 
-import com.google.devtools.j2objc.file.InputFile;
+import com.google.devtools.j2objc.ast.AbstractTypeDeclaration;
+import com.google.devtools.j2objc.ast.CompilationUnit;
 import com.google.devtools.j2objc.gen.GenerationUnit;
 import com.google.devtools.j2objc.util.JdtParser;
 
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
 /**
  * Reads source files and extracts header mappings between translated header files and associated
  * Java type declarations.
@@ -39,33 +37,12 @@ public HeaderMappingPreProcessor(JdtParser parser) {
   }
 
   @Override
-  protected void processGenerationUnit(GenerationUnit generationUnit) {
-    if (generationUnit.getOutputPath() != null) {
-      // We only care about GenerationUnits with non-default output paths.
-      super.processGenerationUnit(generationUnit);
-    }
-  }
-
-  @Override
-  protected void processCompilationUnit(
-      GenerationUnit genUnit, CompilationUnit unit, InputFile file) {
-    for (Object type : unit.types()) {
-      Options.getHeaderMappings().put(
-          getTypeQualifiedName(type, unit), genUnit.getOutputPath() + ".h");
-    }
-  }
-
-  @Override
-  protected void processCompiledGenerationUnit(GenerationUnit unit) {
-    throw new UnsupportedOperationException();  // Should never reach here
-  }
-
-  private String getTypeQualifiedName(Object type, CompilationUnit unit) {
-    AbstractTypeDeclaration typeDeclaration = (AbstractTypeDeclaration) type;
-    String packageName = unit.getPackage().getName().getFullyQualifiedName();
-    if (!packageName.isEmpty()) {
-      packageName += ".";
+  protected void processCompiledGenerationUnit(GenerationUnit generationUnit) {
+    for (CompilationUnit compilationUnit : generationUnit.getCompilationUnits()) {
+      for (AbstractTypeDeclaration decl : compilationUnit.getTypes()) {
+        String name = decl.getTypeBinding().getQualifiedName();
+        Options.getHeaderMappings().put(name, generationUnit.getOutputPath() + ".h");
+      }
     }
-    return packageName + typeDeclaration.getName().getIdentifier();
   }
 }

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

@@ -52,6 +52,7 @@
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -330,12 +331,24 @@ protected void loadSourceFileHeaderMappings(String... fileNames) {
     if (Options.shouldPreProcess()) {
       GenerationBatch batch = new GenerationBatch();
       for (String fileName : fileNames) {
-        batch.addSource(new RegularInputFile(tempDir.getPath() + "/" + fileName));
+        batch.addSource(new RegularInputFile(tempDir.getPath() + "/" + fileName, fileName));
       }
       new HeaderMappingPreProcessor(parser).processBatch(batch);
     }
   }
 
+  protected Map<String,String> writeAndReloadHeaderMappings() throws IOException {
+    File outputHeaderMappingFile = new File(tempDir.getPath() + "/mappings.j2objc");
+    outputHeaderMappingFile.deleteOnExit();
+    Options.setOutputHeaderMappingFile(outputHeaderMappingFile);
+    TranslationProcessor.printHeaderMappings();
+    Options.getHeaderMappings().clear();
+    Options.setOutputHeaderMappingFile(null);
+    Options.setHeaderMappingFiles(Lists.newArrayList(outputHeaderMappingFile.getAbsolutePath()));
+    loadHeaderMappings();
+    return Options.getHeaderMappings();
+  }
+
   protected void addSourceFile(String source, String fileName) throws IOException {
     File file = new File(tempDir, fileName);
     file.getParentFile().mkdirs();

translator/src/test/java/com/google/devtools/j2objc/gen/ObjectiveCHeaderGeneratorTest.java

@@ -165,13 +165,13 @@ public void testOutputHeaderFileMapping() throws IOException {
 
     String translation = translateSourceFile(getTranslatedFile("unit/test/AnotherDummy.java"),
         "AnotherDummy", "AnotherDummy.h");
-    assertTranslation(translation, "#include \"" + getTempDir() + "/unit/test/Dummy.h\"");
+    assertTranslation(translation, "#include \"unit/test/Dummy.h\"");
 
-    Map<String, String> outputMapping = Options.getHeaderMappings();
-    assertEquals(getTempDir() + "/unit/test/AnotherDummy.h",
-        outputMapping.get("unit.test.AnotherDummy"));
-    assertEquals(getTempDir() + "/unit/test/Dummy.h", outputMapping.get("unit.test.Dummy"));
-    assertEquals("my/mapping/custom/Test.h", outputMapping.get("unit.mapping.custom.Test"));
+    Map<String, String> outputMapping = writeAndReloadHeaderMappings();
+    assertEquals(outputMapping.get("unit.test.Dummy"), "unit/test/Dummy.h");
+    assertEquals(outputMapping.get("unit.test.AnotherDummy"), "unit/test/AnotherDummy.h");
+    assertEquals(outputMapping.get("unit.mapping.custom.Test"), "my/mapping/custom/Test.h");
+    assertEquals(outputMapping.get("unit.mapping.custom.AnotherTest"), "my/mapping/custom/Test.h");
   }
 
   public void testOutputHeaderFileMappingWithMultipleClassesInOneHeader() throws IOException {
@@ -205,12 +205,11 @@ public void testOutputHeaderFileMappingWithMultipleClassesInOneHeader() throws I
     assertTranslation(translationForDummy, "#include \"my/mapping/custom/Test.h\"");
     assertTranslation(translationForAnotherDummy, "#include \"my/mapping/custom/Test.h\"");
 
-    Map<String, String> outputMapping = Options.getHeaderMappings();
-    assertEquals(getTempDir() + "/unit/test/AnotherDummy.h",
-        outputMapping.get("unit.test.AnotherDummy"));
-    assertEquals(getTempDir() + "/unit/test/Dummy.h", outputMapping.get("unit.test.Dummy"));
-    assertEquals("my/mapping/custom/Test.h", outputMapping.get("unit.mapping.custom.Test"));
-    assertEquals("my/mapping/custom/Test.h", outputMapping.get("unit.mapping.custom.AnotherTest"));
+    Map<String, String> outputMapping = writeAndReloadHeaderMappings();
+    assertEquals(outputMapping.get("unit.test.Dummy"), "unit/test/Dummy.h");
+    assertEquals(outputMapping.get("unit.test.AnotherDummy"), "unit/test/AnotherDummy.h");
+    assertEquals(outputMapping.get("unit.mapping.custom.Test"), "my/mapping/custom/Test.h");
+    assertEquals(outputMapping.get("unit.mapping.custom.AnotherTest"), "my/mapping/custom/Test.h");
   }
 
   public void testForwardDeclarationTranslation() throws IOException {