Skip to content
This repository has been archived by the owner on Jan 31, 2024. It is now read-only.

Refactor Auth + Going forward score part 2 #190

Merged
merged 51 commits into from
Apr 28, 2022
Merged

Refactor Auth + Going forward score part 2 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
a629349
update google signin auth
MaximeZmt Apr 19, 2022
8c1f5ac
Merge branch 'main' of github.com:MaximeZmt/SDP_2022-Vibester into main
MaximeZmt Apr 19, 2022
f264412
Merge branch 'main' into maximezmt/refactorauthp2
MaximeZmt Apr 24, 2022
2471a00
user profile improvement
MaximeZmt Apr 24, 2022
ef91af0
merged
MaximeZmt Apr 24, 2022
3ba66aa
test updates
MaximeZmt Apr 24, 2022
982f618
add persistance Setter
MaximeZmt Apr 24, 2022
704fb09
fixing test for idk numb of time
MaximeZmt Apr 25, 2022
a02c4bb
fixing test for idk numb of time 2
MaximeZmt Apr 25, 2022
4465122
adding hilt to a test
MaximeZmt Apr 25, 2022
a8e0bdf
fixing some other test
MaximeZmt Apr 25, 2022
42ef816
fixing some other test 2
MaximeZmt Apr 25, 2022
cea160e
adding hilt to a test 2
MaximeZmt Apr 25, 2022
fc4a990
removing hilt typing
MaximeZmt Apr 25, 2022
ee82439
dumb modif
MaximeZmt Apr 25, 2022
40277bd
removed hilt where it should not be
MaximeZmt Apr 25, 2022
e9a5c68
Merge branch 'main' into maximezmt/refactorauthp2
MaximeZmt Apr 25, 2022
de78a77
fix merging test error
MaximeZmt Apr 25, 2022
93fffce
small update
MaximeZmt Apr 26, 2022
c13377c
merged done
MaximeZmt Apr 26, 2022
9647fb1
patch profileActivityTest
MaximeZmt Apr 26, 2022
e57a324
patch profileActivityTest 2
MaximeZmt Apr 26, 2022
65e849e
patch profileActivityTest 3
MaximeZmt Apr 26, 2022
9f13f28
massive user update
MaximeZmt Apr 26, 2022
b8d646e
update tests
MaximeZmt Apr 27, 2022
c545546
some improvements
MaximeZmt Apr 27, 2022
e0dcb23
put scores update for typing game
MaximeZmt Apr 27, 2022
6c54d02
update search user welcome test
MaximeZmt Apr 27, 2022
ede24a3
refactor +add test + optimize imports
MaximeZmt Apr 27, 2022
06df4a8
update test
MaximeZmt Apr 27, 2022
75b8f0b
update test 2
MaximeZmt Apr 27, 2022
cea504f
try update
MaximeZmt Apr 27, 2022
82083fb
try update 2
MaximeZmt Apr 27, 2022
9b8d0d3
try update 3
MaximeZmt Apr 27, 2022
0fdd236
try update 666
MaximeZmt Apr 27, 2022
214c933
try update 666 2
MaximeZmt Apr 27, 2022
d498ddf
Update app/src/main/java/ch/sdp/vibester/activity/AuthenticationActiv…
MaximeZmt Apr 28, 2022
ffc2d11
Update app/src/main/java/ch/sdp/vibester/api/InternetState.kt
MaximeZmt Apr 28, 2022
d42d33a
Update app/src/main/java/ch/sdp/vibester/api/InternetState.kt
MaximeZmt Apr 28, 2022
56fbdd0
Update app/src/main/java/ch/sdp/vibester/activity/AuthenticationActiv…
MaximeZmt Apr 28, 2022
2864d98
Update app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
MaximeZmt Apr 28, 2022
4402f27
Update app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
MaximeZmt Apr 28, 2022
19d6206
Update app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
MaximeZmt Apr 28, 2022
3d3b967
Update app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
MaximeZmt Apr 28, 2022
74f41bd
review updated
MaximeZmt Apr 28, 2022
8f9b1fb
Merge branch 'maximezmt/refactorauthp2' of github.com:MaximeZmt/SDP_2…
MaximeZmt Apr 28, 2022
713f865
review updated 2
MaximeZmt Apr 28, 2022
e10f9c5
all issues addressed
MaximeZmt Apr 28, 2022
5b3c21f
some other issues addressed
MaximeZmt Apr 28, 2022
ec89e32
renable a TestMode
MaximeZmt Apr 28, 2022
8e559fc
renable a TestMode 2
MaximeZmt Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
View file
Open in desktop

This file was deleted.

11 changes: 10 additions & 1 deletion app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import ch.sdp.vibester.R
import ch.sdp.vibester.TestMode
import ch.sdp.vibester.auth.FireBaseAuthenticator
import com.google.android.gms.tasks.OnCompleteListener
import com.google.android.gms.tasks.Task
Expand Down Expand Up @@ -131,6 +132,13 @@ class AuthenticationActivityTest {
onView(withId(R.id.email)).check(matches(withText("Empty email or password")))
}

@Test
fun returnToMain() {
onView(withId(R.id.authentication_returnToMain)).perform(click())
Intents.intended(IntentMatchers.hasComponent(WelcomeActivity::class.java.name))
}


@Test
fun stringValidationWrongEmail() {
val username = "john"
Expand Down Expand Up @@ -179,6 +187,8 @@ class AuthenticationActivityTest {
val username = "[email protected]"
val password = "password"

TestMode.setTest()

val mockTask = createMockTask(true)
val mockUser = createMockUser(username)
every { mockAuthenticator.createAccount(username, password) } returns mockTask
Expand All @@ -187,7 +197,6 @@ class AuthenticationActivityTest {
onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
onView(withId(R.id.createAcc)).perform(click())

Intents.intended(IntentMatchers.hasComponent(CreateProfileActivity::class.java.name))
Intents.intended(IntentMatchers.hasExtra("email", username))

Expand Down
1 change: 1 addition & 0 deletions app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.ext.junit.rules.ActivityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import ch.sdp.vibester.R
import ch.sdp.vibester.TestMode
import org.junit.After
import org.junit.Before
import org.junit.Rule
Expand Down
4 changes: 0 additions & 4 deletions app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerSetupActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package ch.sdp.vibester.activity
import android.content.Context
import android.content.Intent
import android.widget.FrameLayout
import android.widget.LinearLayout
import androidx.test.core.app.ActivityScenario
import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.Espresso.onData
Expand All @@ -22,7 +19,6 @@ import ch.sdp.vibester.R
import org.hamcrest.Matchers
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Rule
import org.junit.Test
Expand Down
27 changes: 16 additions & 11 deletions app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import android.content.Intent
import androidx.test.core.app.ActivityScenario
import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions
import androidx.test.espresso.action.ViewActions.*
import androidx.test.espresso.intent.Intents
import androidx.test.espresso.intent.matcher.IntentMatchers
import androidx.test.espresso.matcher.ViewMatchers.* //change this import
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.runners.AndroidJUnit4
import ch.sdp.vibester.R
import ch.sdp.vibester.database.UsersRepo
import ch.sdp.vibester.TestMode
import ch.sdp.vibester.database.DataGetter
import ch.sdp.vibester.user.User
import dagger.hilt.android.testing.BindValue
import dagger.hilt.android.testing.HiltAndroidRule
Expand Down Expand Up @@ -38,16 +39,17 @@ class CreateProfileActivityTest {
}

@BindValue @JvmField
val mockUsersRepo = mockk<UsersRepo>()
val mockUsersRepo = mockk<DataGetter>()

private fun createMockInvocation(email: String) {
every {mockUsersRepo.createUser(any(), any(), any())} answers {
every {mockUsersRepo.createUser(any(), any(), any(), any())} answers {
lastArg<(String) -> Unit>().invoke(email)
}

every { mockUsersRepo.getUserData(any(), any()) } answers {
every { mockUsersRepo.getUserData(any()) } answers {
secondArg<(User) -> Unit>().invoke(User())
}

}

@After
Expand All @@ -57,24 +59,27 @@ class CreateProfileActivityTest {

@Test
fun createAccCorrect() {
TestMode.setTest()
kamilababayeva marked this conversation as resolved.
Show resolved Hide resolved
var username = "mockUsername"
var mockEmail = "[email protected]"

val intent = Intent(ApplicationProvider.getApplicationContext(), CreateProfileActivity::class.java)
intent.putExtra("email", mockEmail)
intent.putExtra("isUnitTest", true)

createMockInvocation(mockEmail)

val scn: ActivityScenario<CreateProfileActivity> = ActivityScenario.launch(intent)

onView(withId(R.id.accountUsername)).perform(ViewActions.typeText(username),
ViewActions.closeSoftKeyboard()
onView(withId(R.id.accountUsername)).perform(typeText(username),
closeSoftKeyboard()
)

onView(withId(R.id.createButton)).perform(ViewActions.click())
onView(withId(R.id.createButton)).perform(click())

Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
Intents.intended(IntentMatchers.hasExtra("email", mockEmail))
Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
Intents.intended(IntentMatchers.hasExtra("email", mockEmail))
Intents.intended(IntentMatchers.hasExtra("isUnitTest", true))
}

}
12 changes: 0 additions & 12 deletions app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
package ch.sdp.vibester.activity

import android.content.Intent
import android.view.View
import androidx.test.core.app.ActivityScenario
import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.*
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.intent.Intents
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.ext.junit.rules.ActivityScenarioRule
import ch.sdp.vibester.R
import org.junit.After
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import java.io.File

class DownloadActivityTest {

Expand Down
5 changes: 3 additions & 2 deletions app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.ext.junit.rules.ActivityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import ch.sdp.vibester.R
import ch.sdp.vibester.TestMode
import org.junit.After
import org.junit.Before
import org.junit.Rule
Expand All @@ -23,8 +24,7 @@ import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class)
class GameEndingActivityTest {

@Rule
@JvmField
@get:Rule
val activityRule = ActivityScenarioRule(GameEndingActivity::class.java)

@Before
Expand Down Expand Up @@ -71,6 +71,7 @@ class GameEndingActivityTest {
Intent(ApplicationProvider.getApplicationContext(), GameEndingActivity::class.java)
intent.putExtra("playerName", name)
intent.putExtra("nbIncorrectSong", nbInc)
intent.putExtra("Winner Name", "Testing the Placeholder")

intent.putStringArrayListExtra("str_arr_inc", incArray)
intent.putStringArrayListExtra("str_arr_name", statNames)
Expand Down
11 changes: 11 additions & 0 deletions app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import androidx.test.espresso.action.ViewActions.scrollTo
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.intent.Intents
import androidx.test.espresso.intent.Intents.intended
import androidx.test.espresso.intent.matcher.IntentMatchers
import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
import androidx.test.espresso.matcher.ViewMatchers.withId
Expand Down Expand Up @@ -52,6 +53,16 @@ class GameSetupActivityTest {
onView(withId(R.id.difficulty_spinner)).check(matches(withSpinnerText("Easy")))
}

@Test
fun checkReturnButton() {
onView(withId(R.id.local_buzzer_game_button)).perform(scrollTo(), click())
onView(withId(R.id.btsButton)).perform(click())
onView(withId(R.id.gameSetup_returnToMain)).perform(click())
onView(withId(R.id.gameSetup_returnToMain)).perform(click())
onView(withId(R.id.gameSetup_returnToMain)).perform(click())
Intents.intended(IntentMatchers.hasComponent(WelcomeActivity::class.java.name))
}

@Test
fun checkCustomSelectMedium() {
onView(withId(R.id.local_buzzer_game_button)).perform(scrollTo(), click())
Expand Down
6 changes: 5 additions & 1 deletion app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ import ch.sdp.vibester.R
import ch.sdp.vibester.api.LastfmMethod
import ch.sdp.vibester.helper.TypingGameManager
import org.hamcrest.CoreMatchers.not
import org.junit.*
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good change!

import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith

@RunWith(AndroidJUnit4::class)
class LyricsBelongGameActivityTest {

private val sleepTime: Long = 5000
private val songName = "Thunder"
private val artistName = "Imagine Dragons"
Expand Down
28 changes: 18 additions & 10 deletions app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.intent.Intents
import androidx.test.espresso.intent.matcher.IntentMatchers
import androidx.test.espresso.matcher.ViewMatchers.* //change this import
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.ext.junit.runners.AndroidJUnit4
import ch.sdp.vibester.R
import ch.sdp.vibester.database.UsersRepo
import ch.sdp.vibester.model.UserSharedPref
import ch.sdp.vibester.TestMode
import ch.sdp.vibester.database.DataGetter
import ch.sdp.vibester.user.User
import dagger.hilt.android.testing.BindValue
import dagger.hilt.android.testing.HiltAndroidRule
Expand Down Expand Up @@ -42,13 +43,15 @@ class ProfileActivityTest {
}

@BindValue @JvmField
val mockUsersRepo = mockk<UsersRepo>()
val mockUsersRepo = mockk<DataGetter>()

private fun createMockInvocation(mockUser: User) {
every { mockUsersRepo.getUserData(any(), any()) } answers {
secondArg<(User) -> Unit>().invoke(mockUser)
private fun createMockInvocation(mockProfile: User) {
every { mockUsersRepo.getUserData(any()) } answers {
secondArg<(User) -> Unit>().invoke(mockProfile)
}
every { mockUsersRepo.updateFieldString(any(), any(), any()) } answers {}

every { mockUsersRepo.getUserData(any())} answers {}
}

@After
Expand All @@ -61,9 +64,10 @@ class ProfileActivityTest {
val inputProfile = User("Lalisa Bon","bit.ly/3IUnyAF", "[email protected]", 12, 8, 29, 0)
val ctx = ApplicationProvider.getApplicationContext() as Context
val intent = Intent(ctx, ProfileActivity::class.java)
intent.putExtra("isUnitTest", true)
intent.putExtra("userTestProfile", inputProfile)

createMockInvocation(inputProfile)
UserSharedPref.setUser(ctx, inputProfile, false)
val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)

onView(withId(R.id.username)).check(matches(withText(inputProfile.username)))
Expand All @@ -76,6 +80,8 @@ class ProfileActivityTest {
fun clickBackToMain(){
val ctx = ApplicationProvider.getApplicationContext() as Context
val intent = Intent(ctx, ProfileActivity::class.java)
intent.putExtra("isUnitTest", true)

val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)

onView(withId(R.id.profile_returnToMain)).perform(click())
Expand All @@ -88,8 +94,9 @@ class ProfileActivityTest {
val inputProfile = User("Lalisa Bon","bit.ly/3IUnyAF", "[email protected]", 12, 8, 29, 0)
val ctx = ApplicationProvider.getApplicationContext() as Context
val intent = Intent(ctx, ProfileActivity::class.java)
intent.putExtra("isUnitTest", true)
intent.putExtra("userTestProfile", inputProfile)

UserSharedPref.setUser(ctx, inputProfile, false)
createMockInvocation(inputProfile)

val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
Expand All @@ -110,8 +117,9 @@ class ProfileActivityTest {
val inputProfile = User( "Lalisa Bon","bit.ly/3IUnyAF", "[email protected]", 12, 8, 29, 0)
val ctx = ApplicationProvider.getApplicationContext() as Context
val intent = Intent(ctx, ProfileActivity::class.java)
intent.putExtra("isUnitTest", true)
intent.putExtra("userTestProfile", inputProfile)

UserSharedPref.setUser(ctx, inputProfile, false)
createMockInvocation(inputProfile)

val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
Expand Down
3 changes: 2 additions & 1 deletion app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.contrib.RecyclerViewActions
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.ActivityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import ch.sdp.vibester.R
Expand Down
Loading