-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: add audio asset metadata (WPB-3334) (#1970)
* fix: add audio asset metadata (WPB-3334) (#1969) * fix: add audio/mp4 as audio mime type * fix: get audio length in ms from audio asset as audio/mp4 mime type * fix: map audio metadata to protobuf * fix: add tests * fix: add missing param in testservice * trigger build --------- Co-authored-by: Alexandre Ferris <ferris.alexandre@gmail.com>
- Loading branch information
1 parent
9692232
commit 36b2c20
Showing
6 changed files
with
139 additions
and
13 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
93 changes: 93 additions & 0 deletions
93
logic/src/commonTest/kotlin/com/wire/kalium/logic/data/asset/AssetMapperTest.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,93 @@ | ||
/* | ||
* Wire | ||
* Copyright (C) 2023 Wire Swiss GmbH | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see http://www.gnu.org/licenses/. | ||
*/ | ||
package com.wire.kalium.logic.data.asset | ||
|
||
import com.wire.kalium.logic.data.message.AssetContent | ||
import com.wire.kalium.logic.data.message.EncryptionAlgorithmMapper | ||
import com.wire.kalium.logic.data.message.Message | ||
import com.wire.kalium.logic.data.message.MessageContent | ||
import com.wire.kalium.logic.data.message.MessageEncryptionAlgorithm | ||
import com.wire.kalium.protobuf.messages.Asset | ||
import com.wire.kalium.util.KaliumDispatcher | ||
import io.mockative.Mock | ||
import io.mockative.classOf | ||
import io.mockative.mock | ||
import kotlinx.coroutines.test.runTest | ||
import kotlin.test.Test | ||
import kotlin.test.assertEquals | ||
import kotlin.test.assertNull | ||
|
||
class AssetMapperTest { | ||
|
||
@Test | ||
fun givenAudioAssetContent_whenMappingToProtoAssetMessage_thenReturnCorrectProtoAudioMetadata() = runTest { | ||
// given | ||
val audioMetadata = AssetContent.AssetMetadata.Audio( | ||
durationMs = 4444, | ||
normalizedLoudness = null | ||
) | ||
val messageContent = MessageContent.Asset( | ||
value = AssetContent( | ||
sizeInBytes = 10000, | ||
name = "audio.m4a", | ||
mimeType = "audio/mp4", | ||
metadata = audioMetadata, | ||
remoteData = AssetContent.RemoteData( | ||
otrKey = byteArrayOf(), | ||
sha256 = byteArrayOf(), | ||
assetId = "abcd-1234", | ||
assetToken = "token", | ||
assetDomain = "domain", | ||
encryptionAlgorithm = MessageEncryptionAlgorithm.AES_GCM | ||
), | ||
uploadStatus = Message.UploadStatus.FAILED_UPLOAD, | ||
downloadStatus = Message.DownloadStatus.NOT_DOWNLOADED | ||
) | ||
) | ||
val (_, mapper) = Arrangement() | ||
.arrange() | ||
|
||
// when | ||
val result = mapper.fromAssetContentToProtoAssetMessage( | ||
messageContent = messageContent, | ||
expectsReadConfirmation = true | ||
) | ||
|
||
// then | ||
assertEquals( | ||
audioMetadata.durationMs, | ||
(result.original?.metaData as Asset.Original.MetaData.Audio).value.durationInMillis | ||
) | ||
assertNull( | ||
(result.original?.metaData as Asset.Original.MetaData.Audio).value.normalizedLoudness | ||
) | ||
} | ||
|
||
private class Arrangement { | ||
|
||
@Mock | ||
val dispatcher = mock(classOf<KaliumDispatcher>()) | ||
|
||
val mapper = AssetMapperImpl( | ||
encryptionAlgorithmMapper = EncryptionAlgorithmMapper(), | ||
dispatcher = dispatcher | ||
) | ||
|
||
fun arrange() = this to mapper | ||
} | ||
} |
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