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

fix test & review comments

Browse source 
Signed-off-by: Jens Mueller <tschenser@gmx.de>
This commit is contained in:
Jens Mueller 2019-04-17 20:49:54 +02:00
parent d8b9d109b1
commit 8bb654b5ef
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/test/java/com/owncloud/android/utils/ErrorMessageAdapterUnitTest.java → src/androidTest/java/com/owncloud/android/util/ErrorMessageAdapterUnitTest.java
View file

@ -19,7 +19,7 @@
*/ */
package com.owncloud.android.utils; package com.owncloud.android.util;
import android.accounts.Account; import android.accounts.Account;
import android.content.res.Resources; import android.content.res.Resources;
@ -28,6 +28,7 @@ import com.owncloud.android.MainApp;
import com.owncloud.android.R; import com.owncloud.android.R;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.operations.RemoveFileOperation;
import com.owncloud.android.utils.ErrorMessageAdapter;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -63,9 +64,9 @@ public class ErrorMessageAdapterUnitTest {
@Test @Test
public void getErrorCauseMessageForForbiddenRemoval() { public void getErrorCauseMessageForForbiddenRemoval() {
// Given a mocked set of resources passed to the object under test... // Given a mocked set of resources passed to the object under test...
when(mMockResources.getString(R.string.forbidden_permissions)) Mockito.when(mMockResources.getString(R.string.forbidden_permissions))
.thenReturn(MOCK_FORBIDDEN_PERMISSIONS); .thenReturn(MOCK_FORBIDDEN_PERMISSIONS);
when(mMockResources.getString(R.string.forbidden_permissions_delete)) Mockito.when(mMockResources.getString(R.string.forbidden_permissions_delete))
.thenReturn(MOCK_TO_DELETE); .thenReturn(MOCK_TO_DELETE);
Account account = new Account("name", ACCOUNT_TYPE); Account account = new Account("name", ACCOUNT_TYPE);

2
src/test/java/com/owncloud/android/utils/TestSorting.java → src/androidTest/java/com/owncloud/android/util/TestSorting.java
View file

@ -1,4 +1,4 @@
package com.owncloud.android.utils; package com.owncloud.android.util;
import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.datamodel.OCFile;

2
src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
View file

@ -140,7 +140,7 @@ public class RenameFileDialogFragment
((TextView)(getDialog().findViewById(R.id.user_input))) ((TextView)(getDialog().findViewById(R.id.user_input)))
.getText().toString().trim(); .getText().toString().trim();
if (TextUtils.isEmpty((newFileName))) { if (TextUtils.isEmpty(newFileName)) {
DisplayUtils.showSnackMessage(getActivity(), R.string.filename_empty); DisplayUtils.showSnackMessage(getActivity(), R.string.filename_empty);
return; return;
} }