Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

interlude

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-04-29 11:47:50 +02:00
parent adb7d37f86
commit 8bb1d444c6
7 changed files with 72 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
briar-android/test/java/briarproject/activity/SetupActivityTest.java
View File

@@ -4,20 +4,29 @@ import android.support.design.widget.TextInputLayout;
import android.widget.Button;
import android.widget.EditText;
import com.google.common.base.Strings;
import org.briarproject.BuildConfig;
import org.briarproject.R;
import org.briarproject.android.ActivityModule;
import org.briarproject.android.SetupActivity;
import org.briarproject.android.controller.SetupController;
import org.briarproject.android.controller.SetupControllerImp;
import org.briarproject.android.util.StrengthMeter;
import org.briarproject.api.crypto.PasswordStrengthEstimator;
import org.briarproject.api.identity.AuthorConstants;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricGradleTestRunner;
import org.robolectric.annotation.Config;
import static junit.framework.Assert.assertEquals;
@RunWith(RobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 22)
@Config(constants = BuildConfig.class, sdk = 21)
public class SetupActivityTest {
private SetupActivity setupActivity;
@@ -34,7 +43,22 @@ public class SetupActivityTest {
@Override
protected ActivityModule getActivityModule() {
return super.getActivityModule();
return new ActivityModule(this) {
@Override
protected SetupController provideSetupController(
SetupControllerImp setupControllerImp) {
SetupController setupController =
Mockito.mock(SetupControllerImp.class);
Mockito.when(
setupController.estimatePasswordStrength("strong"))
.thenReturn(PasswordStrengthEstimator.STRONG);
// Mockito.when(
// setupController.estimatePasswordStrength("qstrong"))
// .thenReturn(PasswordStrengthEstimator.QUITE_STRONG);
return setupController;
}
};
}
}
@@ -57,13 +81,23 @@ public class SetupActivityTest {
(StrengthMeter) setupActivity.findViewById(R.id.strength_meter);
createAccountButton =
(Button) setupActivity.findViewById(R.id.create_account);
}
@Test
public void test() {
String longNick =
Strings.padEnd("*", AuthorConstants.MAX_AUTHOR_NAME_LENGTH + 1,
'*');
nicknameEntry.setText(longNick);
assertEquals(nicknameEntryWrapper.getError(),
setupActivity.getString(R.string.name_too_long));
passwordEntry.setText("strong");
assertEquals(strengthMeter.getProgress(),
strengthMeter.getMax() * PasswordStrengthEstimator.STRONG);
// passwordEntry.setText("strong");
// assertEquals(StrengthMeter.GREEN, strengthMeter.getColor());
// setupActivity.
}
}

19
briar-android/test/java/briarproject/activity/TestActivityModule.java
View File

@@ -1,19 +0,0 @@
package briarproject.activity;
import org.briarproject.android.ActivityModule;
import org.briarproject.android.BaseActivity;
public class TestActivityModule extends ActivityModule {
public TestActivityModule(BaseActivity activity) {
super(activity);
}
/*
@Override
protected SetupController provideSetupController(
SetupControllerImp setupControllerImp) {
}
*/
}