Moved test utility classes into test package.

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogController.java

@@ -2,7 +2,6 @@ package org.briarproject.briar.android.blog;
 
 import android.support.annotation.UiThread;
 
-import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java

@@ -2,9 +2,6 @@ package org.briarproject.briar.android.blog;
 
 import android.os.Bundle;
 import android.support.annotation.UiThread;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
@@ -13,7 +10,6 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
 
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 @UiThread

briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java

@@ -4,7 +4,6 @@ import android.support.annotation.UiThread;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.android.DestroyableContext;
 
 import java.util.Collection;

briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java

@@ -1,7 +1,6 @@
 package org.briarproject.briar.android.controller;
 
 import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;

briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java

@@ -35,7 +35,7 @@ public class SetupActivity extends BaseActivity implements OnClickListener,
 		OnEditorActionListener {
 
 	@Inject
-	protected SetupController setupController;
+	SetupController setupController;
 
 	private TextInputLayout nicknameEntryWrapper;
 	private TextInputLayout passwordEntryWrapper;

briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java

@@ -9,7 +9,6 @@ import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.api.forum.ForumSharingManager;
 
 import java.util.Collection;
-import java.util.HashSet;
 
 import javax.inject.Inject;
 

briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java

@@ -8,7 +8,6 @@ import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.briar.R;
 import org.briarproject.briar.android.contactselection.ContactSelectorActivity;
 import org.briarproject.briar.android.sharing.BaseMessageFragment.MessageFragmentListener;
 

briar-android/src/test/java/org/briarproject/briar/android/TestSetupActivity.java

@@ -1,19 +0,0 @@
-package org.briarproject.briar.android;
-
-import org.briarproject.briar.android.login.SetupActivity;
-import org.briarproject.briar.android.login.SetupController;
-
-/**
- * This class exposes the SetupController and offers the possibility to
- * override it.
- */
-public class TestSetupActivity extends SetupActivity {
-
-	public SetupController getController() {
-		return setupController;
-	}
-
-	public void setController(SetupController setupController) {
-		this.setupController = setupController;
-	}
-}

briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java

@@ -4,11 +4,11 @@ import android.content.Intent;
 
 import junit.framework.Assert;
 
-import org.briarproject.bramble.TestUtils;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.android.TestBriarApplication;
 import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;

briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android;
+package org.briarproject.briar.android.login;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,9 +12,8 @@ import com.google.common.base.Strings;
 import org.briarproject.bramble.api.identity.AuthorConstants;
 import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.TestBriarApplication;
 import org.briarproject.briar.android.controller.handler.ResultHandler;
-import org.briarproject.briar.android.login.SetupController;
-import org.briarproject.briar.android.login.StrengthMeter;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 import org.junit.Assert;
 import org.junit.Before;

briar-android/src/test/java/org/briarproject/briar/android/login/TestSetupActivity.java

@@ -0,0 +1,16 @@
+package org.briarproject.briar.android.login;
+
+/**
+ * This class exposes the SetupController and offers the possibility to
+ * override it.
+ */
+public class TestSetupActivity extends SetupActivity {
+
+	SetupController getController() {
+		return setupController;
+	}
+
+	void setController(SetupController setupController) {
+		this.setupController = setupController;
+	}
+}