Merge branch 'upgrade_roboletric_to_401' into 'master'

Upgrade robolectric to 4.0.1

See merge request briar/briar!980
This commit is contained in:
akwizgran
2018-11-08 11:00:08 +00:00
7 changed files with 16 additions and 23 deletions

View File

@@ -36,8 +36,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(RobolectricTestRunner.class)
@Config(sdk = 21, application = TestBriarApplication.class,
packageName = "org.briarproject.briar")
@Config(sdk = 21, application = TestBriarApplication.class)
public class ForumActivityTest {
private final static MessageId[] MESSAGE_IDS = new MessageId[6];

View File

@@ -33,8 +33,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(RobolectricTestRunner.class)
@Config(sdk = 21, application = TestBriarApplication.class,
packageName = "org.briarproject.briar")
@Config(sdk = 21, application = TestBriarApplication.class)
public class ChangePasswordActivityTest {
private TestChangePasswordActivity changePasswordActivity;

View File

@@ -28,8 +28,7 @@ import static org.mockito.Mockito.when;
import static org.robolectric.shadows.support.v4.SupportFragmentTestUtil.startFragment;
@RunWith(RobolectricTestRunner.class)
@Config(sdk = 21, application = TestBriarApplication.class,
packageName = "org.briarproject.briar")
@Config(sdk = 21, application = TestBriarApplication.class)
public class PasswordFragmentTest {
private PasswordFragment passwordFragment = new PasswordFragment();

View File

@@ -19,8 +19,7 @@ import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_N
import static org.briarproject.bramble.util.StringUtils.getRandomString;
@RunWith(RobolectricTestRunner.class)
@Config(sdk = 21, application = TestBriarApplication.class,
packageName = "org.briarproject.briar")
@Config(sdk = 21, application = TestBriarApplication.class)
public class SetupActivityTest {
private SetupActivity setupActivity;