Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[New arch] [Modularization] Tests and cleanup #2728

Merged
merged 41 commits into from
Dec 4, 2019
Merged

[New arch] [Modularization] Tests and cleanup #2728

merged 41 commits into from
Dec 4, 2019

Conversation

davigonz
Copy link
Contributor

@davigonz davigonz changed the title [New arch] [Modularization] Tests and cleanup [New arch] [Modularization] Tests and cleanup [WIP Nov 18, 2019
@davigonz davigonz changed the title [New arch] [Modularization] Tests and cleanup [WIP [New arch] [Modularization] Tests and cleanup [WIP] Nov 18, 2019
@davigonz davigonz mentioned this pull request Nov 18, 2019
Merged
@davigonz davigonz changed the base branch from master to new_arch/modularization November 18, 2019 10:10
@jesmrec jesmrec mentioned this pull request Nov 18, 2019
Closed
23 tasks
@davigonz davigonz mentioned this pull request Nov 20, 2019
Closed
@davigonz davigonz mentioned this pull request Nov 28, 2019
Merged
@davigonz davigonz changed the title [New arch] [Modularization] Tests and cleanup [WIP] [New arch] [Modularization] Tests and cleanup Nov 28, 2019
abelgardep and others added 20 commits November 29, 2019 09:41
@abelgardep @davigonz
Polish FileDataStorageManager
41cf7b2
@abelgardep @davigonz
Remove already implemented functions in usecases from FileDataStorage…
2cae8de 
…Manager
@abelgardep @davigonz
Keep polishing FileDataStorageManager
26cfd47
@davigonz
Data module: unit tests
b94ac18
@davigonz
Data module: instrumented tests
4a9263b
@davigonz
Domain module tests
b5553b1
@abelgardep @davigonz
Create test utils module
49e54de
@abelgardep @davigonz
Add new tests to OCCapabilityRepository
dee911a
@davigonz
App module tests, restructure
d48fbdc
@davigonz
Include viewmodels
743f84b
@abelgardep @davigonz
Add new tests to OCCapabilityDaoTest
ecb6bff
@davigonz
Include some utils for viewmodel tests
42928da
@abelgardep @davigonz
Move business logic from repository to usecase and test it
da72dc2
@abelgardep @davigonz
Fix OCCapabilityTest
48794ee
@abelgardep @davigonz
Fix and add tests to GetStoredCapabilities
df811a2
@davigonz
Fix SearchShareesFragmentTest tests and use variables in build.gradle…
569c81b 
… files
@davigonz
Adapt PublicShareCreationDialogFragmentTest tests
c3a3e63
@davigonz
Keep adapting UI tests to modularization
01fbe7c
@davigonz
Complete fragment and provider tests
7065a96
@davigonz
Fix some error tests
baa0592
@davigonz davigonz force-pushed the new_arch/modularization_tests_cleanup branch from 4d2e43b to 60a87d0 Compare November 29, 2019 08:43
@davigonz davigonz mentioned this pull request Nov 29, 2019
Closed
jcmontesmartos
jcmontesmartos reviewed Dec 3, 2019
View reviewed changes
...pp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt Outdated
)
)

onView(withText("Sheldon")).check(matches(isDisplayed()))
Copy link

Choose a reason for hiding this comment

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

you can use just once onView(withText("Sheldon")) if you do it

onView(withText("Sheldon"))
.check(matches(isDisplayed()))
.check(matches(hasSibling(withId(R.id.unshareButton))))
...

Copy link

Choose a reason for hiding this comment

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

by the way, I think this is text is not good because you are repeating onView(withText("Sheldon")).check(matches(isDisplayed())) several times.

check out https://developer.android.com/training/testing/espresso/recipes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

...pp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt Outdated
)
)

onView(withText("Friends (group)")).check(matches(isDisplayed()))
Copy link

Choose a reason for hiding this comment

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

the same as before

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

...roidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareEditionDialogFragmentTest.kt Outdated
val calendar = GregorianCalendar()
calendar.timeInMillis = expirationDate

val formatter: DateFormat = SimpleDateFormat("MMM dd, yyyy")
Copy link

Choose a reason for hiding this comment

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

just curious, are you using this format for Spanish users??

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, we use dd mm yyyy for Spanish users

Copy link

Choose a reason for hiding this comment

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

Then, running a device in Spanish, it will fail

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

...loudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt Outdated
)
private var userSharesList = listOf(
OC_SHARE.copy(sharedWithDisplayName = "Batman"),
OC_SHARE.copy(sharedWithDisplayName = "Jocker")
Copy link

Choose a reason for hiding this comment

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

Typo: Joker 😉

Copy link
Contributor Author

Choose a reason for hiding this comment

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

giphy

...loudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt Show resolved Hide resolved
owncloudApp/src/androidTest/java/com/owncloud/android/utils/AppTestUtil.kt Show resolved Hide resolved
...main/java/com/owncloud/android/presentation/ui/sharing/fragments/EditPrivateShareFragment.kt Show resolved Hide resolved
...ain/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt Outdated Show resolved Hide resolved
...pp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt Outdated Show resolved Hide resolved
...main/java/com/owncloud/android/presentation/viewmodels/capabilities/OCCapabilityViewModel.kt Outdated Show resolved Hide resolved
jcmontesmartos
jcmontesmartos reviewed Dec 4, 2019
View reviewed changes
...roidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareEditionDialogFragmentTest.kt Outdated
val calendar = GregorianCalendar()
calendar.timeInMillis = expirationDate

val formatter: DateFormat = SimpleDateFormat("MMM dd, yyyy")
Copy link

Choose a reason for hiding this comment

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

Then, running a device in Spanish, it will fail

owncloudTestUtil/build.gradle Outdated
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':owncloudDomain')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
implementation "androidx.lifecycle:lifecycle-livedata:2.0.0"
Copy link

Choose a reason for hiding this comment

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

you should use the global livedata version

Copy link
Contributor Author

@davigonz davigonz Dec 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

We tried it with 2.1.0 but it triggered a mess of dependencies. Anyway, I've moved 2.0.0 version to the root build.gradle file

owncloudTestUtil/build.gradle Outdated Show resolved Hide resolved
owncloudTestUtil/src/main/java/com/owncloud/android/testutil/livedata/LiveDataUtils.kt Show resolved Hide resolved
owncloudData/src/androidTest/java/com/owncloud/android/data/MigrationTest.kt Outdated Show resolved Hide resolved
...p/src/test/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModelTest.kt Outdated Show resolved Hide resolved
...p/src/test/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModelTest.kt Outdated Show resolved Hide resolved
...p/src/test/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModelTest.kt Outdated Show resolved Hide resolved
...pp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt Outdated Show resolved Hide resolved
...loudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/TestShareFileActivity.kt
import com.owncloud.android.presentation.ui.sharing.fragments.ShareFragmentListener
import com.owncloud.android.testing.SingleFragmentActivity

class TestShareFileActivity : SingleFragmentActivity(), ShareFragmentListener {
Copy link

Choose a reason for hiding this comment

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

I don't find my previous comment. If you had a dependency with an activity, it would be great to have an interface ActivityProvider and be able to mock it. But now it is done in that way hehe

@davigonz davigonz force-pushed the new_arch/modularization_tests_cleanup branch from dbc9e18 to 1e9168f Compare December 4, 2019 09:46
@davigonz davigonz merged commit a804306 into new_arch/modularization Dec 4, 2019
@delete-merged-branch delete-merged-branch bot deleted the new_arch/modularization_tests_cleanup branch December 4, 2019 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jcmontesmartos jcmontesmartos jcmontesmartos approved these changes

Assignees

@davigonz davigonz

@abelgardep abelgardep

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@davigonz @jcmontesmartos @abelgardep