diff --git a/briar-android/test/java/briarproject/activity/ChangePasswordActivityTest.java b/briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java similarity index 97% rename from briar-android/test/java/briarproject/activity/ChangePasswordActivityTest.java rename to briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java index b7fb34821f924d9aa50cf5f27ecd28e745a90f8e..123616bc613d72734d88df572a94680060e3fb8e 100644 --- a/briar-android/test/java/briarproject/activity/ChangePasswordActivityTest.java +++ b/briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java @@ -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, diff --git a/briar-android/test/java/briarproject/activity/SetupActivityTest.java b/briar-android/test/java/org/briarproject/android/SetupActivityTest.java similarity index 99% rename from briar-android/test/java/briarproject/activity/SetupActivityTest.java rename to briar-android/test/java/org/briarproject/android/SetupActivityTest.java index ebd1120b2b24588ee10435123cde220fe24015da..1b84a05ae4533efa2885c2633609ae2133b0942f 100644 --- a/briar-android/test/java/briarproject/activity/SetupActivityTest.java +++ b/briar-android/test/java/org/briarproject/android/SetupActivityTest.java @@ -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; diff --git a/briar-android/test/java/briarproject/activity/TestBriarApplication.java b/briar-android/test/java/org/briarproject/android/TestBriarApplication.java similarity index 76% rename from briar-android/test/java/briarproject/activity/TestBriarApplication.java rename to briar-android/test/java/org/briarproject/android/TestBriarApplication.java index 9da4a6fe3a5a528a1a4a0bbd8f6a80725087891c..6250040a19b4964190b81147d38e84ee1d6cd262 100644 --- a/briar-android/test/java/briarproject/activity/TestBriarApplication.java +++ b/briar-android/test/java/org/briarproject/android/TestBriarApplication.java @@ -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; diff --git a/briar-android/test/java/briarproject/activity/TestChangePasswordActivity.java b/briar-android/test/java/org/briarproject/android/TestChangePasswordActivity.java similarity index 84% rename from briar-android/test/java/briarproject/activity/TestChangePasswordActivity.java rename to briar-android/test/java/org/briarproject/android/TestChangePasswordActivity.java index a5dc6669d99f3c26cb9244c32be02c72a02287c0..21d57e4fb3fd6133a9e2201ae83ca5265e2714dc 100644 --- a/briar-android/test/java/briarproject/activity/TestChangePasswordActivity.java +++ b/briar-android/test/java/org/briarproject/android/TestChangePasswordActivity.java @@ -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; diff --git a/briar-android/test/java/briarproject/activity/TestSetupActivity.java b/briar-android/test/java/org/briarproject/android/TestSetupActivity.java similarity index 83% rename from briar-android/test/java/briarproject/activity/TestSetupActivity.java rename to briar-android/test/java/org/briarproject/android/TestSetupActivity.java index 2b4b9d6a1fbbf1b92ca65ebe76a92d4d79007f41..bb4598752b3794a3c837261bf82d2efb236f98e5 100644 --- a/briar-android/test/java/briarproject/activity/TestSetupActivity.java +++ b/briar-android/test/java/org/briarproject/android/TestSetupActivity.java @@ -1,6 +1,5 @@ -package briarproject.activity; +package org.briarproject.android; -import org.briarproject.android.SetupActivity; import org.briarproject.android.controller.SetupController; /** diff --git a/briar-android/test/java/briarproject/activity/ForumActivityTest.java b/briar-android/test/java/org/briarproject/android/forum/ForumActivityTest.java similarity index 95% rename from briar-android/test/java/briarproject/activity/ForumActivityTest.java rename to briar-android/test/java/org/briarproject/android/forum/ForumActivityTest.java index bb6aeda39b100ff3f3fe93f77120548593e396fc..38f64c5b25241af34913ec05aa92559f324a3add 100644 --- a/briar-android/test/java/briarproject/activity/ForumActivityTest.java +++ b/briar-android/test/java/org/briarproject/android/forum/ForumActivityTest.java @@ -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; diff --git a/briar-android/test/java/briarproject/activity/TestForumActivity.java b/briar-android/test/java/org/briarproject/android/forum/TestForumActivity.java similarity index 83% rename from briar-android/test/java/briarproject/activity/TestForumActivity.java rename to briar-android/test/java/org/briarproject/android/forum/TestForumActivity.java index 9455ace7e9639dfca4eb22f5717903f21bb2bd5c..43dc8998567c3098157617530bb90771df729a1f 100644 --- a/briar-android/test/java/briarproject/activity/TestForumActivity.java +++ b/briar-android/test/java/org/briarproject/android/forum/TestForumActivity.java @@ -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; /**