Skip to content

Don't copy existing media files when updating media only #6946

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

Merged
grzesiek2010 merged 19 commits into from
Dec 2, 2025
Merged

Don't copy existing media files when updating media only #6946

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f8996ca
Remove test replaced by FormDownloadActionTest
seadowg Oct 23, 2025
bf57e78
Remove unneeded open
seadowg Oct 23, 2025
b797772
Move ServerFormDetailsFetcher logic to use case
seadowg Oct 23, 2025
36560a9
Isolate authentication overriding to where its used
seadowg Oct 23, 2025
6ab2581
Convert ServerFormDetailsFetcher to interface
seadowg Oct 23, 2025
aaf058b
Only use interface for Java code
seadowg Oct 24, 2025
6e09b31
Separate out tests for ServerFormUseCases
seadowg Oct 24, 2025
98fd70d
Remove unused annotation
seadowg Oct 24, 2025
acb89bf
Add enum to replace booleans
seadowg Oct 24, 2025
f7de496
Convert boolean to proxies for type
seadowg Oct 24, 2025
a224e46
Remove isNotOnDevice
seadowg Oct 24, 2025
17cfc35
Replace isUpdated property with helper
seadowg Oct 24, 2025
ad16c3d
Change target for benchmark
seadowg Oct 27, 2025
d71bfcc
Optimize updating media
seadowg Oct 27, 2025
7643da9
Add clarifying comment
seadowg Oct 27, 2025
f9db6d5
Remove unneeded cache clear
seadowg Oct 27, 2025
73f7eb7
Remove unused variable
seadowg Nov 26, 2025
ee6de92
Fix comment
seadowg Nov 26, 2025
493711e
Update test names
seadowg Nov 26, 2025
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
Prev Previous commit
Update test names
  • Loading branch information
@seadowg
seadowg committed Dec 1, 2025
commit 493711ec804abf8ed54d1150e297acc44e866516
22 changes: 11 additions & 11 deletions ...est/java/org/odk/collect/android/formmanagement/FetchFormDetailsServerFormUseCasesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenFormDoesNotExist_isNotOnDevice() {
fun whenFormDoesNotExist_isNew() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITHOUT_MANIFEST))

val serverFormDetails = ServerFormUseCases.fetchFormDetails(formsRepository, formSource)
Expand All @@ -59,7 +59,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenAFormIsSoftDeleted_isNotOnDevice() {
fun whenAFormIsSoftDeleted_isNew() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITHOUT_MANIFEST))
formsRepository.save(
Form.Builder()
Expand All @@ -77,7 +77,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenAFormExists_andListContainsNewVersionWithDifferentHash_isUpdated() {
fun whenAFormExists_andListContainsNewVersionWithDifferentHash_isUpdatedVersion() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITHOUT_MANIFEST))
formsRepository.save(
Form.Builder()
Expand All @@ -93,7 +93,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenAFormExists_andListContainsSameVersionWithDifferentHash_isUpdated() {
fun whenAFormExists_andListContainsSameVersionWithDifferentHash_isUpdatedHash() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITHOUT_MANIFEST))
formsRepository.save(
Form.Builder()
Expand All @@ -110,7 +110,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenAFormExists_andHasNewMediaFileOnServer_isUpdated() {
fun whenAFormExists_andHasNewMediaFileOnServer_isUpdatedMedia() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITH_MANIFEST))
formsRepository.save(
Form.Builder()
Expand All @@ -128,7 +128,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenAFormExists_andHasUpdatedMediaFileOnServer_isUpdated() {
fun whenAFormExists_andHasUpdatedMediaFileOnServer_isUpdatedMedia() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITH_MANIFEST))

val mediaDir = TempFiles.createTempDir()
Expand All @@ -150,7 +150,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenAFormExists_andItsNewerVersionWithUpdatedMediaFilesHasBeenAlreadyDownloaded_isNotNewOrUpdated() {
fun whenAFormExists_andItsNewerVersionWithUpdatedMediaFilesHasBeenAlreadyDownloaded_isOnDevice() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITH_MANIFEST))

val mediaDir1 = TempFiles.createTempDir()
Expand Down Expand Up @@ -248,7 +248,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenAFormExists_andIsNotUpdatedOnServer_andDoesNotHaveAManifest_isNotNewOrUpdated() {
fun whenAFormExists_andIsNotUpdatedOnServer_andDoesNotHaveAManifest_isOnDevice() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITHOUT_MANIFEST))

formsRepository.save(
Expand All @@ -266,7 +266,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenFormExists_andMediaFilesExist_isNotNewOrUpdated() {
fun whenFormExists_andMediaFilesExist_isOnDevice() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITH_MANIFEST))

val mediaDir = TempFiles.createTempDir()
Expand All @@ -288,7 +288,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenAFormExists_andIsUpdatedOnServer_andDoesNotHaveNewMedia_isUpdated() {
fun whenAFormExists_andIsUpdatedOnServer_andDoesNotHaveNewMedia_isUpdatedVersion() {
whenever(formSource.fetchFormList()).thenReturn(listOf(FORM_WITH_MANIFEST))

val mediaDir = TempFiles.createTempDir()
Expand All @@ -309,7 +309,7 @@ class FetchFormDetailsServerFormUseCasesTest {
}

@Test
fun whenAFormExists_andItsNewerVersionWithManifestIsAvailableButHasNullHash_isNotNewOrUpdated() {
fun whenAFormExists_andItsNewerVersionWithManifestIsAvailableButHasNullHash_isOnDevice() {
whenever(formSource.fetchFormList()).thenReturn(
listOf(FORM_WITH_MANIFEST.copy(hash = null))
)
Expand Down