Some test cleanup

 - remove some duplicate or irrelevant tests
 - migrate some tests from Compile Testing to functional tests
 - rename some tests

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

javatests/dagger/functional/multibindings/ComplexMapKeysInDifferentOrderTest.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2018 The Dagger Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dagger.functional.multibindings;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.auto.value.AutoAnnotation;
+import dagger.Component;
+import dagger.MapKey;
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoMap;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public final class ComplexMapKeysInDifferentOrderTest {
+  @MapKey(unwrapValue = false)
+  @interface ComplexMapKey {
+    int i();
+    int j();
+  }
+
+  @Module
+  interface TestModule {
+    @Provides
+    @IntoMap
+    @ComplexMapKey(i = 1, j = 2)
+    static int inOrder() {
+      return 3;
+    }
+
+    @Provides
+    @IntoMap
+    @ComplexMapKey(j = 4, i = 5)
+    static int backwardsOrder() {
+      return 6;
+    }
+  }
+
+  @Component(modules = TestModule.class)
+  interface TestComponent {
+    Map<ComplexMapKey, Integer> map();
+  }
+
+  @Test
+  public void test() {
+    Map<ComplexMapKey, Integer> map =
+        DaggerComplexMapKeysInDifferentOrderTest_TestComponent.create().map();
+    assertThat(map.get(mapKey(1, 2))).isEqualTo(3);
+    assertThat(map.get(mapKey(5, 4))).isEqualTo(6);
+  }
+
+  @AutoAnnotation
+  static ComplexMapKey mapKey(int i, int j) {
+    return new AutoAnnotation_ComplexMapKeysInDifferentOrderTest_mapKey(i, j);
+  }
+}

javatests/dagger/functional/multibindings/MapKeyWithDefaultTest.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2018 The Dagger Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dagger.functional.multibindings;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.auto.value.AutoAnnotation;
+import dagger.Component;
+import dagger.MapKey;
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoMap;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public final class MapKeyWithDefaultTest {
+  @MapKey(unwrapValue = false)
+  @interface MapKeyWithDefault {
+    boolean hasDefault() default true;
+    boolean required();
+  }
+
+  @Module
+  interface TestModule {
+    @Provides
+    @IntoMap
+    @MapKeyWithDefault(required = false)
+    static int justRequired() {
+      return 1;
+    }
+
+    @Provides
+    @IntoMap
+    @MapKeyWithDefault(required = false, hasDefault = false)
+    static int both() {
+      return 2;
+    }
+  }
+
+  @Component(modules = TestModule.class)
+  interface TestComponent {
+    Map<MapKeyWithDefault, Integer> map();
+  }
+
+  @Test
+  public void test() {
+    Map<MapKeyWithDefault, Integer> map = DaggerMapKeyWithDefaultTest_TestComponent.create().map();
+    assertThat(map).hasSize(2);
+    assertThat(map.get(mapKey(true, false))).isEqualTo(1);
+    assertThat(map.get(mapKey(false, false))).isEqualTo(2);
+  }
+
+  @AutoAnnotation
+  static MapKeyWithDefault mapKey(boolean hasDefault, boolean required) {
+    return new AutoAnnotation_MapKeyWithDefaultTest_mapKey(hasDefault, required);
+  }
+}

javatests/dagger/internal/codegen/ComponentRequirementFieldTest.java

@@ -285,31 +285,7 @@ public void componentInstances() {
                 "        dep.object(), " + NPE_FROM_COMPONENT_METHOD + " );",
                 "  }",
                 "",
-                "  @Override",
-                "  public TestSubcomponent subcomponent() {",
-                "    return new TestSubcomponentImpl();",
-                "  }",
-                "",
-                "  public static final class Builder {",
-                "    private Dep dep;",
-                "",
-                "    public TestComponent build() {",
-                "      if (dep == null) {",
-                "        throw new IllegalStateException(",
-                "            Dep.class.getCanonicalName() + \" must be set\");",
-                "      }",
-                "      return new DaggerTestComponent(this);",
-                "    }",
-                "",
-                "    public Builder dep(Dep dep) {",
-                "      this.dep = Preconditions.checkNotNull(dep);",
-                "      return this;",
-                "    }",
-                "  }",
-                "",
                 "  private final class TestSubcomponentImpl implements TestSubcomponent {",
-                "    private TestSubcomponentImpl() {}",
-                "",
                 "    @Override",
                 "    public TestComponent parent() {",
                 "      return DaggerTestComponent.this;",
@@ -402,11 +378,6 @@ public void componentRequirementNeededInFactoryCreationOfSubcomponent() {
                 "    this.parentModule = builder.parentModule;",
                 "  }",
                 "",
-                "  @Override",
-                "  public TestSubcomponent subcomponent() {",
-                "    return new TestSubcomponentImpl();",
-                "  }",
-                "",
                 "  private final class TestSubcomponentImpl implements TestSubcomponent {",
                 "    private Set<Object> getSetOfObject() {",
                 "      return ImmutableSet.<Object>of(",
@@ -443,11 +414,6 @@ public void componentRequirementNeededInFactoryCreationOfSubcomponent() {
                 "    this.parentModule = builder.parentModule;",
                 "  }",
                 "",
-                "  @Override",
-                "  public TestSubcomponent subcomponent() {",
-                "    return new TestSubcomponentImpl();",
-                "  }",
-                "",
                 "  private final class TestSubcomponentImpl implements TestSubcomponent {",
                 "    @SuppressWarnings(\"unchecked\")",
                 "    private void initialize() {",

javatests/dagger/internal/codegen/ErrorMessagesTest.java → javatests/dagger/internal/codegen/DiagnosticFormattingTest.java

@@ -23,9 +23,10 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class ErrorMessagesTest {
+public class DiagnosticFormattingTest {
   @Test public void stripCommonTypePrefixes() {
     String typeName = "com.google.common.collect.ImmutableList<java.lang.Boolean>";
-    assertThat(DiagnosticFormatting.stripCommonTypePrefixes(typeName)).isEqualTo("ImmutableList<Boolean>");
+    assertThat(DiagnosticFormatting.stripCommonTypePrefixes(typeName))
+        .isEqualTo("ImmutableList<Boolean>");
   }
 }