fix: use only ubuntu for unit tests and don't drop 1 state in tests

Yash-Garg · Mar 25, 2023 · 15debf8 · 15debf8
1 parent 31d391b
commit 15debf8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/develop_ci.yml b/.github/workflows/develop_ci.yml
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v35.6.4
+        uses: tj-actions/changed-files@v35.7.6
         with:
           files: |
             .github/workflows/develop_ci.yml
@@ -42,7 +42,7 @@ jobs:
     if: needs.file-changes.outputs.any == 'true'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
 
@@ -68,7 +68,7 @@ jobs:
     if: needs.file-changes.outputs.any == 'true'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
 
@@ -96,12 +96,12 @@ jobs:
     needs: [ check-codestyle ]
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     if: needs.file-changes.outputs.any == 'true'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml
@@ -20,7 +20,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v35.6.4
+        uses: tj-actions/changed-files@v35.7.6
         with:
           files: |
             .github/workflows/pr_ci.yml
@@ -41,7 +41,7 @@ jobs:
     if: needs.file-changes.outputs.any == 'true'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
       - name: Set up JDK
@@ -63,7 +63,7 @@ jobs:
     if: needs.file-changes.outputs.any == 'true'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
       - name: Set up JDK
@@ -88,7 +88,7 @@ jobs:
     if: needs.file-changes.outputs.any == 'true'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
       - name: Set up JDK

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -91,11 +91,9 @@ android {
     }
 
     androidComponents {
-        beforeVariants { variant ->
-            when {
-                variant.name.contains("benchmark", ignoreCase = true) -> {
-                    variant.enable = false
-                }
+        beforeVariants {
+            if (it.name.contains("benchmark", true)) {
+                it.enable = false
             }
         }
     }

diff --git a/app/src/main/kotlin/dev/yashgarg/qbit/ui/server/adapter/TorrentListAdapter.kt b/app/src/main/kotlin/dev/yashgarg/qbit/ui/server/adapter/TorrentListAdapter.kt
@@ -176,11 +176,11 @@ class TorrentListAdapter @Inject constructor() :
 
     private class TorrentComparator : DiffUtil.ItemCallback<Torrent>() {
         override fun areItemsTheSame(oldItem: Torrent, newItem: Torrent): Boolean {
-            return oldItem == newItem
+            return oldItem.hash == newItem.hash
         }
 
         override fun areContentsTheSame(oldItem: Torrent, newItem: Torrent): Boolean {
-            return oldItem.hash == newItem.hash
+            return oldItem == newItem
         }
     }
 

diff --git a/app/src/test/kotlin/dev/yashgarg/qbit/data/QbitRepositoryTest.kt b/app/src/test/kotlin/dev/yashgarg/qbit/data/QbitRepositoryTest.kt
@@ -6,7 +6,6 @@ import dev.yashgarg.qbit.FakeClientManager
 import dev.yashgarg.qbit.MainDispatcherRule
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertFalse
@@ -37,15 +36,15 @@ class QbitRepositoryTest {
     fun checkAddTorrentSuccess() = runTest {
         assertTrue(repository.addTorrentUrl(Constants.magnetUrl) is Ok)
 
-        val data = repository.observeMainData().drop(1).first()
+        val data = repository.observeMainData().first()
         assertTrue(data.torrents.containsKey(Constants.magnetHash))
     }
 
     @Test
     fun checkRemoveTorrentSuccess() = runTest {
         assertTrue(repository.removeTorrents(listOf(Constants.magnetHash)) is Ok)
 
-        val data = repository.observeMainData().drop(1).first()
+        val data = repository.observeMainData().first()
         assertFalse(data.torrents.containsKey(Constants.magnetHash))
     }
 }