test fixes
This commit is contained in:
parent
8afeb38ab0
commit
629137249e
6 changed files with 42 additions and 21 deletions
|
@ -7,7 +7,7 @@ plugins {
|
|||
id 'com.google.dagger.hilt.android'
|
||||
|
||||
// Protobuf
|
||||
id 'com.google.protobuf' version '0.9.0'
|
||||
id 'com.google.protobuf' version '0.8.17'
|
||||
|
||||
// Firebase
|
||||
id 'com.google.gms.google-services'
|
||||
|
|
|
@ -25,7 +25,6 @@ class HomeScreenTest {
|
|||
|
||||
composeTestRule.setContent {
|
||||
HomeScreen(
|
||||
open = {},
|
||||
drawerActions = DrawerActions({}, {}, {}, {}, {}),
|
||||
navigationBarActions = NavigationBarActions({false}, {}, {}, {}, {}, {}, {}, {}),
|
||||
feedUiState = FeedUiState.Succes(mapOf(
|
||||
|
@ -39,7 +38,8 @@ class HomeScreenTest {
|
|||
)
|
||||
)),
|
||||
continueTask = {_, _ -> continueTask = true },
|
||||
onEmptyFeedHelp = {}
|
||||
onEmptyFeedHelp = {},
|
||||
onViewFriendsClick = {},
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -67,7 +67,6 @@ class HomeScreenTest {
|
|||
|
||||
composeTestRule.setContent {
|
||||
HomeScreen(
|
||||
open = {},
|
||||
drawerActions = DrawerActions(
|
||||
{homebuttontest = true},
|
||||
{timersbuttontest = true},
|
||||
|
@ -78,7 +77,8 @@ class HomeScreenTest {
|
|||
navigationBarActions = NavigationBarActions({false}, {}, {}, {}, {}, {}, {}, {}),
|
||||
feedUiState = FeedUiState.Succes(mapOf()),
|
||||
continueTask = {_, _ -> },
|
||||
onEmptyFeedHelp = {}
|
||||
onEmptyFeedHelp = {},
|
||||
onViewFriendsClick = {},
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -145,7 +145,6 @@ class HomeScreenTest {
|
|||
|
||||
composeTestRule.setContent {
|
||||
HomeScreen(
|
||||
open = {},
|
||||
drawerActions = DrawerActions({}, {}, {}, {}, {}),
|
||||
navigationBarActions = NavigationBarActions(
|
||||
{false},
|
||||
|
@ -157,7 +156,8 @@ class HomeScreenTest {
|
|||
),
|
||||
feedUiState = FeedUiState.Succes(mapOf()),
|
||||
continueTask = {_, _ -> },
|
||||
onEmptyFeedHelp = {}
|
||||
onEmptyFeedHelp = {},
|
||||
onViewFriendsClick = {},
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
package be.ugent.sel.studeez
|
||||
|
||||
import androidx.compose.ui.test.assert
|
||||
import androidx.compose.ui.test.junit4.createComposeRule
|
||||
import androidx.compose.ui.test.onNodeWithContentDescription
|
||||
import androidx.compose.ui.test.onNodeWithText
|
||||
import androidx.compose.ui.test.performClick
|
||||
import be.ugent.sel.studeez.screens.profile.EditProfileActions
|
||||
import be.ugent.sel.studeez.screens.profile.EditProfileScreen
|
||||
import be.ugent.sel.studeez.screens.profile.ProfileEditUiState
|
||||
import be.ugent.sel.studeez.screens.profile.edit_profile.EditProfileActions
|
||||
import be.ugent.sel.studeez.screens.profile.edit_profile.EditProfileScreen
|
||||
import be.ugent.sel.studeez.screens.profile.edit_profile.ProfileEditUiState
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
|
||||
|
@ -17,18 +18,19 @@ class ProfileEditScreenTest {
|
|||
@Test
|
||||
fun profileEditScreenTest() {
|
||||
var edit_save = false
|
||||
var edit_cancel = false
|
||||
var goback = false
|
||||
var delete_click = false
|
||||
|
||||
composeTestRule.setContent {
|
||||
EditProfileScreen(
|
||||
goBack = {goback = true},
|
||||
uiState = ProfileEditUiState(),
|
||||
editProfileActions = EditProfileActions(
|
||||
{},
|
||||
{edit_save = true},
|
||||
{edit_cancel = true}
|
||||
)
|
||||
onUserNameChange = {},
|
||||
onBiographyChange = {},
|
||||
onSaveClick = {edit_save = true},
|
||||
onDeleteClick = { delete_click = true },
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -61,8 +63,8 @@ class ProfileEditScreenTest {
|
|||
.assertExists()
|
||||
.performClick()
|
||||
|
||||
assert(edit_cancel)
|
||||
assert(edit_save)
|
||||
assert(goback)
|
||||
assert(delete_click)
|
||||
}
|
||||
}
|
|
@ -2,11 +2,13 @@ package be.ugent.sel.studeez
|
|||
|
||||
import androidx.compose.ui.test.junit4.createComposeRule
|
||||
import androidx.compose.ui.test.onNodeWithContentDescription
|
||||
import androidx.compose.ui.test.onNodeWithText
|
||||
import androidx.compose.ui.test.performClick
|
||||
import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
|
||||
import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
|
||||
import be.ugent.sel.studeez.screens.profile.ProfileActions
|
||||
import be.ugent.sel.studeez.screens.profile.ProfileScreen
|
||||
import kotlinx.coroutines.flow.flowOf
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
|
||||
|
@ -17,10 +19,17 @@ class ProfileScreenTest {
|
|||
@Test
|
||||
fun profileScreenTest() {
|
||||
var edit = false
|
||||
var view_friends = false
|
||||
|
||||
composeTestRule.setContent {
|
||||
ProfileScreen(
|
||||
profileActions = ProfileActions({null}, {edit = true}),
|
||||
profileActions = ProfileActions(
|
||||
getUsername = {null},
|
||||
onEditProfileClick = {edit = true},
|
||||
getBiography = {null},
|
||||
getAmountOfFriends = { flowOf(0) },
|
||||
onViewFriendsClick = {view_friends = true}
|
||||
),
|
||||
drawerActions = DrawerActions({}, {}, {}, {}, {}),
|
||||
navigationBarActions = NavigationBarActions({ false }, {}, {}, {}, {}, {}, {}, {})
|
||||
)
|
||||
|
@ -37,6 +46,16 @@ class ProfileScreenTest {
|
|||
.assertExists()
|
||||
.performClick()
|
||||
|
||||
composeTestRule
|
||||
.onNodeWithText(
|
||||
text = "friends",
|
||||
substring = true,
|
||||
ignoreCase = true,
|
||||
)
|
||||
.assertExists()
|
||||
.performClick()
|
||||
|
||||
assert(edit)
|
||||
assert(view_friends)
|
||||
}
|
||||
}
|
|
@ -9,13 +9,13 @@ buildscript {
|
|||
|
||||
dependencies {
|
||||
classpath 'com.google.gms:google-services:4.3.15'
|
||||
classpath 'com.android.tools.build:gradle:8.0.0'
|
||||
classpath 'com.android.tools.build:gradle:7.2.0'
|
||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
|
||||
}
|
||||
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
id 'com.android.application' version '8.0.0' apply false
|
||||
id 'com.android.library' version '8.0.0' apply false
|
||||
id 'com.android.application' version '7.4.2' apply false
|
||||
id 'com.android.library' version '7.4.2' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
|
||||
|
||||
// Hilt
|
||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
|||
#Sat Mar 25 16:03:50 CET 2023
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
|
Reference in a new issue