mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 05:05:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9591 from nextcloud/fix/settings-activity-it

Browse source 
SettingsActivityIT: fix showMnemonic running on wrong thread
This commit is contained in:
Álvaro Brey 2022-01-07 09:40:06 +01:00 committed by GitHub
commit 3a72604a78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 84 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
src/androidTest/java/com/nextcloud/client/SettingsActivityIT.java
View file

@ -1,90 +0,0 @@
/*
*
* Nextcloud Android client application
*
* @author Tobias Kaminsky
* Copyright (C) 2019 Tobias Kaminsky
* Copyright (C) 2019 Nextcloud GmbH
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.nextcloud.client;
import android.app.Activity;
import android.content.Intent;
import android.os.Looper;
import com.owncloud.android.AbstractIT;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.ui.activity.RequestCredentialsActivity;
import com.owncloud.android.ui.activity.SettingsActivity;
import com.owncloud.android.utils.EncryptionUtils;
import com.owncloud.android.utils.ScreenshotTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
import androidx.test.espresso.intent.rule.IntentsTestRule;
import static org.junit.Assert.assertTrue;
public class SettingsActivityIT extends AbstractIT {
@Rule public IntentsTestRule<SettingsActivity> activityRule = new IntentsTestRule<>(SettingsActivity.class,
true,
false);
@Rule
public final TestRule permissionRule = GrantStoragePermissionRule.grant();
@Test
@ScreenshotTest
public void open() {
Activity sut = activityRule.launchActivity(null);
screenshot(sut);
}
@Test
@ScreenshotTest
public void showMnemonic_Error() {
SettingsActivity sut = activityRule.launchActivity(null);
sut.handleMnemonicRequest(null);
shortSleep();
waitForIdleSync();
screenshot(sut);
}
@Test
public void showMnemonic() {
if (Looper.myLooper() == null) {
Looper.prepare();
}
Intent intent = new Intent();
intent.putExtra(RequestCredentialsActivity.KEY_CHECK_RESULT, RequestCredentialsActivity.KEY_CHECK_RESULT_TRUE);
ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(targetContext.getContentResolver());
arbitraryDataProvider.storeOrUpdateKeyValue(user.getAccountName(), EncryptionUtils.MNEMONIC, "Secret mnemonic");
SettingsActivity sut = activityRule.launchActivity(null);
sut.handleMnemonicRequest(intent);
Looper.myLooper().quitSafely();
assertTrue(true); // if we reach this, everything is ok
}
}

84
src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt Normal file
View file

@ -0,0 +1,84 @@
/*
*
* Nextcloud Android client application
*
* @author Tobias Kaminsky
* Copyright (C) 2019 Tobias Kaminsky
* Copyright (C) 2019 Nextcloud GmbH
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.nextcloud.client
import android.app.Activity
import com.owncloud.android.AbstractIT
import androidx.test.espresso.intent.rule.IntentsTestRule
import com.owncloud.android.ui.activity.SettingsActivity
import android.os.Looper
import android.content.Intent
import com.owncloud.android.ui.activity.RequestCredentialsActivity
import com.owncloud.android.datamodel.ArbitraryDataProvider
import com.owncloud.android.utils.EncryptionUtils
import com.owncloud.android.utils.ScreenshotTest
import org.junit.Assert
import org.junit.Rule
import org.junit.Test
@Suppress("FunctionNaming")
class SettingsActivityIT : AbstractIT() {
@get:Rule
val activityRule = IntentsTestRule(
SettingsActivity::class.java,
true,
false
)
@get:Rule
val permissionRule = GrantStoragePermissionRule.grant()
@Test
@ScreenshotTest
fun open() {
val sut: Activity = activityRule.launchActivity(null)
screenshot(sut)
}
@Test
@ScreenshotTest
fun showMnemonic_Error() {
val sut = activityRule.launchActivity(null)
sut.handleMnemonicRequest(null)
shortSleep()
waitForIdleSync()
screenshot(sut)
}
@Test
fun showMnemonic() {
if (Looper.myLooper() == null) {
Looper.prepare()
}
val intent = Intent()
intent.putExtra(RequestCredentialsActivity.KEY_CHECK_RESULT, RequestCredentialsActivity.KEY_CHECK_RESULT_TRUE)
val arbitraryDataProvider = ArbitraryDataProvider(targetContext.contentResolver)
arbitraryDataProvider.storeOrUpdateKeyValue(user.accountName, EncryptionUtils.MNEMONIC, "Secret mnemonic")
val sut = activityRule.launchActivity(null)
sut.runOnUiThread {
sut.handleMnemonicRequest(intent)
}
Looper.myLooper()?.quitSafely()
Assert.assertTrue(true) // if we reach this, everything is ok
}
}