From 45efaf0b86ef363f942c291f304f5734c36d16cc Mon Sep 17 00:00:00 2001 From: Elena Moshnikova Date: Fri, 9 Dec 2022 12:44:55 +0300 Subject: [PATCH] Revert "Revert "#2385 BE: remove field audioFileUrl from Resource entity (#2400)" (#2415)" This reverts commit 0c4fdd38174a94ff8a201a02d6da9d5911a36eee. --- .../epam/brn/dto/response/ResourceResponse.kt | 1 - .../kotlin/com/epam/brn/model/Resource.kt | 12 ++----- .../com/epam/brn/repo/ResourceRepository.kt | 4 --- .../com/epam/brn/service/ResourceService.kt | 6 ---- .../LopotkoRecordProcessor.kt | 14 ++------- .../SeriesMatrixRecordProcessor.kt | 1 - .../SeriesPhrasesRecordProcessor.kt | 1 - .../seriesWords/SeriesWordsRecordProcessor.kt | 1 - .../SeriesWordsKorolevaRecordProcessor.kt | 1 - .../db/migration/V220221129_2385.sql | 8 +++++ .../brn/integration/ResourceControllerIT.kt | 2 +- src/test/kotlin/com/epam/brn/repo/BaseTest.kt | 6 ++-- .../epam/brn/service/ResourceServiceTest.kt | 31 ------------------- .../LopotkoRecordProcessorTest.kt | 9 +----- .../SeriesMatrixRecordProcessorTest.kt | 6 ---- .../SeriesWordsRecordProcessorTest.kt | 6 ---- .../SeriesWordsKorolevaRecordProcessorTest.kt | 6 ---- 17 files changed, 18 insertions(+), 97 deletions(-) create mode 100644 src/main/resources/db/migration/V220221129_2385.sql diff --git a/src/main/kotlin/com/epam/brn/dto/response/ResourceResponse.kt b/src/main/kotlin/com/epam/brn/dto/response/ResourceResponse.kt index d261149d7..941c5de92 100644 --- a/src/main/kotlin/com/epam/brn/dto/response/ResourceResponse.kt +++ b/src/main/kotlin/com/epam/brn/dto/response/ResourceResponse.kt @@ -4,7 +4,6 @@ import com.epam.brn.enums.WordType data class ResourceResponse( var id: Long? = null, - var audioFileUrl: String? = "", val word: String? = "", val wordPronounce: String? = "", val wordType: WordType?, diff --git a/src/main/kotlin/com/epam/brn/model/Resource.kt b/src/main/kotlin/com/epam/brn/model/Resource.kt index 1bc44a8a8..8e3938d08 100644 --- a/src/main/kotlin/com/epam/brn/model/Resource.kt +++ b/src/main/kotlin/com/epam/brn/model/Resource.kt @@ -15,10 +15,9 @@ import javax.persistence.UniqueConstraint @Entity @Table( - uniqueConstraints = [UniqueConstraint(columnNames = ["word", "audioFileUrl", "wordType"])], + uniqueConstraints = [UniqueConstraint(columnNames = ["word", "wordType"])], indexes = [ - Index(name = "word_audio_file_idx", columnList = "word, audioFileUrl, wordType"), - Index(name = "audio_file_idx", columnList = "audioFileUrl") + Index(name = "word_idx", columnList = "word, wordType") ] ) data class Resource( @@ -26,8 +25,6 @@ data class Resource( @GeneratedValue(strategy = GenerationType.IDENTITY) var id: Long? = null, @Column(nullable = false) - var audioFileUrl: String? = "", - @Column(nullable = false) var word: String = "", var wordType: String = "", var locale: String = "", @@ -39,7 +36,6 @@ data class Resource( ) { fun toResponse() = ResourceResponse( id = id, - audioFileUrl = audioFileUrl, word = word.replace("+", ""), wordPronounce = word, pictureFileUrl = pictureFileUrl, @@ -48,7 +44,7 @@ data class Resource( description = description ) - override fun toString() = "Resource(id=$id, audioFileUrl='$audioFileUrl', word='$word'," + + override fun toString() = "Resource(id=$id, word='$word'," + " pictureFileUrl='$pictureFileUrl', soundsCount=$soundsCount), description='$description'" override fun equals(other: Any?): Boolean { @@ -58,7 +54,6 @@ data class Resource( other as Resource if (id != other.id) return false - if (audioFileUrl != other.audioFileUrl) return false if (word != other.word) return false if (wordType != other.wordType) return false if (pictureFileUrl != other.pictureFileUrl) return false @@ -70,7 +65,6 @@ data class Resource( override fun hashCode(): Int { var result = id?.hashCode() ?: 0 - result = 31 * result + (audioFileUrl?.hashCode() ?: 0) result = 31 * result + (word.hashCode()) result = 31 * result + wordType.hashCode() result = 31 * result + (pictureFileUrl?.hashCode() ?: 0) diff --git a/src/main/kotlin/com/epam/brn/repo/ResourceRepository.kt b/src/main/kotlin/com/epam/brn/repo/ResourceRepository.kt index 3bbf1de10..2768f7525 100644 --- a/src/main/kotlin/com/epam/brn/repo/ResourceRepository.kt +++ b/src/main/kotlin/com/epam/brn/repo/ResourceRepository.kt @@ -16,9 +16,5 @@ interface ResourceRepository : CrudRepository { fun findFirstByWordAndWordType(word: String, wordType: String): Optional - fun findFirstByWordAndAudioFileUrlLike(word: String, audioFileUrl: String): Optional - - fun findFirstByWordAndWordTypeAndAudioFileUrlLike(word: String, wordType: String, audioFileUrl: String): Optional - fun findFirstByWordAndLocaleAndWordType(word: String, locale: String, wordType: String): Optional } diff --git a/src/main/kotlin/com/epam/brn/service/ResourceService.kt b/src/main/kotlin/com/epam/brn/service/ResourceService.kt index f4d907a17..2b5e8c7f8 100644 --- a/src/main/kotlin/com/epam/brn/service/ResourceService.kt +++ b/src/main/kotlin/com/epam/brn/service/ResourceService.kt @@ -19,12 +19,6 @@ class ResourceService(private val resourceRepository: ResourceRepository) { return if (resources.isNotEmpty()) resources.first() else null } - fun findFirstByWordAndAudioFileUrlLike(word: String, audioFileName: String): Resource? { - return resourceRepository - .findFirstByWordAndAudioFileUrlLike(word, audioFileName) - .orElse(null) - } - fun save(resource: Resource): Resource = resourceRepository.save(resource) fun updateDescription(id: Long, description: String): ResourceResponse { diff --git a/src/main/kotlin/com/epam/brn/upload/csv/audiometrySpeech/LopotkoRecordProcessor.kt b/src/main/kotlin/com/epam/brn/upload/csv/audiometrySpeech/LopotkoRecordProcessor.kt index 5df8e0de9..e7bbec63f 100644 --- a/src/main/kotlin/com/epam/brn/upload/csv/audiometrySpeech/LopotkoRecordProcessor.kt +++ b/src/main/kotlin/com/epam/brn/upload/csv/audiometrySpeech/LopotkoRecordProcessor.kt @@ -1,6 +1,5 @@ package com.epam.brn.upload.csv.audiometrySpeech -import com.epam.brn.dto.AudioFileMetaData import com.epam.brn.enums.AudiometryType import com.epam.brn.enums.BrnLocale import com.epam.brn.model.AudiometryTask @@ -62,20 +61,11 @@ class LopotkoRecordProcessor( val hashWord = DigestUtils.md5Hex(word) mapHashWord[word] = hashWord val wordType = WordType.AUDIOMETRY_WORD.toString() - val audioFileUrl = - wordsService.getSubFilePathForWord( - AudioFileMetaData( - word, - locale.locale, - wordsService.getDefaultManVoiceForLocale(locale.locale) - ) - ) - val resource = resourceRepository.findFirstByWordAndWordTypeAndAudioFileUrlLike(word, wordType, audioFileUrl) + val resource = resourceRepository.findFirstByWordAndWordType(word, wordType) .orElse( Resource( word = word, - audioFileUrl = audioFileUrl, - locale = locale.locale, + locale = locale.locale ) ) resource.wordType = wordType diff --git a/src/main/kotlin/com/epam/brn/upload/csv/seriesMatrix/SeriesMatrixRecordProcessor.kt b/src/main/kotlin/com/epam/brn/upload/csv/seriesMatrix/SeriesMatrixRecordProcessor.kt index fcf2d6c33..332286dfb 100644 --- a/src/main/kotlin/com/epam/brn/upload/csv/seriesMatrix/SeriesMatrixRecordProcessor.kt +++ b/src/main/kotlin/com/epam/brn/upload/csv/seriesMatrix/SeriesMatrixRecordProcessor.kt @@ -92,7 +92,6 @@ class SeriesMatrixRecordProcessor( locale = locale.locale ) ) - resource.audioFileUrl = audioPath resource.wordType = wordType.name return resource } diff --git a/src/main/kotlin/com/epam/brn/upload/csv/seriesPhrases/SeriesPhrasesRecordProcessor.kt b/src/main/kotlin/com/epam/brn/upload/csv/seriesPhrases/SeriesPhrasesRecordProcessor.kt index 95c81e5e0..350da3416 100644 --- a/src/main/kotlin/com/epam/brn/upload/csv/seriesPhrases/SeriesPhrasesRecordProcessor.kt +++ b/src/main/kotlin/com/epam/brn/upload/csv/seriesPhrases/SeriesPhrasesRecordProcessor.kt @@ -90,7 +90,6 @@ class SeriesPhrasesRecordProcessor( pictureFileUrl = pictureDefaultPath ) ) - resource.audioFileUrl = audioPath resource.wordType = wordType return resource } diff --git a/src/main/kotlin/com/epam/brn/upload/csv/seriesWords/SeriesWordsRecordProcessor.kt b/src/main/kotlin/com/epam/brn/upload/csv/seriesWords/SeriesWordsRecordProcessor.kt index 0a93c2e58..97dccd966 100644 --- a/src/main/kotlin/com/epam/brn/upload/csv/seriesWords/SeriesWordsRecordProcessor.kt +++ b/src/main/kotlin/com/epam/brn/upload/csv/seriesWords/SeriesWordsRecordProcessor.kt @@ -82,7 +82,6 @@ class SeriesWordsRecordProcessor( locale = locale.locale, ) ) - resource.audioFileUrl = audioPath resource.wordType = WordType.OBJECT.toString() return resource } diff --git a/src/main/kotlin/com/epam/brn/upload/csv/seriesWordsKoroleva/SeriesWordsKorolevaRecordProcessor.kt b/src/main/kotlin/com/epam/brn/upload/csv/seriesWordsKoroleva/SeriesWordsKorolevaRecordProcessor.kt index 44dc9cdbe..9fa1222d3 100644 --- a/src/main/kotlin/com/epam/brn/upload/csv/seriesWordsKoroleva/SeriesWordsKorolevaRecordProcessor.kt +++ b/src/main/kotlin/com/epam/brn/upload/csv/seriesWordsKoroleva/SeriesWordsKorolevaRecordProcessor.kt @@ -76,7 +76,6 @@ class SeriesWordsKorolevaRecordProcessor( locale = locale.locale, ) ) - resource.audioFileUrl = audioPath resource.wordType = WordType.OBJECT.toString() return resource } diff --git a/src/main/resources/db/migration/V220221129_2385.sql b/src/main/resources/db/migration/V220221129_2385.sql new file mode 100644 index 000000000..da7b99788 --- /dev/null +++ b/src/main/resources/db/migration/V220221129_2385.sql @@ -0,0 +1,8 @@ +DROP INDEX audio_file_idx; +DROP INDEX word_audio_file_idx; +CREATE INDEX word_idx on resource (word, word_type); + +ALTER TABLE resource DROP CONSTRAINT resource_constrain; +ALTER TABLE resource ADD CONSTRAINT resource_constrain unique (word, word_type); + +ALTER TABLE resource DROP COLUMN audio_file_url; \ No newline at end of file diff --git a/src/test/kotlin/com/epam/brn/integration/ResourceControllerIT.kt b/src/test/kotlin/com/epam/brn/integration/ResourceControllerIT.kt index ed7854e16..b6dc98bf2 100644 --- a/src/test/kotlin/com/epam/brn/integration/ResourceControllerIT.kt +++ b/src/test/kotlin/com/epam/brn/integration/ResourceControllerIT.kt @@ -28,7 +28,7 @@ class ResourceControllerIT : BaseIT() { @Test fun `should update resource description successfully`() { // GIVEN - val resource = resourceRepository.save(Resource(description = "description", wordType = "OBJECT")) + val resource = resourceRepository.save(Resource(description = "description", wordType = "OBJECT", word = "word")) val descriptionForUpdate = "new description" val requestJson = objectMapper.writeValueAsString(UpdateResourceDescriptionRequest(descriptionForUpdate)) diff --git a/src/test/kotlin/com/epam/brn/repo/BaseTest.kt b/src/test/kotlin/com/epam/brn/repo/BaseTest.kt index ed77a7cc0..35aafdff8 100644 --- a/src/test/kotlin/com/epam/brn/repo/BaseTest.kt +++ b/src/test/kotlin/com/epam/brn/repo/BaseTest.kt @@ -50,11 +50,11 @@ abstract class BaseTest { subGroup1.exercises.addAll(listOf(exercise1, exercise2)) val firstResource = - Resource(audioFileUrl = "audio_f", word = listOfWords[0], pictureFileUrl = "picture_f", soundsCount = 0) + Resource(word = listOfWords[0], pictureFileUrl = "picture_f", soundsCount = 0) val secondResource = - Resource(audioFileUrl = "audio_s", word = listOfWords[1], pictureFileUrl = "picture_s", soundsCount = 0) + Resource(word = listOfWords[1], pictureFileUrl = "picture_s", soundsCount = 0) val thirdResource = - Resource(audioFileUrl = "audio_t", word = listOfWords[2], pictureFileUrl = "picture_t", soundsCount = 0) + Resource(word = listOfWords[2], pictureFileUrl = "picture_t", soundsCount = 0) resourceRepository.saveAll(listOf(firstResource, secondResource, thirdResource)) diff --git a/src/test/kotlin/com/epam/brn/service/ResourceServiceTest.kt b/src/test/kotlin/com/epam/brn/service/ResourceServiceTest.kt index 71cdb0835..ce435e4fd 100644 --- a/src/test/kotlin/com/epam/brn/service/ResourceServiceTest.kt +++ b/src/test/kotlin/com/epam/brn/service/ResourceServiceTest.kt @@ -14,7 +14,6 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import org.junit.jupiter.api.extension.ExtendWith import org.springframework.data.repository.findByIdOrNull -import java.util.Optional @ExtendWith(MockKExtension::class) internal class ResourceServiceTest { @@ -57,36 +56,6 @@ internal class ResourceServiceTest { foundFirstResource shouldBe null } - @Test - fun `should return resource by word and audio file url`() { - // GIVEN - val word = "word" - val audioFileName = "audioFileName" - every { resourceRepositoryMock.findFirstByWordAndAudioFileUrlLike(word, audioFileName) } returns Optional.of( - resourceMock - ) - - // WHEN - val foundResource = resourceService.findFirstByWordAndAudioFileUrlLike(word, audioFileName) - - // THEN - foundResource shouldBe resourceMock - } - - @Test - fun `should return null if word and audio file url is not found`() { - // GIVEN - val word = "word" - val audioFileName = "audioFileName" - every { resourceRepositoryMock.findFirstByWordAndAudioFileUrlLike(word, audioFileName) } returns Optional.empty() - - // WHEN - val foundResource = resourceService.findFirstByWordAndAudioFileUrlLike(word, audioFileName) - - // THEN - foundResource shouldBe null - } - @Test fun `should save resource`() { // GIVEN diff --git a/src/test/kotlin/com/epam/brn/upload/csv/audiometrySpeech/LopotkoRecordProcessorTest.kt b/src/test/kotlin/com/epam/brn/upload/csv/audiometrySpeech/LopotkoRecordProcessorTest.kt index 4f0994218..e18c05ea6 100644 --- a/src/test/kotlin/com/epam/brn/upload/csv/audiometrySpeech/LopotkoRecordProcessorTest.kt +++ b/src/test/kotlin/com/epam/brn/upload/csv/audiometrySpeech/LopotkoRecordProcessorTest.kt @@ -82,8 +82,7 @@ internal class LopotkoRecordProcessorTest { ) } returns audiometry every { - resourceRepositoryMock.findFirstByWordAndWordTypeAndAudioFileUrlLike( - ofType(String::class), + resourceRepositoryMock.findFirstByWordAndWordType( ofType(String::class), ofType(String::class) ) @@ -144,7 +143,6 @@ internal class LopotkoRecordProcessorTest { return Resource( word = "бал", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/audio/filipp/518d3c4523afcd59e2feae1093870f5f.ogg", pictureFileUrl = "pictures/бал.jpg" ) } @@ -153,7 +151,6 @@ internal class LopotkoRecordProcessorTest { return Resource( word = "бум", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/audio/filipp/8e3cba18a3a6a3aa51e160a3d1e1ebcc.ogg", pictureFileUrl = "pictures/бум.jpg" ) } @@ -162,7 +159,6 @@ internal class LopotkoRecordProcessorTest { return Resource( word = "быль", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/audio/filipp/4df3cdbbe2abf27f91f673032c95141e.ogg", pictureFileUrl = "pictures/быль.jpg" ) } @@ -171,7 +167,6 @@ internal class LopotkoRecordProcessorTest { return Resource( word = "вить", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/audio/filipp/77ebaea90791bb15d4f758191aae5930.ogg", pictureFileUrl = "pictures/вить.jpg" ) } @@ -180,7 +175,6 @@ internal class LopotkoRecordProcessorTest { return Resource( word = "гад", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/audio/filipp/2e0b56e224fe469866e1aaa81caaafcc.ogg", pictureFileUrl = "pictures/гад.jpg" ) } @@ -189,7 +183,6 @@ internal class LopotkoRecordProcessorTest { return Resource( word = "дуб", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/audio/filipp/494d676049e14da7fd3a9182955287ab.ogg", pictureFileUrl = "pictures/дуб.jpg" ) } diff --git a/src/test/kotlin/com/epam/brn/upload/csv/seriesMatrix/SeriesMatrixRecordProcessorTest.kt b/src/test/kotlin/com/epam/brn/upload/csv/seriesMatrix/SeriesMatrixRecordProcessorTest.kt index 00c4db622..fc27bb380 100644 --- a/src/test/kotlin/com/epam/brn/upload/csv/seriesMatrix/SeriesMatrixRecordProcessorTest.kt +++ b/src/test/kotlin/com/epam/brn/upload/csv/seriesMatrix/SeriesMatrixRecordProcessorTest.kt @@ -217,7 +217,6 @@ internal class SeriesMatrixRecordProcessorTest { return Resource( word = "девочка", wordType = WordType.OBJECT.toString(), - audioFileUrl = "audio/ogg/filipp/девочка.ogg", pictureFileUrl = "pictures/withWord/девочка.jpg" ) } @@ -226,7 +225,6 @@ internal class SeriesMatrixRecordProcessorTest { return Resource( word = "бабушка", wordType = WordType.OBJECT.toString(), - audioFileUrl = "audio/ogg/filipp/бабушка.ogg", pictureFileUrl = "pictures/withWord/бабушка.jpg" ) } @@ -235,7 +233,6 @@ internal class SeriesMatrixRecordProcessorTest { return Resource( word = "дедушка", wordType = WordType.OBJECT.toString(), - audioFileUrl = "audio/ogg/filipp/дедушка.ogg", pictureFileUrl = "pictures/withWord/дедушка.jpg" ) } @@ -244,7 +241,6 @@ internal class SeriesMatrixRecordProcessorTest { return Resource( word = "сидит", wordType = WordType.OBJECT_ACTION.toString(), - audioFileUrl = "audio/ogg/filipp/сидит.ogg", pictureFileUrl = "pictures/withWord/сидит.jpg" ) } @@ -253,7 +249,6 @@ internal class SeriesMatrixRecordProcessorTest { return Resource( word = "лежит", wordType = WordType.OBJECT_ACTION.toString(), - audioFileUrl = "audio/ogg/filipp/лежит.ogg", pictureFileUrl = "pictures/withWord/лежит.jpg" ) } @@ -262,7 +257,6 @@ internal class SeriesMatrixRecordProcessorTest { return Resource( word = "идет", wordType = WordType.OBJECT_ACTION.toString(), - audioFileUrl = "audio/ogg/filipp/идет.ogg", pictureFileUrl = "pictures/withWord/идет.jpg" ) } diff --git a/src/test/kotlin/com/epam/brn/upload/csv/seriesWords/SeriesWordsRecordProcessorTest.kt b/src/test/kotlin/com/epam/brn/upload/csv/seriesWords/SeriesWordsRecordProcessorTest.kt index 937c4b3d8..2340677e9 100644 --- a/src/test/kotlin/com/epam/brn/upload/csv/seriesWords/SeriesWordsRecordProcessorTest.kt +++ b/src/test/kotlin/com/epam/brn/upload/csv/seriesWords/SeriesWordsRecordProcessorTest.kt @@ -285,7 +285,6 @@ internal class SeriesWordsRecordProcessorTest { return Resource( word = "бал", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/бал.ogg", pictureFileUrl = "pictures/бал.jpg" ) } @@ -294,7 +293,6 @@ internal class SeriesWordsRecordProcessorTest { return Resource( word = "бум", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/бум.ogg", pictureFileUrl = "pictures/бум.jpg" ) } @@ -303,7 +301,6 @@ internal class SeriesWordsRecordProcessorTest { return Resource( word = "быль", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/быль.ogg", pictureFileUrl = "pictures/быль.jpg" ) } @@ -312,7 +309,6 @@ internal class SeriesWordsRecordProcessorTest { return Resource( word = "вить", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/вить.ogg", pictureFileUrl = "pictures/вить.jpg" ) } @@ -321,7 +317,6 @@ internal class SeriesWordsRecordProcessorTest { return Resource( word = "гад", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/гад.ogg", pictureFileUrl = "pictures/гад.jpg" ) } @@ -330,7 +325,6 @@ internal class SeriesWordsRecordProcessorTest { return Resource( word = "дуб", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/дуб.ogg", pictureFileUrl = "pictures/дуб.jpg" ) } diff --git a/src/test/kotlin/com/epam/brn/upload/csv/seriesWordsKoroleva/SeriesWordsKorolevaRecordProcessorTest.kt b/src/test/kotlin/com/epam/brn/upload/csv/seriesWordsKoroleva/SeriesWordsKorolevaRecordProcessorTest.kt index 94320c6fc..869cd7455 100644 --- a/src/test/kotlin/com/epam/brn/upload/csv/seriesWordsKoroleva/SeriesWordsKorolevaRecordProcessorTest.kt +++ b/src/test/kotlin/com/epam/brn/upload/csv/seriesWordsKoroleva/SeriesWordsKorolevaRecordProcessorTest.kt @@ -314,7 +314,6 @@ internal class SeriesWordsKorolevaRecordProcessorTest { return Resource( word = "бал", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/бал.ogg", pictureFileUrl = "pictures/бал.jpg" ) } @@ -323,7 +322,6 @@ internal class SeriesWordsKorolevaRecordProcessorTest { return Resource( word = "бум", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/бум.ogg", pictureFileUrl = "pictures/бум.jpg" ) } @@ -332,7 +330,6 @@ internal class SeriesWordsKorolevaRecordProcessorTest { return Resource( word = "быль", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/быль.ogg", pictureFileUrl = "pictures/быль.jpg" ) } @@ -341,7 +338,6 @@ internal class SeriesWordsKorolevaRecordProcessorTest { return Resource( word = "вить", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/вить.ogg", pictureFileUrl = "pictures/вить.jpg" ) } @@ -350,7 +346,6 @@ internal class SeriesWordsKorolevaRecordProcessorTest { return Resource( word = "гад", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/гад.ogg", pictureFileUrl = "pictures/гад.jpg" ) } @@ -359,7 +354,6 @@ internal class SeriesWordsKorolevaRecordProcessorTest { return Resource( word = "дуб", wordType = WordType.OBJECT.toString(), - audioFileUrl = "/test/дуб.ogg", pictureFileUrl = "pictures/дуб.jpg" ) }