For #3893 - Moving WebserverRule to support-test

mozilla-mobile · Aug 8, 2019 · cc3cdea · cc3cdea
1 parent c257ffb
commit cc3cdea
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/components/support/android-test/build.gradle b/components/support/android-test/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     implementation Dependencies.androidx_espresso_core
     implementation Dependencies.androidx_test_core
     implementation Dependencies.testing_leakcanary
+    implementation Dependencies.testing_mockwebserver
 }
 
 apply from: '../../../publish.gradle'

diff --git a/...nents/support/test/rules/WebserverRule.kt → ...pport/android/test/rules/WebserverRule.kt b/...nents/support/test/rules/WebserverRule.kt → ...pport/android/test/rules/WebserverRule.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.support.test.rules
+package mozilla.components.support.android.test.rules
 
 import android.os.Handler
 import android.os.Looper

diff --git a/components/support/test/build.gradle b/components/support/test/build.gradle
@@ -35,7 +35,6 @@ dependencies {
     implementation Dependencies.kotlin_coroutines
 
     implementation Dependencies.androidx_test_junit
-    implementation Dependencies.testing_mockwebserver
     implementation Dependencies.testing_mockito
     implementation (Dependencies.testing_robolectric) {
         exclude group: 'org.apache.maven'

diff --git a/samples/browser/build.gradle b/samples/browser/build.gradle
@@ -173,8 +173,6 @@ dependencies {
     implementation Dependencies.androidx_core_ktx
     implementation Dependencies.androidx_constraintlayout
 
-    testImplementation project(':support-test')
-
     androidTestImplementation project(':support-android-test')
     androidTestImplementation Dependencies.androidx_test_core
     androidTestImplementation Dependencies.androidx_test_runner

diff --git a/samples/browser/src/androidTest/java/org/mozilla/samples/browser/SmokeTests.kt b/samples/browser/src/androidTest/java/org/mozilla/samples/browser/SmokeTests.kt
@@ -20,7 +20,7 @@ import androidx.test.rule.ActivityTestRule
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiSelector
 import mozilla.components.support.android.test.leaks.LeakDetectionRule
-import mozilla.components.support.test.rules.WebserverRule
+import mozilla.components.support.android.test.rules.WebserverRule
 import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test