Revert "ui: show the singular and plural artist rows separately"

This reverts commit 2f95a89682.

app/src/test/kotlin/com/subtracks/ui/components/LibraryInfoDialogTest.kt

@@ -215,7 +215,7 @@ class LibraryInfoDialogTest {
     }
 
     @Test
-    fun aSingleArtistTrackHidesTheDuplicateArtistsRow() {
+    fun aSingleArtistTrackUsesSingularLabels() {
         composeRule.setContent {
             SubtracksTheme {
                 SongInfoDialog(
@@ -236,7 +236,7 @@ class LibraryInfoDialogTest {
     }
 
     @Test
-    fun duplicateAndBlankArtistRefsDoNotAddAnArtistsRow() {
+    fun duplicateAndBlankArtistRefsStaySingular() {
         composeRule.setContent {
             SubtracksTheme {
                 SongInfoDialog(
@@ -259,7 +259,7 @@ class LibraryInfoDialogTest {
     }
 
     @Test
-    fun aMixedArtistTrackShowsBothTheArtistAndArtistsRows() {
+    fun aMixedArtistTrackUsesPluralLabelsForBothRows() {
         composeRule.setContent {
             SubtracksTheme {
                 SongInfoDialog(
@@ -277,12 +277,10 @@ class LibraryInfoDialogTest {
             }
         }
 
-        composeRule.onNodeWithText("Artist").assertIsDisplayed()
         composeRule.onNodeWithText("Artists").assertIsDisplayed()
-        composeRule.onNodeWithText("Artist A").assertIsDisplayed()
-        composeRule.onNodeWithText("Artist A · Artist B").assertIsDisplayed()
-        composeRule.onNodeWithText("Artist sort").assertIsDisplayed()
-        composeRule.onNodeWithText("Artists sort").assertDoesNotExist()
+        composeRule.onNodeWithText("Artists sort").assertIsDisplayed()
+        composeRule.onNodeWithText("Artist").assertDoesNotExist()
+        composeRule.onNodeWithText("Artist sort").assertDoesNotExist()
         composeRule.onNodeWithText("Alpha").assertIsDisplayed()
     }
 
@@ -306,7 +304,7 @@ class LibraryInfoDialogTest {
     }
 
     @Test
-    fun aMixedArtistTrackWithoutASortStillShowsBothArtistRows() {
+    fun aMixedArtistTrackWithoutASortShowsOnlyTheArtistsRow() {
         composeRule.setContent {
             SubtracksTheme {
                 SongInfoDialog(
@@ -324,11 +322,9 @@ class LibraryInfoDialogTest {
             }
         }
 
-        composeRule.onNodeWithText("Artist").assertIsDisplayed()
         composeRule.onNodeWithText("Artists").assertIsDisplayed()
-        composeRule.onNodeWithText("Artist A").assertIsDisplayed()
         composeRule.onNodeWithText("Artist A · Artist B").assertIsDisplayed()
-        composeRule.onNodeWithText("Artist sort").assertDoesNotExist()
+        composeRule.onNodeWithText("Artists sort").assertDoesNotExist()
     }
 
     @Test

app/src/test/kotlin/com/subtracks/ui/components/SongArtistDisplayTest.kt

@@ -48,7 +48,7 @@ class SongArtistDisplayTest {
     }
 
     @Test
-    fun theInfoDialogShowsTheSingularArtistAndThePluralArtistsSeparately() {
+    fun theInfoDialogListsThePluralArtistsWithTheSingularArtistFirst() {
         composeRule.setContent {
             SubtracksTheme {
                 SongInfoDialog(
@@ -62,7 +62,6 @@ class SongArtistDisplayTest {
             }
         }
 
-        composeRule.onNodeWithText("Two").assertIsDisplayed()
-        composeRule.onNodeWithText("One · Two · Three").assertIsDisplayed()
+        composeRule.onNodeWithText("Two · One · Three").assertIsDisplayed()
     }
 }