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, 122 deletions

diff --git a/javatests/dagger/hilt/processor/internal/root/RootProcessorErrorsTest.java b/javatests/dagger/hilt/processor/internal/root/RootProcessorErrorsTest.java
deleted file mode 100644
index e9ed8c418..000000000
--- a/javatests/dagger/hilt/processor/internal/root/RootProcessorErrorsTest.java
+++ /dev/null
@@ -1,122 +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.processor.internal.root;
-
-import static com.google.testing.compile.CompilationSubject.assertThat;
-
-import com.google.common.collect.ImmutableCollection;
-import com.google.common.collect.ImmutableList;
-import com.google.testing.compile.Compilation;
-import com.google.testing.compile.Compiler;
-import com.google.testing.compile.JavaFileObjects;
-import dagger.hilt.android.processor.AndroidCompilers;
-import javax.tools.JavaFileObject;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public final class RootProcessorErrorsTest {
-
-  @Parameters(name = "{0}")
-  public static ImmutableCollection<Object[]> parameters() {
-    return ImmutableList.copyOf(new Object[][] {{true}, {false}});
-  }
-
-  private final boolean disableCrossCompilationRootValidation;
-
-  public RootProcessorErrorsTest(boolean disableCrossCompilationRootValidation) {
-    this.disableCrossCompilationRootValidation = disableCrossCompilationRootValidation;
-  }
-
-  private Compiler compiler() {
-    return AndroidCompilers.compiler()
-        .withOptions(
-            String.format(
-                "-Adagger.hilt.disableCrossCompilationRootValidation=%s",
-                disableCrossCompilationRootValidation));
-  }
-
-  @Test
-  public void multipleAppRootsTest() {
-    JavaFileObject appRoot1 =
-        JavaFileObjects.forSourceLines(
-            "test.AppRoot1",
-            "package test;",
-            "",
-            "import android.app.Application;",
-            "import dagger.hilt.android.HiltAndroidApp;",
-            "",
-            "@HiltAndroidApp(Application.class)",
-            "public class AppRoot1 extends Hilt_AppRoot1 {}");
-
-    JavaFileObject appRoot2 =
-        JavaFileObjects.forSourceLines(
-            "test.AppRoot2",
-            "package test;",
-            "",
-            "import android.app.Application;",
-            "import dagger.hilt.android.HiltAndroidApp;",
-            "",
-            "@HiltAndroidApp(Application.class)",
-            "public class AppRoot2 extends Hilt_AppRoot2 {}");
-
-    // This test case should fail independent of disableCrossCompilationRootValidation.
-    Compilation compilation = compiler().compile(appRoot1, appRoot2);
-    assertThat(compilation).failed();
-    assertThat(compilation).hadErrorCount(1);
-    assertThat(compilation)
-        .hadErrorContaining(
-            "Cannot process multiple app roots in the same compilation unit: "
-                + "[test.AppRoot1, test.AppRoot2]");
-  }
-
-  @Test
-  public void appRootWithTestRootTest() {
-    JavaFileObject appRoot =
-        JavaFileObjects.forSourceLines(
-            "test.AppRoot",
-            "package test;",
-            "",
-            "import android.app.Application;",
-            "import dagger.hilt.android.HiltAndroidApp;",
-            "",
-            "@HiltAndroidApp(Application.class)",
-            "public class AppRoot extends Hilt_AppRoot {}");
-
-    JavaFileObject testRoot =
-        JavaFileObjects.forSourceLines(
-            "test.TestRoot",
-            "package test;",
-            "",
-            "import dagger.hilt.android.testing.HiltAndroidTest;",
-            "",
-            "@HiltAndroidTest",
-            "public class TestRoot {}");
-
-    // This test case should fail independent of disableCrossCompilationRootValidation.
-    Compilation compilation = compiler().compile(appRoot, testRoot);
-    assertThat(compilation).failed();
-    assertThat(compilation).hadErrorCount(1);
-    assertThat(compilation)
-        .hadErrorContaining(
-            "Cannot process test roots and app roots in the same compilation unit:"
-                + "\n  \tApp root in this compilation unit: [test.AppRoot]"
-                + "\n  \tTest roots in this compilation unit: [test.TestRoot]");
-  }
-}