From f325f822ff82a55aa622abdd950a94d707583792 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Wed, 29 May 2024 22:42:02 +0530
Subject: [PATCH] tests: fix path related test failures

---
 .../app/configuration/IDEBuildConfigProviderImplTest.kt     | 6 +++---
 .../src/test/java/com/itsaky/androidide/gradle/utils.kt     | 6 +++---
 .../com/itsaky/androidide/templates/TestRecipeExecutor.kt   | 6 +++---
 .../java/com/itsaky/androidide/aaptcompiler/CompilerTest.kt | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/app/src/test/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImplTest.kt b/core/app/src/test/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImplTest.kt
index 045324ec1..4d8c937f1 100644
--- a/core/app/src/test/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImplTest.kt
+++ b/core/app/src/test/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImplTest.kt
@@ -17,11 +17,11 @@
 
 package com.itsaky.androidide.app.configuration
 
+import com.android.SdkConstants.ABI_ARM64_V8A
+import com.android.SdkConstants.ABI_ARMEABI_V7A
 import com.google.common.truth.Truth.assertThat
-import com.itsaky.androidide.BuildConfig.ABI_ARM64_V8A
-import com.itsaky.androidide.BuildConfig.ABI_ARMEABI_V7A
-import com.itsaky.androidide.BuildConfig.ABI_X86_64
 import org.junit.Test
+import com.android.SdkConstants.ABI_INTEL_ATOM64 as ABI_X86_64
 
 /**
  * @author Akash Yadav
diff --git a/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt b/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt
index d0c1e5f41..65f14c077 100644
--- a/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt
+++ b/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt
@@ -25,6 +25,7 @@ import org.gradle.testkit.runner.internal.PluginUnderTestMetadataReading
 import java.io.File
 import java.io.FileNotFoundException
 import java.nio.file.Path
+import java.nio.file.Paths
 import kotlin.io.path.pathString
 
 internal fun buildProject(
@@ -36,7 +37,7 @@ internal fun buildProject(
 ): BuildResult {
   val projectRoot = openProject(agpVersion, useApplyPluginGroovySyntax, *plugins)
   val initScript = FileProvider.testHomeDir().resolve(".androidide/init/androidide.init.gradle")
-  val mavenLocal = FileProvider.projectRoot().resolve("gradle-plugin/build/maven-local/repos.txt").toFile()
+  val mavenLocal = Paths.get("build/maven-local/repos.txt").toFile()
 
   if (!(mavenLocal.exists() && mavenLocal.isFile)) {
     throw FileNotFoundException("repos.txt file not found")
@@ -103,8 +104,7 @@ internal fun openProject(
   useApplyPluginGroovySyntax: Boolean = false,
   vararg plugins: String
 ): Path {
-  val projectRoot = FileProvider.projectRoot()
-    .resolve("gradle-plugin/src/test/resources/sample-project")
+  val projectRoot = Paths.get("src/test/resources/sample-project")
 
   run {
     projectRoot.resolve("build.gradle.kts").toFile()
diff --git a/utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/TestRecipeExecutor.kt b/utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/TestRecipeExecutor.kt
index 3094dd6bc..c30a1c1f7 100644
--- a/utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/TestRecipeExecutor.kt
+++ b/utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/TestRecipeExecutor.kt
@@ -33,9 +33,9 @@ class TestRecipeExecutor : RecipeExecutor {
   // order of the element matters!
   private val modulesWithAssets by lazy {
     arrayOf(
-      "templates-api",
-      "templates-impl",
-      "app"
+      "utilities/templates-api",
+      "utilities/templates-impl",
+      "core/app"
     )
   }
 
diff --git a/xml/aaptcompiler/src/test/java/com/itsaky/androidide/aaptcompiler/CompilerTest.kt b/xml/aaptcompiler/src/test/java/com/itsaky/androidide/aaptcompiler/CompilerTest.kt
index b6346a1f5..33718c6a4 100644
--- a/xml/aaptcompiler/src/test/java/com/itsaky/androidide/aaptcompiler/CompilerTest.kt
+++ b/xml/aaptcompiler/src/test/java/com/itsaky/androidide/aaptcompiler/CompilerTest.kt
@@ -40,7 +40,7 @@ class CompilerTest {
   @Test
   fun `test simple compilatation`() {
     val input =
-      FileProvider.projectRoot().resolve("app/src/main/res/layout/activity_editor.xml").toFile()
+      FileProvider.projectRoot().resolve("core/app/src/main/res/layout/activity_editor.xml").toFile()
     val output = Paths.get("./build").absolute().normalize().toFile()
     println(input)
     println(output)