From 78229f479423a9b575c508bc224e4e7ebc2ed886 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sun, 29 Jan 2023 20:40:49 -0700
Subject: [PATCH] music: fix failing tests

Fix failing tests stemming from incorrect module locations.
---
 .../main/java/org/oxycblt/auxio/detail/DetailViewModel.kt | 6 +++---
 .../java/org/oxycblt/auxio/detail/SongDetailDialog.kt     | 2 +-
 .../oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt   | 2 +-
 app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt  | 4 ++--
 app/src/main/java/org/oxycblt/auxio/music/Music.kt        | 6 +++---
 app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt  | 2 +-
 .../org/oxycblt/auxio/music/extractor/CacheExtractor.kt   | 2 +-
 .../oxycblt/auxio/music/extractor/MediaStoreExtractor.kt  | 2 +-
 .../oxycblt/auxio/music/extractor/MetadataExtractor.kt    | 4 ++--
 .../java/org/oxycblt/auxio/music/library/RealMusic.kt     | 6 +++---
 app/src/main/java/org/oxycblt/auxio/music/library/Sort.kt | 4 ++--
 .../oxycblt/auxio/music/{format => metadata}/AudioInfo.kt | 2 +-
 .../org/oxycblt/auxio/music/{format => metadata}/Date.kt  | 2 +-
 .../org/oxycblt/auxio/music/{format => metadata}/Disc.kt  | 2 +-
 .../auxio/music/{format => metadata}/ReleaseType.kt       | 2 +-
 .../oxycblt/auxio/music/{format => metadata}/TextTags.kt  | 2 +-
 .../auxio/playback/replaygain/ReplayGainAudioProcessor.kt | 2 +-
 .../org/oxycblt/auxio/music/extractor/TextTagsTest.kt     | 2 +-
 .../music/{MusicTest.kt => library/RealMusicTest.kt}      | 8 +++++---
 .../oxycblt/auxio/music/{tags => metadata}/DateTest.kt    | 3 +--
 .../oxycblt/auxio/music/{tags => metadata}/DiscTest.kt    | 3 +--
 .../auxio/music/{tags => metadata}/ReleaseTypeTest.kt     | 3 +--
 22 files changed, 35 insertions(+), 36 deletions(-)
 rename app/src/main/java/org/oxycblt/auxio/music/{format => metadata}/AudioInfo.kt (99%)
 rename app/src/main/java/org/oxycblt/auxio/music/{format => metadata}/Date.kt (99%)
 rename app/src/main/java/org/oxycblt/auxio/music/{format => metadata}/Disc.kt (96%)
 rename app/src/main/java/org/oxycblt/auxio/music/{format => metadata}/ReleaseType.kt (99%)
 rename app/src/main/java/org/oxycblt/auxio/music/{format => metadata}/TextTags.kt (98%)
 rename app/src/test/java/org/oxycblt/auxio/music/{MusicTest.kt => library/RealMusicTest.kt} (97%)
 rename app/src/test/java/org/oxycblt/auxio/music/{tags => metadata}/DateTest.kt (98%)
 rename app/src/test/java/org/oxycblt/auxio/music/{tags => metadata}/DiscTest.kt (94%)
 rename app/src/test/java/org/oxycblt/auxio/music/{tags => metadata}/ReleaseTypeTest.kt (97%)

diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
index c5a08c5a5..aa789536d 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
@@ -35,11 +35,11 @@ import org.oxycblt.auxio.detail.recycler.SortHeader
 import org.oxycblt.auxio.list.BasicHeader
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.music.*
-import org.oxycblt.auxio.music.format.AudioInfo
-import org.oxycblt.auxio.music.format.Disc
-import org.oxycblt.auxio.music.format.ReleaseType
 import org.oxycblt.auxio.music.library.Library
 import org.oxycblt.auxio.music.library.Sort
+import org.oxycblt.auxio.music.metadata.AudioInfo
+import org.oxycblt.auxio.music.metadata.Disc
+import org.oxycblt.auxio.music.metadata.ReleaseType
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.util.*
 
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
index c1d8da1e2..bb8d87730 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
@@ -29,7 +29,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogSongDetailBinding
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.format.AudioInfo
+import org.oxycblt.auxio.music.metadata.AudioInfo
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.ui.ViewBindingDialogFragment
 import org.oxycblt.auxio.util.collectImmediately
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
index a9735e385..4d44384a3 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
@@ -33,7 +33,7 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter
 import org.oxycblt.auxio.list.adapter.SimpleDiffCallback
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.format.Disc
+import org.oxycblt.auxio.music.metadata.Disc
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.getPlural
diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
index 74aac580a..f18d98c3b 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
@@ -68,11 +68,11 @@ import org.oxycblt.auxio.util.*
 @AndroidEntryPoint
 class HomeFragment :
     SelectionFragment<FragmentHomeBinding>(), AppBarLayout.OnOffsetChangedListener {
+    override val playbackModel: PlaybackViewModel by activityViewModels()
+    override val selectionModel: SelectionViewModel by activityViewModels()
     private val homeModel: HomeViewModel by activityViewModels()
     private val musicModel: MusicViewModel by activityViewModels()
     private val navModel: NavigationViewModel by activityViewModels()
-    override val playbackModel: PlaybackViewModel by activityViewModels()
-    override val selectionModel: SelectionViewModel by activityViewModels()
     private var storagePermissionLauncher: ActivityResultLauncher<String>? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
index 4edcacc46..85f1e3044 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
@@ -26,9 +26,9 @@ import java.util.UUID
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.oxycblt.auxio.list.Item
-import org.oxycblt.auxio.music.format.Date
-import org.oxycblt.auxio.music.format.Disc
-import org.oxycblt.auxio.music.format.ReleaseType
+import org.oxycblt.auxio.music.metadata.Date
+import org.oxycblt.auxio.music.metadata.Disc
+import org.oxycblt.auxio.music.metadata.ReleaseType
 import org.oxycblt.auxio.music.storage.MimeType
 import org.oxycblt.auxio.music.storage.Path
 import org.oxycblt.auxio.util.toUuidOrNull
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt
index 80f4d61f2..be2667900 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt
@@ -23,7 +23,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import org.oxycblt.auxio.music.format.AudioInfo
+import org.oxycblt.auxio.music.metadata.AudioInfo
 
 @Module
 @InstallIn(SingletonComponent::class)
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt
index e1dd5723c..dcf9ec602 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt
@@ -29,8 +29,8 @@ import androidx.room.RoomDatabase
 import androidx.room.TypeConverter
 import androidx.room.TypeConverters
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.format.Date
 import org.oxycblt.auxio.music.library.RealSong
+import org.oxycblt.auxio.music.metadata.Date
 import org.oxycblt.auxio.music.parsing.correctWhitespace
 import org.oxycblt.auxio.music.parsing.splitEscaped
 import org.oxycblt.auxio.util.*
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
index 90e19f0c1..a3e361934 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
@@ -28,8 +28,8 @@ import androidx.core.database.getIntOrNull
 import androidx.core.database.getStringOrNull
 import java.io.File
 import org.oxycblt.auxio.music.MusicSettings
-import org.oxycblt.auxio.music.format.Date
 import org.oxycblt.auxio.music.library.RealSong
+import org.oxycblt.auxio.music.metadata.Date
 import org.oxycblt.auxio.music.parsing.parseId3v2PositionField
 import org.oxycblt.auxio.music.parsing.transformPositionField
 import org.oxycblt.auxio.music.storage.Directory
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
index 559a87ede..1eab15d14 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
@@ -22,9 +22,9 @@ import androidx.core.text.isDigitsOnly
 import com.google.android.exoplayer2.MediaItem
 import com.google.android.exoplayer2.MetadataRetriever
 import kotlinx.coroutines.flow.flow
-import org.oxycblt.auxio.music.format.Date
-import org.oxycblt.auxio.music.format.TextTags
 import org.oxycblt.auxio.music.library.RealSong
+import org.oxycblt.auxio.music.metadata.Date
+import org.oxycblt.auxio.music.metadata.TextTags
 import org.oxycblt.auxio.music.parsing.parseId3v2PositionField
 import org.oxycblt.auxio.music.parsing.parseVorbisPositionField
 import org.oxycblt.auxio.music.storage.toAudioUri
diff --git a/app/src/main/java/org/oxycblt/auxio/music/library/RealMusic.kt b/app/src/main/java/org/oxycblt/auxio/music/library/RealMusic.kt
index 4a42d02b4..057ef3d37 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/library/RealMusic.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/library/RealMusic.kt
@@ -32,9 +32,9 @@ import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.MusicMode
 import org.oxycblt.auxio.music.MusicSettings
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.format.Date
-import org.oxycblt.auxio.music.format.Disc
-import org.oxycblt.auxio.music.format.ReleaseType
+import org.oxycblt.auxio.music.metadata.Date
+import org.oxycblt.auxio.music.metadata.Disc
+import org.oxycblt.auxio.music.metadata.ReleaseType
 import org.oxycblt.auxio.music.parsing.parseId3GenreNames
 import org.oxycblt.auxio.music.parsing.parseMultiValue
 import org.oxycblt.auxio.music.storage.Directory
diff --git a/app/src/main/java/org/oxycblt/auxio/music/library/Sort.kt b/app/src/main/java/org/oxycblt/auxio/music/library/Sort.kt
index 9a6e6d3ba..64bfd846a 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/library/Sort.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/library/Sort.kt
@@ -22,9 +22,9 @@ import kotlin.math.max
 import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.music.*
-import org.oxycblt.auxio.music.format.Date
-import org.oxycblt.auxio.music.format.Disc
 import org.oxycblt.auxio.music.library.Sort.Mode
+import org.oxycblt.auxio.music.metadata.Date
+import org.oxycblt.auxio.music.metadata.Disc
 
 /**
  * A sorting method.
diff --git a/app/src/main/java/org/oxycblt/auxio/music/format/AudioInfo.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/AudioInfo.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/format/AudioInfo.kt
rename to app/src/main/java/org/oxycblt/auxio/music/metadata/AudioInfo.kt
index 380d5ff77..ae6f7f294 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/format/AudioInfo.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/AudioInfo.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.format
+package org.oxycblt.auxio.music.metadata
 
 import android.content.Context
 import android.media.MediaExtractor
diff --git a/app/src/main/java/org/oxycblt/auxio/music/format/Date.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/Date.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/format/Date.kt
rename to app/src/main/java/org/oxycblt/auxio/music/metadata/Date.kt
index 9fd14f95e..bd4764390 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/format/Date.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/Date.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.format
+package org.oxycblt.auxio.music.metadata
 
 import android.content.Context
 import java.text.ParseException
diff --git a/app/src/main/java/org/oxycblt/auxio/music/format/Disc.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/Disc.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/music/format/Disc.kt
rename to app/src/main/java/org/oxycblt/auxio/music/metadata/Disc.kt
index 2a2b18bc5..b38db06fb 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/format/Disc.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/Disc.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.format
+package org.oxycblt.auxio.music.metadata
 
 import org.oxycblt.auxio.list.Item
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/format/ReleaseType.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/ReleaseType.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/format/ReleaseType.kt
rename to app/src/main/java/org/oxycblt/auxio/music/metadata/ReleaseType.kt
index 45ba2909f..2479444a9 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/format/ReleaseType.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/ReleaseType.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.format
+package org.oxycblt.auxio.music.metadata
 
 import org.oxycblt.auxio.R
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/format/TextTags.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/TextTags.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/music/format/TextTags.kt
rename to app/src/main/java/org/oxycblt/auxio/music/metadata/TextTags.kt
index 2365319ae..0a715901d 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/format/TextTags.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/TextTags.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.format
+package org.oxycblt.auxio.music.metadata
 
 import com.google.android.exoplayer2.metadata.Metadata
 import com.google.android.exoplayer2.metadata.id3.InternalFrame
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainAudioProcessor.kt b/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainAudioProcessor.kt
index f716935e1..5dc4c1280 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainAudioProcessor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainAudioProcessor.kt
@@ -28,7 +28,7 @@ import com.google.android.exoplayer2.util.MimeTypes
 import java.nio.ByteBuffer
 import kotlin.math.pow
 import org.oxycblt.auxio.music.Album
-import org.oxycblt.auxio.music.format.TextTags
+import org.oxycblt.auxio.music.metadata.TextTags
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.playback.state.PlaybackStateManager
 import org.oxycblt.auxio.util.logD
diff --git a/app/src/test/java/org/oxycblt/auxio/music/extractor/TextTagsTest.kt b/app/src/test/java/org/oxycblt/auxio/music/extractor/TextTagsTest.kt
index 7fcd53592..17d8b3e76 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/extractor/TextTagsTest.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/extractor/TextTagsTest.kt
@@ -26,7 +26,7 @@ import com.google.android.exoplayer2.metadata.vorbis.VorbisComment
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.oxycblt.auxio.music.format.TextTags
+import org.oxycblt.auxio.music.metadata.TextTags
 
 class TextTagsTest {
     @Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/MusicTest.kt b/app/src/test/java/org/oxycblt/auxio/music/library/RealMusicTest.kt
similarity index 97%
rename from app/src/test/java/org/oxycblt/auxio/music/MusicTest.kt
rename to app/src/test/java/org/oxycblt/auxio/music/library/RealMusicTest.kt
index 0fc5809c7..bac8c242e 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/MusicTest.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/library/RealMusicTest.kt
@@ -15,15 +15,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music
+package org.oxycblt.auxio.music.library
 
 import java.util.*
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.oxycblt.auxio.music.format.Date
+import org.oxycblt.auxio.music.Music
+import org.oxycblt.auxio.music.MusicMode
+import org.oxycblt.auxio.music.metadata.Date
 
-class MusicTest {
+class RealMusicTest {
     @Test
     fun musicUid_auxio() {
         val uid =
diff --git a/app/src/test/java/org/oxycblt/auxio/music/tags/DateTest.kt b/app/src/test/java/org/oxycblt/auxio/music/metadata/DateTest.kt
similarity index 98%
rename from app/src/test/java/org/oxycblt/auxio/music/tags/DateTest.kt
rename to app/src/test/java/org/oxycblt/auxio/music/metadata/DateTest.kt
index fd7e6d352..5cb0032ff 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/tags/DateTest.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/metadata/DateTest.kt
@@ -15,12 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.tags
+package org.oxycblt.auxio.music.metadata
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.oxycblt.auxio.music.format.Date
 
 class DateTest {
     @Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/tags/DiscTest.kt b/app/src/test/java/org/oxycblt/auxio/music/metadata/DiscTest.kt
similarity index 94%
rename from app/src/test/java/org/oxycblt/auxio/music/tags/DiscTest.kt
rename to app/src/test/java/org/oxycblt/auxio/music/metadata/DiscTest.kt
index 3e43f564f..3a6eba5d2 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/tags/DiscTest.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/metadata/DiscTest.kt
@@ -15,12 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.tags
+package org.oxycblt.auxio.music.metadata
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.oxycblt.auxio.music.format.Disc
 
 class DiscTest {
     @Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/tags/ReleaseTypeTest.kt b/app/src/test/java/org/oxycblt/auxio/music/metadata/ReleaseTypeTest.kt
similarity index 97%
rename from app/src/test/java/org/oxycblt/auxio/music/tags/ReleaseTypeTest.kt
rename to app/src/test/java/org/oxycblt/auxio/music/metadata/ReleaseTypeTest.kt
index 1e6dde974..edf63bd96 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/tags/ReleaseTypeTest.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/metadata/ReleaseTypeTest.kt
@@ -15,11 +15,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.tags
+package org.oxycblt.auxio.music.metadata
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.oxycblt.auxio.music.format.ReleaseType
 
 class ReleaseTypeTest {
     @Test