Merge "Revert "Merge commit 'upstream/dagger-2.35.1^'"" am: 5882ce8935 am: 5480a6c05f

Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705751

Change-Id: I2f7a4d61b9f48965273925620a8dc0afc43c9bef

1 files changed, 0 insertions, 116 deletions

diff --git a/javatests/dagger/hilt/android/processor/internal/aggregateddeps/EarlyEntryPointProcessorTest.java b/javatests/dagger/hilt/android/processor/internal/aggregateddeps/EarlyEntryPointProcessorTest.java
deleted file mode 100644
index 3bf3a31de..000000000
--- a/javatests/dagger/hilt/android/processor/internal/aggregateddeps/EarlyEntryPointProcessorTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2021 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.hilt.android.processor.internal.aggregateddeps;
-
-import static com.google.testing.compile.CompilationSubject.assertThat;
-import static dagger.hilt.android.processor.AndroidCompilers.compiler;
-
-import com.google.testing.compile.Compilation;
-import com.google.testing.compile.JavaFileObjects;
-import javax.tools.JavaFileObject;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class EarlyEntryPointProcessorTest {
-
-  @Test
-  public void testUsedWithEntryPoint_fails() {
-    JavaFileObject entryPoint =
-        JavaFileObjects.forSourceLines(
-            "test.UsedWithEntryPoint",
-            "package test;",
-            "",
-            "import dagger.hilt.android.EarlyEntryPoint;",
-            "import dagger.hilt.EntryPoint;",
-            "import dagger.hilt.InstallIn;",
-            "import dagger.hilt.components.SingletonComponent;",
-            "",
-            "@EarlyEntryPoint",
-            "@EntryPoint",
-            "@InstallIn(SingletonComponent.class)",
-            "public interface UsedWithEntryPoint {}");
-    Compilation compilation = compiler().compile(entryPoint);
-
-    assertThat(compilation).failed();
-    assertThat(compilation)
-        .hadErrorContaining(
-            "Only one of the following annotations can be used on test.UsedWithEntryPoint: "
-                + "[dagger.hilt.EntryPoint, dagger.hilt.android.EarlyEntryPoint]")
-        .inFile(entryPoint)
-        .onLine(11);
-  }
-
-  @Test
-  public void testNotSingletonComponent_fails() {
-    JavaFileObject entryPoint =
-        JavaFileObjects.forSourceLines(
-            "test.NotSingletonComponent",
-            "package test;",
-            "",
-            "import dagger.hilt.android.EarlyEntryPoint;",
-            "import dagger.hilt.android.components.ActivityComponent;",
-            "import dagger.hilt.EntryPoint;",
-            "import dagger.hilt.InstallIn;",
-            "",
-            "@EarlyEntryPoint",
-            "@InstallIn(ActivityComponent.class)",
-            "public interface NotSingletonComponent {}");
-
-    Compilation compilation = compiler().compile(entryPoint);
-
-    assertThat(compilation).failed();
-    assertThat(compilation)
-        .hadErrorContaining(
-            "@EarlyEntryPoint can only be installed into the SingletonComponent. "
-                + "Found: [dagger.hilt.android.components.ActivityComponent]")
-        .inFile(entryPoint)
-        .onLine(10);
-  }
-
-  @Test
-  public void testThatTestInstallInCannotOriginateFromTest() {
-    JavaFileObject test =
-        JavaFileObjects.forSourceLines(
-            "test.MyTest",
-            "package test;",
-            "",
-            "import dagger.hilt.EntryPoint;",
-            "import dagger.hilt.InstallIn;",
-            "import dagger.hilt.android.EarlyEntryPoint;",
-            "import dagger.hilt.android.testing.HiltAndroidTest;",
-            "import dagger.hilt.components.SingletonComponent;",
-            "",
-            "@HiltAndroidTest",
-            "public class MyTest {",
-            "  @EarlyEntryPoint",
-            "  @InstallIn(SingletonComponent.class)",
-            "  interface NestedEarlyEntryPoint {}",
-            "}");
-    Compilation compilation = compiler().compile(test);
-    assertThat(compilation).failed();
-    assertThat(compilation).hadErrorCount(1);
-    assertThat(compilation)
-        .hadErrorContaining(
-            "@EarlyEntryPoint-annotated entry point, test.MyTest.NestedEarlyEntryPoint, cannot "
-                + "be nested in (or originate from) a @HiltAndroidTest-annotated class, "
-                + "test.MyTest.")
-        .inFile(test)
-        .onLine(13);
-  }
-}