geekdroid: fix robolectric sdk version now that we removed targetSdk
authorDa Risk <da_risk@geekorum.com>
Tue, 29 Nov 2022 18:57:32 -0400
changeset 28 96544d06a42a
parent 27 07bb6bb4277b
child 30 dcf342626fcc
geekdroid: fix robolectric sdk version now that we removed targetSdk
geekdroid/src/main/java/com/geekorum/geekdroid/battery/LiveData.kt
geekdroid/src/test/java/com/geekorum/geekdroid/accounts/AccountsLiveDataTest.java
geekdroid/src/test/java/com/geekorum/geekdroid/accounts/SyncInProgressLiveDataTest.java
geekdroid/src/test/java/com/geekorum/geekdroid/battery/LiveDataTest.kt
--- a/geekdroid/src/main/java/com/geekorum/geekdroid/battery/LiveData.kt	Tue Nov 29 18:22:00 2022 -0400
+++ b/geekdroid/src/main/java/com/geekorum/geekdroid/battery/LiveData.kt	Tue Nov 29 18:57:32 2022 -0400
@@ -59,7 +59,7 @@
             batteryStatus?.getBooleanExtra(BatteryManager.EXTRA_BATTERY_LOW, false) ?: false
         } else {
             val level = batteryStatus?.getIntExtra(BatteryManager.EXTRA_LEVEL, 0) ?: 0
-            val scale = batteryStatus?.getIntExtra(BatteryManager.EXTRA_SCALE, 100) ?: 0
+            val scale = batteryStatus?.getIntExtra(BatteryManager.EXTRA_SCALE, 100) ?: 100
             val percent = level.toFloat() / scale * 100
             percent.roundToInt() <= 15
         }
--- a/geekdroid/src/test/java/com/geekorum/geekdroid/accounts/AccountsLiveDataTest.java	Tue Nov 29 18:22:00 2022 -0400
+++ b/geekdroid/src/test/java/com/geekorum/geekdroid/accounts/AccountsLiveDataTest.java	Tue Nov 29 18:57:32 2022 -0400
@@ -23,6 +23,7 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.os.Build;
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule;
 import androidx.lifecycle.Lifecycle;
@@ -50,7 +51,8 @@
 import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
-@Config(shadows = {com.geekorum.geekdroid.shadows.ShadowAccountManager.class})
+@Config(shadows = {com.geekorum.geekdroid.shadows.ShadowAccountManager.class},
+        sdk = Build.VERSION_CODES.Q)
 public class AccountsLiveDataTest {
 
     @Rule
--- a/geekdroid/src/test/java/com/geekorum/geekdroid/accounts/SyncInProgressLiveDataTest.java	Tue Nov 29 18:22:00 2022 -0400
+++ b/geekdroid/src/test/java/com/geekorum/geekdroid/accounts/SyncInProgressLiveDataTest.java	Tue Nov 29 18:57:32 2022 -0400
@@ -23,6 +23,7 @@
 
 import android.accounts.Account;
 import android.content.ContentResolver;
+import android.os.Build;
 import android.os.Bundle;
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule;
@@ -44,7 +45,8 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(AndroidJUnit4.class)
-@Config(shadows = {ShadowContentResolver.class})
+@Config(shadows = {ShadowContentResolver.class},
+        sdk = Build.VERSION_CODES.Q)
 public class SyncInProgressLiveDataTest {
 
     @Rule
--- a/geekdroid/src/test/java/com/geekorum/geekdroid/battery/LiveDataTest.kt	Tue Nov 29 18:22:00 2022 -0400
+++ b/geekdroid/src/test/java/com/geekorum/geekdroid/battery/LiveDataTest.kt	Tue Nov 29 18:57:32 2022 -0400
@@ -44,6 +44,7 @@
 import kotlin.test.BeforeTest
 
 @RunWith(AndroidJUnit4::class)
+@Config(minSdk = Build.VERSION_CODES.Q)
 class BatterySaverLiveDataTest {
 
     lateinit var liveData: BatterySaverLiveData
@@ -81,6 +82,7 @@
 }
 
 @RunWith(AndroidJUnit4::class)
+@Config(minSdk = Build.VERSION_CODES.Q)
 class LowBatteryLiveDataTest {
 
     lateinit var liveData: LowBatteryLiveData
@@ -135,17 +137,4 @@
         }
     }
 
-    @Test
-    @Config(maxSdk = Build.VERSION_CODES.O_MR1)
-    fun testThatBeforePWhenBatteryIsAlreadyLowLivedataIsCorrect() {
-        val mockObserver = mockk<Observer<Boolean>>(relaxed = true)
-        application.sendStickyBroadcast(Intent(Intent.ACTION_BATTERY_CHANGED).apply {
-            putExtra(BatteryManager.EXTRA_LEVEL, 5)
-            putExtra(BatteryManager.EXTRA_SCALE, 100)
-        })
-        liveData.observeForever(mockObserver)
-        verifySequence {
-            mockObserver.onChanged(true)
-        }
-    }
 }