From 25dbd5951cf0f00b5d8fa27684fbfe5e8db3a7fc Mon Sep 17 00:00:00 2001 From: Joshua Selbo Date: Wed, 4 Mar 2026 09:11:51 -0600 Subject: [PATCH] Move test sources to androidTest so they are discoverable The test classes in dexmaker-mockito-inline-tests and dexmaker-mockito-inline-extended-tests were in src/main/java, making them compile as library code rather than instrumentation tests. This was done in 8524de2 to allow cross-module inclusion via Gradle dependencies instead of symlinks, but left the tests unrunnable from Gradle's connectedDebugAndroidTest task. Move test sources to src/androidTest/java and update dependencies to androidTestImplementation so the test runner can discover them. --- dexmaker-mockito-inline-extended-tests/build.gradle | 10 ++++------ .../mockito/inline/extended/tests/EmptyActivity.java | 0 .../tests/MockInstanceUsingExtendedMockito.java | 0 .../dx/mockito/inline/extended/tests/MockStatic.java | 0 .../dx/mockito/inline/extended/tests/SpyOn.java | 0 .../inline/extended/tests/StaticMockitoSession.java | 0 .../StaticMockitoSessionVsMockitoJUnitRunner.java | 0 .../dx/mockito/inline/extended/tests/Stress.java | 0 .../dx/mockito/inline/extended/tests/VerifyStatic.java | 0 dexmaker-mockito-inline-tests/build.gradle | 8 +++----- .../android/dx/mockito/inline/tests/MemoryLeaks.java | 0 .../com/android/dx/mockito/inline/tests/MockFinal.java | 0 .../android/dx/mockito/inline/tests/MockNonPublic.java | 0 .../inline/tests/MultipleJvmtiAgentsInterference.java | 0 dexmaker-mockito-tests/build.gradle | 7 +++---- .../com/android/dx/mockito/tests/BlacklistedApis.java | 0 .../com/android/dx/mockito/tests/CleanStackTrace.java | 0 .../com/android/dx/mockito/tests/GeneralMocking.java | 0 .../com/android/dx/mockito/tests/PartialClasses.java | 0 .../java/com/android/dx/mockito/tests/Stress.java | 0 20 files changed, 10 insertions(+), 15 deletions(-) rename dexmaker-mockito-inline-extended-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/extended/tests/EmptyActivity.java (100%) rename dexmaker-mockito-inline-extended-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/extended/tests/MockInstanceUsingExtendedMockito.java (100%) rename dexmaker-mockito-inline-extended-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/extended/tests/MockStatic.java (100%) rename dexmaker-mockito-inline-extended-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/extended/tests/SpyOn.java (100%) rename dexmaker-mockito-inline-extended-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSession.java (100%) rename dexmaker-mockito-inline-extended-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSessionVsMockitoJUnitRunner.java (100%) rename dexmaker-mockito-inline-extended-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/extended/tests/Stress.java (100%) rename dexmaker-mockito-inline-extended-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/extended/tests/VerifyStatic.java (100%) rename dexmaker-mockito-inline-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/tests/MemoryLeaks.java (100%) rename dexmaker-mockito-inline-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/tests/MockFinal.java (100%) rename dexmaker-mockito-inline-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/tests/MockNonPublic.java (100%) rename dexmaker-mockito-inline-tests/src/{main => androidTest}/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java (100%) rename dexmaker-mockito-tests/src/{main => androidTest}/java/com/android/dx/mockito/tests/BlacklistedApis.java (100%) rename dexmaker-mockito-tests/src/{main => androidTest}/java/com/android/dx/mockito/tests/CleanStackTrace.java (100%) rename dexmaker-mockito-tests/src/{main => androidTest}/java/com/android/dx/mockito/tests/GeneralMocking.java (100%) rename dexmaker-mockito-tests/src/{main => androidTest}/java/com/android/dx/mockito/tests/PartialClasses.java (100%) rename dexmaker-mockito-tests/src/{main => androidTest}/java/com/android/dx/mockito/tests/Stress.java (100%) diff --git a/dexmaker-mockito-inline-extended-tests/build.gradle b/dexmaker-mockito-inline-extended-tests/build.gradle index 4c4c3883..f77c080d 100644 --- a/dexmaker-mockito-inline-extended-tests/build.gradle +++ b/dexmaker-mockito-inline-extended-tests/build.gradle @@ -24,13 +24,11 @@ android { } dependencies { - implementation project(':dexmaker-mockito-inline-tests') - compileOnly project(':dexmaker-mockito-inline-extended') androidTestImplementation project(':dexmaker-mockito-inline-extended') - implementation 'junit:junit:4.13.2' - implementation 'androidx.test:runner:1.4.0' - implementation 'androidx.test:rules:1.4.0' + androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test:rules:1.4.0' - api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } + androidTestImplementation 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } } diff --git a/dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/EmptyActivity.java b/dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/EmptyActivity.java similarity index 100% rename from dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/EmptyActivity.java rename to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/EmptyActivity.java diff --git a/dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/MockInstanceUsingExtendedMockito.java b/dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/MockInstanceUsingExtendedMockito.java similarity index 100% rename from dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/MockInstanceUsingExtendedMockito.java rename to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/MockInstanceUsingExtendedMockito.java diff --git a/dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/MockStatic.java b/dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/MockStatic.java similarity index 100% rename from dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/MockStatic.java rename to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/MockStatic.java diff --git a/dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/SpyOn.java b/dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/SpyOn.java similarity index 100% rename from dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/SpyOn.java rename to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/SpyOn.java diff --git a/dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSession.java b/dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSession.java similarity index 100% rename from dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSession.java rename to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSession.java diff --git a/dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSessionVsMockitoJUnitRunner.java b/dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSessionVsMockitoJUnitRunner.java similarity index 100% rename from dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSessionVsMockitoJUnitRunner.java rename to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSessionVsMockitoJUnitRunner.java diff --git a/dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/Stress.java b/dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/Stress.java similarity index 100% rename from dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/Stress.java rename to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/Stress.java diff --git a/dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/VerifyStatic.java b/dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/VerifyStatic.java similarity index 100% rename from dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/VerifyStatic.java rename to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/VerifyStatic.java diff --git a/dexmaker-mockito-inline-tests/build.gradle b/dexmaker-mockito-inline-tests/build.gradle index a765a86a..7beaf710 100644 --- a/dexmaker-mockito-inline-tests/build.gradle +++ b/dexmaker-mockito-inline-tests/build.gradle @@ -26,11 +26,9 @@ android { } dependencies { - implementation project(':dexmaker-mockito-tests') - compileOnly project(':dexmaker-mockito-inline') androidTestImplementation project(':dexmaker-mockito-inline') - implementation 'junit:junit:4.13.2' - implementation 'androidx.test:runner:1.4.0' - api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } + androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } } diff --git a/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MemoryLeaks.java b/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MemoryLeaks.java similarity index 100% rename from dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MemoryLeaks.java rename to dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MemoryLeaks.java diff --git a/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MockFinal.java b/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MockFinal.java similarity index 100% rename from dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MockFinal.java rename to dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MockFinal.java diff --git a/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MockNonPublic.java b/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MockNonPublic.java similarity index 100% rename from dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MockNonPublic.java rename to dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MockNonPublic.java diff --git a/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java b/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java similarity index 100% rename from dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java rename to dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java diff --git a/dexmaker-mockito-tests/build.gradle b/dexmaker-mockito-tests/build.gradle index 925954b4..90d98f8d 100644 --- a/dexmaker-mockito-tests/build.gradle +++ b/dexmaker-mockito-tests/build.gradle @@ -20,10 +20,9 @@ android { } dependencies { - compileOnly project(':dexmaker-mockito') androidTestImplementation project(':dexmaker-mockito') - implementation 'androidx.test:runner:1.4.0' - implementation 'junit:junit:4.13.2' - api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } } diff --git a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/BlacklistedApis.java b/dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/BlacklistedApis.java similarity index 100% rename from dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/BlacklistedApis.java rename to dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/BlacklistedApis.java diff --git a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/CleanStackTrace.java b/dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/CleanStackTrace.java similarity index 100% rename from dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/CleanStackTrace.java rename to dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/CleanStackTrace.java diff --git a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/GeneralMocking.java b/dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/GeneralMocking.java similarity index 100% rename from dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/GeneralMocking.java rename to dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/GeneralMocking.java diff --git a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/PartialClasses.java b/dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/PartialClasses.java similarity index 100% rename from dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/PartialClasses.java rename to dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/PartialClasses.java diff --git a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java b/dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/Stress.java similarity index 100% rename from dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java rename to dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests/Stress.java