From 81679cceae4504088f1cb830a0c06eabcbf90d6f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 29 Nov 2024 09:41:03 +0100 Subject: [PATCH] Rename file and split test. --- ...> FileExtensionExtractorWithValidation.kt} | 0 ...leExtensionExtractorWithValidationTest.kt} | 10 +--------- libraries/mediaviewer/test/build.gradle.kts | 3 +++ ...ExtensionExtractorWithoutValidationTest.kt | 20 +++++++++++++++++++ 4 files changed, 24 insertions(+), 9 deletions(-) rename libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/{FileExtensionExtractor.kt => FileExtensionExtractorWithValidation.kt} (100%) rename libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/{FileExtensionExtractorTest.kt => FileExtensionExtractorWithValidationTest.kt} (70%) create mode 100644 libraries/mediaviewer/test/src/test/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidationTest.kt diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractor.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidation.kt similarity index 100% rename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractor.kt rename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidation.kt diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidationTest.kt similarity index 70% rename from libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorTest.kt rename to libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidationTest.kt index 5e9ada9f3a..df16eb62e8 100644 --- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorTest.kt +++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidationTest.kt @@ -8,13 +8,12 @@ package io.element.android.libraries.mediaviewer.impl.util import com.google.common.truth.Truth.assertThat -import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class FileExtensionExtractorTest { +class FileExtensionExtractorWithValidationTest { @Test fun `test FileExtensionExtractor with validation OK`() { val sut = FileExtensionExtractorWithValidation() @@ -28,11 +27,4 @@ class FileExtensionExtractorTest { val sut = FileExtensionExtractorWithValidation() assertThat(sut.extractFromName("test.bla")).isEqualTo("bin") } - - @Test - fun `test FileExtensionExtractor no validation`() { - val sut = FileExtensionExtractorWithoutValidation() - assertThat(sut.extractFromName("test.png")).isEqualTo("png") - assertThat(sut.extractFromName("test.bla")).isEqualTo("bla") - } } diff --git a/libraries/mediaviewer/test/build.gradle.kts b/libraries/mediaviewer/test/build.gradle.kts index aa182faa98..47adf35975 100644 --- a/libraries/mediaviewer/test/build.gradle.kts +++ b/libraries/mediaviewer/test/build.gradle.kts @@ -18,4 +18,7 @@ dependencies { implementation(projects.libraries.core) implementation(projects.tests.testutils) implementation(projects.libraries.matrix.api) + + testImplementation(libs.test.junit) + testImplementation(libs.test.truth) } diff --git a/libraries/mediaviewer/test/src/test/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidationTest.kt b/libraries/mediaviewer/test/src/test/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidationTest.kt new file mode 100644 index 0000000000..48a6fbac11 --- /dev/null +++ b/libraries/mediaviewer/test/src/test/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidationTest.kt @@ -0,0 +1,20 @@ +/* + * Copyright 2024 New Vector Ltd. + * + * SPDX-License-Identifier: AGPL-3.0-only + * Please see LICENSE in the repository root for full details. + */ + +package io.element.android.libraries.mediaviewer.test.util + +import com.google.common.truth.Truth.assertThat +import org.junit.Test + +class FileExtensionExtractorWithoutValidationTest { + @Test + fun `extension should always be extracted even is invalid`() { + val sut = FileExtensionExtractorWithoutValidation() + assertThat(sut.extractFromName("test.png")).isEqualTo("png") + assertThat(sut.extractFromName("test.bla")).isEqualTo("bla") + } +}