From b939db91e0501dbb1115ef82e64294c0a2063796 Mon Sep 17 00:00:00 2001 From: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com> Date: Mon, 5 Apr 2021 14:00:36 +0530 Subject: [PATCH] Update Tests for Profile Activity (#4324) --- .../profile/ProfileActivityStartYourself.kt | 34 ------------------- .../commons/profile/ProfileActivityTest.kt | 22 ++++++------ 2 files changed, 11 insertions(+), 45 deletions(-) delete mode 100644 app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityStartYourself.kt diff --git a/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityStartYourself.kt b/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityStartYourself.kt deleted file mode 100644 index d6fac2078..000000000 --- a/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityStartYourself.kt +++ /dev/null @@ -1,34 +0,0 @@ -package fr.free.nrw.commons.profile - -import android.content.Context -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.Mock -import org.mockito.MockitoAnnotations -import org.powermock.api.mockito.PowerMockito -import org.powermock.core.classloader.annotations.PrepareForTest -import org.powermock.modules.junit4.PowerMockRunner - -@RunWith(PowerMockRunner::class) -@PrepareForTest( - ProfileActivity::class -) -class ProfileActivityStartYourself { - - @Mock - private lateinit var context: Context - - @Before - fun setUp() { - MockitoAnnotations.initMocks(this) - } - - @Test - @Throws(Exception::class) - fun testStartYourself() { - PowerMockito.mockStatic(ProfileActivity::class.java) - ProfileActivity.startYourself(context) - - } -} \ No newline at end of file diff --git a/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityTest.kt index 20724906e..1fe0d969e 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityTest.kt @@ -6,12 +6,9 @@ import org.junit.Assert import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mockito.Mock -import org.mockito.MockitoAnnotations -import org.powermock.api.mockito.PowerMockito.mockStatic +import org.powermock.api.mockito.PowerMockito import org.robolectric.Robolectric import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -20,17 +17,14 @@ import org.robolectric.annotation.Config class ProfileActivityTest { private lateinit var activity: ProfileActivity - - @Mock - private lateinit var context: Context + private lateinit var profileActivity: ProfileActivity + private lateinit var mockContext: Context @Before fun setUp() { - MockitoAnnotations.initMocks(this) - activity = Robolectric.buildActivity(ProfileActivity::class.java).create().get() - - context = RuntimeEnvironment.application.applicationContext + mockContext = PowerMockito.mock(Context::class.java) + profileActivity = PowerMockito.mock(ProfileActivity::class.java) } @Test @@ -45,4 +39,10 @@ class ProfileActivityTest { activity.onDestroy() } + @Test + @Throws(Exception::class) + fun testStartYourself() { + ProfileActivity.startYourself(mockContext) + } + } \ No newline at end of file