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

Moved briar-android tests into their respective packages.

Browse Source
This commit is contained in:
akwizgran
2016-08-03 13:46:30 +01:00
parent 9a32a13767
commit 4a4366078a
7 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/test/java/briarproject/activity/ChangePasswordActivityTest.java → briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java
View File

@@ -1,7 +1,6 @@
package briarproject.activity;
package org.briarproject.android;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.support.design.widget.TextInputLayout;
import android.widget.Button;
@@ -9,7 +8,6 @@ import android.widget.EditText;
import org.briarproject.BuildConfig;
import org.briarproject.R;
import org.briarproject.android.SettingsActivity;
import org.briarproject.android.controller.PasswordController;
import org.briarproject.android.controller.SetupController;
import org.briarproject.android.controller.handler.ResultHandler;
@@ -26,7 +24,6 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricGradleTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity;
import static junit.framework.Assert.assertEquals;
import static org.briarproject.api.crypto.PasswordStrengthEstimator.NONE;
@@ -43,7 +40,6 @@ import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
@RunWith(RobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 21,

3
briar-android/test/java/briarproject/activity/SetupActivityTest.java → briar-android/test/java/org/briarproject/android/SetupActivityTest.java
View File

@@ -1,4 +1,4 @@
package briarproject.activity;
package org.briarproject.android;
import android.content.Context;
import android.content.Intent;
@@ -11,7 +11,6 @@ import com.google.common.base.Strings;
import org.briarproject.BuildConfig;
import org.briarproject.R;
import org.briarproject.android.NavDrawerActivity;
import org.briarproject.android.controller.SetupController;
import org.briarproject.android.controller.handler.ResultHandler;
import org.briarproject.android.util.StrengthMeter;

7
briar-android/test/java/briarproject/activity/TestBriarApplication.java → briar-android/test/java/org/briarproject/android/TestBriarApplication.java
View File

@@ -1,13 +1,8 @@
package briarproject.activity;
package org.briarproject.android;
import android.app.Application;
import org.briarproject.CoreModule;
import org.briarproject.android.AndroidComponent;
import org.briarproject.android.AndroidEagerSingletons;
import org.briarproject.android.AppModule;
import org.briarproject.android.BriarApplication;
import org.briarproject.android.DaggerAndroidComponent;
import java.util.logging.Logger;

4
briar-android/test/java/briarproject/activity/TestChangePasswordActivity.java → briar-android/test/java/org/briarproject/android/TestChangePasswordActivity.java
View File

@@ -1,7 +1,5 @@
package briarproject.activity;
package org.briarproject.android;
import org.briarproject.android.ChangePasswordActivity;
import org.briarproject.android.SetupActivity;
import org.briarproject.android.controller.PasswordController;
import org.briarproject.android.controller.SetupController;

3
briar-android/test/java/briarproject/activity/TestSetupActivity.java → briar-android/test/java/org/briarproject/android/TestSetupActivity.java
View File

@@ -1,6 +1,5 @@
package briarproject.activity;
package org.briarproject.android;
import org.briarproject.android.SetupActivity;
import org.briarproject.android.controller.SetupController;
/**

6
briar-android/test/java/briarproject/activity/ForumActivityTest.java → briar-android/test/java/org/briarproject/android/forum/ForumActivityTest.java
View File

@@ -1,4 +1,4 @@
package briarproject.activity;
package org.briarproject.android.forum;
import android.content.Intent;
@@ -6,10 +6,8 @@ import junit.framework.Assert;
import org.briarproject.BuildConfig;
import org.briarproject.TestUtils;
import org.briarproject.android.TestBriarApplication;
import org.briarproject.android.controller.handler.UiResultHandler;
import org.briarproject.android.forum.ForumActivity;
import org.briarproject.android.forum.ForumController;
import org.briarproject.android.forum.ForumEntry;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorId;
import org.briarproject.api.sync.GroupId;

5
briar-android/test/java/briarproject/activity/TestForumActivity.java → briar-android/test/java/org/briarproject/android/forum/TestForumActivity.java
View File

@@ -1,11 +1,8 @@
package briarproject.activity;
package org.briarproject.android.forum;
import org.briarproject.android.ActivityModule;
import org.briarproject.android.controller.BriarController;
import org.briarproject.android.controller.BriarControllerImpl;
import org.briarproject.android.forum.ForumActivity;
import org.briarproject.android.forum.ForumController;
import org.briarproject.android.forum.ForumControllerImpl;
import org.mockito.Mockito;
/**