diff options
author | Allan Wang <me@allanwang.ca> | 2020-02-23 17:50:22 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-23 17:50:22 -0800 |
commit | 654cc6b943177120dc1a0a22a0d68d5cbfde2b5e (patch) | |
tree | 3bba2feb0cf99ae222693a4d564d9acf624322e2 /app/src/androidTest/kotlin/com/pitchedapps/frost/activities/ImageActivityTest.kt | |
parent | 4d5aaf541dbfa7d521ebbc5f011a642c83c4b9c5 (diff) | |
parent | 1686de0d71d687990ca6f0d4b621bc4d52dee146 (diff) | |
download | frost-654cc6b943177120dc1a0a22a0d68d5cbfde2b5e.tar.gz frost-654cc6b943177120dc1a0a22a0d68d5cbfde2b5e.tar.bz2 frost-654cc6b943177120dc1a0a22a0d68d5cbfde2b5e.zip |
Merge pull request #1647 from AllanWang/kpref
Remove stateful singletons
Diffstat (limited to 'app/src/androidTest/kotlin/com/pitchedapps/frost/activities/ImageActivityTest.kt')
-rw-r--r-- | app/src/androidTest/kotlin/com/pitchedapps/frost/activities/ImageActivityTest.kt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/src/androidTest/kotlin/com/pitchedapps/frost/activities/ImageActivityTest.kt b/app/src/androidTest/kotlin/com/pitchedapps/frost/activities/ImageActivityTest.kt index cd8aaa24..5f1735f5 100644 --- a/app/src/androidTest/kotlin/com/pitchedapps/frost/activities/ImageActivityTest.kt +++ b/app/src/androidTest/kotlin/com/pitchedapps/frost/activities/ImageActivityTest.kt @@ -19,6 +19,7 @@ package com.pitchedapps.frost.activities import android.content.Intent import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.rule.ActivityTestRule +import com.pitchedapps.frost.FrostTestRule import com.pitchedapps.frost.helper.getResource import com.pitchedapps.frost.utils.ARG_COOKIE import com.pitchedapps.frost.utils.ARG_IMAGE_URL @@ -39,17 +40,21 @@ import org.junit.After import org.junit.Before import org.junit.Rule import org.junit.Test +import org.junit.rules.RuleChain +import org.junit.rules.TestRule import org.junit.rules.Timeout import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) class ImageActivityTest { - @get:Rule val activity: ActivityTestRule<ImageActivity> = ActivityTestRule(ImageActivity::class.java, true, false) @get:Rule + val rule: TestRule = RuleChain.outerRule(FrostTestRule()).around(activity) + + @get:Rule val globalTimeout: Timeout = Timeout.seconds(15) private fun launchActivity(imageUrl: String, text: String? = null, cookie: String? = null) { @@ -124,7 +129,6 @@ class ImageActivityTest { fun invalidImageTest() { launchActivity(mockServer.url("text").toString()) mockServer.takeRequest() - activity.activity.isFinishing with(activity.activity) { assertEquals(1, mockServer.requestCount, "One http request expected") assertEquals( |