Merge branch 'github/main'

app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt

@@ -255,7 +255,8 @@ class NavigationTest {
     fun navigationBar_multipleBackStackInterests() {
         composeTestRule.apply {
             onNodeWithText(interests).performClick()
-            onNodeWithText("Android Studio").performClick() // TODO: Grab string from fake data
+            // TODO: Grab string from fake data
+            onNodeWithText("Android Studio & Tools").performClick()
 
             // Switch tab
             onNodeWithText(forYou).performClick()

core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsStreamUseCase.kt

@@ -61,10 +61,9 @@ class GetFollowableTopicsStreamUseCase @Inject constructor(
                         isFollowed = topic.id in followedIds
                     )
                 }
-            if (sortBy == NAME) {
+            when (sortBy) {
-                followedTopics.sortedBy { it.topic.name }
+                NAME -> followedTopics.sortedBy { it.topic.name }
-            } else {
+                else -> followedTopics
-                followedTopics
             }
         }
     }

core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt

@@ -49,7 +49,7 @@ class FakeNiaNetworkDataSourceTest {
     fun testDeserializationOfNewsResources() = runTest(testDispatcher) {
         assertEquals(
             FakeDataSource.sampleResource,
-            subject.getNewsResources().first()
+            subject.getNewsResources().find { it.id == FakeDataSource.sampleResource.id }
         )
     }
 }