Merge pull request #209 from jselbo/testfix

Move test sources to androidTest so they are discoverable

Author: li-advait

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' }
 }

…inline/extended/tests/EmptyActivity.java …inline/extended/tests/EmptyActivity.javadexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/EmptyActivity.java renamed to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/EmptyActivity.java dexmaker-mockito-inline-extended-tests/src/main/java/com/android/dx/mockito/inline/extended/tests/EmptyActivity.java renamed to dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/EmptyActivity.java

@@ -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' }
 }