-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5439 from seadowg/hash-fix
Stop showing "Updated at" after redownloading identical media files
- Loading branch information
Showing
12 changed files
with
225 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
collect_app/src/test/java/org/odk/collect/android/formmanagement/FormMediaDownloaderTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| package org.odk.collect.android.formmanagement | ||
|
|
||
| import org.hamcrest.MatcherAssert.assertThat | ||
| import org.hamcrest.Matchers.equalTo | ||
| import org.junit.Test | ||
| import org.mockito.kotlin.doReturn | ||
| import org.mockito.kotlin.mock | ||
| import org.odk.collect.forms.FormSource | ||
| import org.odk.collect.forms.ManifestFile | ||
| import org.odk.collect.forms.MediaFile | ||
| import org.odk.collect.formstest.FormFixtures | ||
| import org.odk.collect.formstest.InMemFormsRepository | ||
| import org.odk.collect.shared.TempFiles | ||
| import org.odk.collect.shared.strings.Md5 | ||
| import java.io.File | ||
|
|
||
| class FormMediaDownloaderTest { | ||
|
|
||
| @Test | ||
| fun `returns false when there is an existing copy of a media file and an older one`() { | ||
| // Save forms | ||
| val formsRepository = InMemFormsRepository() | ||
| val form1 = FormFixtures.form( | ||
| version = "1", | ||
| date = 1, | ||
| mediaFiles = listOf(Pair("file", "old")) | ||
| ) | ||
| formsRepository.save(form1) | ||
|
|
||
| val form2 = FormFixtures.form( | ||
| version = "2", | ||
| date = 2, | ||
| mediaFiles = listOf(Pair("file", "existing")) | ||
| ) | ||
| formsRepository.save(form2) | ||
|
|
||
| // Set up same media file on server | ||
| val existingMediaFileHash = Md5.getMd5Hash(File(form2.formMediaPath, "file"))!! | ||
| val mediaFile = MediaFile("file", existingMediaFileHash, "downloadUrl") | ||
| val manifestFile = ManifestFile(null, listOf(mediaFile)) | ||
| val serverFormDetails = | ||
| ServerFormDetails(null, null, "formId", "3", null, false, true, manifestFile) | ||
| val formSource = mock<FormSource> { | ||
| on { fetchMediaFile(mediaFile.downloadUrl) } doReturn "existing".toByteArray() | ||
| .inputStream() | ||
| } | ||
|
|
||
| val formMediaDownloader = FormMediaDownloader(formsRepository, formSource) | ||
| val result = formMediaDownloader.download( | ||
| serverFormDetails, | ||
| File(TempFiles.createTempDir(), "temp").absolutePath, | ||
| TempFiles.createTempDir(), | ||
| mock() | ||
| ) | ||
|
|
||
| assertThat(result, equalTo(false)) | ||
| } | ||
|
|
||
| @Test | ||
| fun `returns false when there is an existing copy of a media file and an older one and server hash doesn't match existing copy`() { | ||
| // Save forms | ||
| val formsRepository = InMemFormsRepository() | ||
| val form1 = FormFixtures.form( | ||
| version = "1", | ||
| date = 1, | ||
| mediaFiles = listOf(Pair("file", "old")) | ||
| ) | ||
| formsRepository.save(form1) | ||
|
|
||
| val form2 = FormFixtures.form( | ||
| version = "2", | ||
| date = 2, | ||
| mediaFiles = listOf(Pair("file", "existing")) | ||
| ) | ||
| formsRepository.save(form2) | ||
|
|
||
| // Set up same media file on server | ||
| val mediaFile = MediaFile("file", "somethingElse", "downloadUrl") | ||
| val manifestFile = ManifestFile(null, listOf(mediaFile)) | ||
| val serverFormDetails = | ||
| ServerFormDetails(null, null, "formId", "3", null, false, true, manifestFile) | ||
| val formSource = mock<FormSource> { | ||
| on { fetchMediaFile(mediaFile.downloadUrl) } doReturn "existing".toByteArray() | ||
| .inputStream() | ||
| } | ||
|
|
||
| val formMediaDownloader = FormMediaDownloader(formsRepository, formSource) | ||
| val result = formMediaDownloader.download( | ||
| serverFormDetails, | ||
| File(TempFiles.createTempDir(), "temp").absolutePath, | ||
| TempFiles.createTempDir(), | ||
| mock() | ||
| ) | ||
|
|
||
| assertThat(result, equalTo(false)) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
formstest/src/main/java/org/odk/collect/formstest/FormFixtures.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package org.odk.collect.formstest | ||
|
|
||
| import org.odk.collect.forms.Form | ||
| import org.odk.collect.shared.TempFiles | ||
| import java.io.File | ||
|
|
||
| object FormFixtures { | ||
| fun form( | ||
| formId: String = "formId", | ||
| version: String = "1", | ||
| date: Long = 1, | ||
| mediaFiles: List<Pair<String, String>> = emptyList() | ||
| ): Form { | ||
| val formFilesPath = TempFiles.createTempDir().absolutePath | ||
| val mediaFilePath = TempFiles.createTempDir().absolutePath | ||
|
|
||
| mediaFiles.forEach { (name, contents) -> | ||
| File(mediaFilePath, name).also { it.writeBytes(contents.toByteArray()) } | ||
| } | ||
|
|
||
| return Form.Builder() | ||
| .displayName("Test Form") | ||
| .formId(formId) | ||
| .version(version) | ||
| .formFilePath(FormUtils.createFormFixtureFile(formId, version, formFilesPath)) | ||
| .formMediaPath(mediaFilePath) | ||
| .date(date) | ||
| .build() | ||
| } | ||
| } |
Oops, something went wrong.