From 6f852575137548dc636b55c84dcbf25a514dad0f Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Mon, 3 Jun 2024 22:13:04 +0530 Subject: [PATCH] fix(lsp/java): update to fw-stubs/android.jar for tests --- java/lsp/build.gradle.kts | 2 +- .../itsaky/androidide/lsp/java/indexing/JavaClassCRUDTest.kt | 2 +- .../indexing/{ModelBuilder.kt => ModelBuilderTestUtil.kt} | 4 ++-- testing/benchmarks/build.gradle.kts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/{ModelBuilder.kt => ModelBuilderTestUtil.kt} (95%) diff --git a/java/lsp/build.gradle.kts b/java/lsp/build.gradle.kts index 40389a976..0d0a0d418 100644 --- a/java/lsp/build.gradle.kts +++ b/java/lsp/build.gradle.kts @@ -33,7 +33,7 @@ android { sourceSets { getByName("androidTest") { - assets.srcDirs(rootProject.file("subprojects/framework-stubs/libs")) + assets.srcDirs(rootProject.file("utilities/framework-stubs/libs")) } } } diff --git a/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaClassCRUDTest.kt b/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaClassCRUDTest.kt index 5ede3c0c6..e039e7a79 100644 --- a/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaClassCRUDTest.kt +++ b/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaClassCRUDTest.kt @@ -43,7 +43,7 @@ class JavaClassCRUDTest { @Test fun testSimpleJavaClassCRUD() { dbTestRule.withDb("java-class-CRUD") { - val klass = ModelBuilder.createJavaClass() + val klass = ModelBuilderTestUtil.createTestClass() // CREATE executeTransaction { diff --git a/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilder.kt b/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilderTestUtil.kt similarity index 95% rename from java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilder.kt rename to java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilderTestUtil.kt index be74fe1ff..1493097ba 100644 --- a/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilder.kt +++ b/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilderTestUtil.kt @@ -27,9 +27,9 @@ import openjdk.tools.classfile.AccessFlags /** * @author Akash Yadav */ -object ModelBuilder { +object ModelBuilderTestUtil { - fun createJavaClass() = JavaClass.newInstance( + fun createTestClass() = JavaClass.newInstance( fqn = "com/itsaky/androidide/indexing/TestClass", name = "TestClass", packageName = "com/itsaky/androidide/indexing", diff --git a/testing/benchmarks/build.gradle.kts b/testing/benchmarks/build.gradle.kts index e8ef9e7aa..ccf535e39 100644 --- a/testing/benchmarks/build.gradle.kts +++ b/testing/benchmarks/build.gradle.kts @@ -32,7 +32,7 @@ android { sourceSets { getByName("androidTest") { - assets.srcDirs(rootProject.file("subprojects/framework-stubs/libs")) + assets.srcDirs(rootProject.file("utilities/framework-stubs/libs")) } }