Solving bugs related with tests

owncloud · Jun 28, 2023 · 4c563e9 · 4c563e9
1 parent 73d6f63
commit 4c563e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/...ain/java/com/owncloud/android/presentation/settings/security/SettingsSecurityViewModel.kt b/...ain/java/com/owncloud/android/presentation/settings/security/SettingsSecurityViewModel.kt
@@ -53,7 +53,7 @@ class SettingsSecurityViewModel(
     fun getBiometricsState(): Boolean = preferencesProvider.getBoolean(BiometricActivity.PREFERENCE_SET_BIOMETRIC, false)
 
     fun isSecurityEnforcedEnabled() =
-        mdmProvider.getBrandingBoolean(CONFIGURATION_DEVICE_PROTECTION, R.bool.device_protection) && isDeviceSecure() &&
+        mdmProvider.getBrandingBoolean(CONFIGURATION_DEVICE_PROTECTION, R.bool.device_protection) && !isDeviceSecure() &&
                 parseFromInteger(mdmProvider.getBrandingInteger(NO_MDM_RESTRICTION_YET, R.integer.lock_enforced)) != LockEnforcedType.DISABLED
 
     fun isLockDelayEnforcedEnabled() = LockTimeout.parseFromInteger(

diff --git a/...va/com/owncloud/android/presentation/viewmodels/settings/SettingsSecurityViewModelTest.kt b/...va/com/owncloud/android/presentation/viewmodels/settings/SettingsSecurityViewModelTest.kt
@@ -143,13 +143,13 @@ class SettingsSecurityViewModelTest : ViewModelTest() {
     }
 
     @Test
-    fun `is security enforced enabled device protection device secure - ok - true`() {
+    fun `is security enforced enabled device protection device secure - ok - false`() {
         every { isDeviceSecure() } returns true
         every { mdmProvider.getBrandingBoolean(any(), R.bool.device_protection) } returns true
         every { mdmProvider.getBrandingInteger(any(), R.integer.lock_enforced) } returns LockEnforcedType.EITHER_ENFORCED.ordinal
 
         val result = securityViewModel.isSecurityEnforcedEnabled()
-        assertTrue(result)
+        assertFalse(result)
 
     }
 
@@ -163,16 +163,6 @@ class SettingsSecurityViewModelTest : ViewModelTest() {
         assertFalse(result)
     }
 
-    @Test
-    fun `is security enforced enabled device protection device secure - ok - false`() {
-        every { isDeviceSecure() } returns true
-        every { mdmProvider.getBrandingBoolean(any(), R.bool.device_protection) } returns true
-        every { mdmProvider.getBrandingInteger(any(), R.integer.lock_enforced) } returns LockEnforcedType.EITHER_ENFORCED.ordinal
-
-        val result = securityViewModel.isSecurityEnforcedEnabled()
-        assertFalse(result)
-    }
-
     @Test
     fun `is security enforced enabled no device protection device no secure - ok - false`() {
         every { isDeviceSecure() } returns false