Merge pull request #15697 from nextcloud/fix/ci-tests

fix: tests

Author: AndyScherzinger

app/build.gradle

@@ -32,6 +32,7 @@ plugins {
     alias(libs.plugins.spotless)
     alias(libs.plugins.kapt)
     alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.kotlin.serialization)
 }
 
 apply plugin: "com.android.application"
@@ -496,6 +497,9 @@ dependencies {
     // region Image loading
     implementation libs.coil
     // endregion
+
+    // kotlinx.serialization
+    implementation(libs.kotlinx.serialization.json)
 }
 
 

app/src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -400,11 +400,6 @@ public BatteryStatus getBattery() {
             public boolean isPowerSavingEnabled() {
                 return false;
             }
-
-            @Override
-            public boolean isPowerSavingExclusionAvailable() {
-                return false;
-            }
         };
 
         UserAccountManager accountManager = UserAccountManagerImpl.fromContext(targetContext);

app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java

@@ -216,11 +216,6 @@ public BatteryStatus getBattery() {
             public boolean isPowerSavingEnabled() {
                 return false;
             }
-
-            @Override
-            public boolean isPowerSavingExclusionAvailable() {
-                return false;
-            }
         };
 
         UserAccountManager accountManager = UserAccountManagerImpl.fromContext(targetContext);

app/src/androidTest/java/com/owncloud/android/UploadIT.java

@@ -82,12 +82,6 @@ public Connectivity getConnectivity() {
         public boolean isPowerSavingEnabled() {
             return false;
         }
-
-        @Override
-        public boolean isPowerSavingExclusionAvailable() {
-            return false;
-        }
-
         @NonNull
         @Override
         public BatteryStatus getBattery() {
@@ -237,11 +231,6 @@ public boolean isPowerSavingEnabled() {
                 return false;
             }
 
-            @Override
-            public boolean isPowerSavingExclusionAvailable() {
-                return false;
-            }
-
             @NonNull
             @Override
             public BatteryStatus getBattery() {

app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt

@@ -46,9 +46,6 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
         override val isPowerSavingEnabled: Boolean
             get() = false
 
-        override val isPowerSavingExclusionAvailable: Boolean
-            get() = false
-
         override val battery: BatteryStatus
             get() = BatteryStatus()
     }

app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt

@@ -83,9 +83,7 @@ class TestPowerManagementService {
         @Test
         fun `power saving check is disabled`() {
             // GIVEN
-            //      a device which falsely returns power save mode enabled
-            //      power check is overridden by user
-            whenever(platformPowerManager.isPowerSaveMode).thenReturn(true)
+            whenever(platformPowerManager.isPowerSaveMode).thenReturn(false)
 
             // WHEN
             //      power save mode is checked

gradle/libs.versions.toml

@@ -71,6 +71,7 @@ spotless = "7.2.1"
 stateless4jVersion = "2.6.0"
 webkitVersion = "1.14.0"
 workRuntime = "2.10.4"
+kotlinxSerializationJson = "1.9.0"
 
 kotlin = "2.2.20"
 ksp = "2.2.20-2.0.3"
@@ -102,6 +103,8 @@ coil = { module = "io.coil-kt:coil", version.ref = "coilVersion" }
 constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayoutVersion" }
 emoji-google = { module = "com.vanniktech:emoji-google", version.ref = "emojiGoogleVersion" }
 
+# kotlinx
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 
 # Other
 annotation = { module = "androidx.annotation:annotation", version.ref = "annotationVersion" }
@@ -219,3 +222,4 @@ kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "ko
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

gradle/verification-metadata.xml

@@ -29047,6 +29047,12 @@
             </sha256>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin.plugin.serialization" name="org.jetbrains.kotlin.plugin.serialization.gradle.plugin" version="2.2.20">
+         <artifact name="org.jetbrains.kotlin.plugin.serialization.gradle.plugin-2.2.20.pom">
+             <sha256 value="48a64185623040fd6677b010083d89c618139bd73160badad65916e6d5439fc6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+             <sha256 value="80aa32a61137d505c44bb1e135d9289593a6f944cec8083ab595c071debac5d8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.16.1">
          <artifact name="atomicfu-0.16.1.module">
             <sha256 value="fdcf04fc25f6a43f557f341ee0053caa25e759f591169c86566f1dad37fc77a6" origin="Generated by Gradle"/>