Ignore tests if Dropbox isn't enabled, and explain in README

Author: artbristol

README.org

@@ -23,7 +23,7 @@ http://orgmode.org for more information.
 </a>
 #+END_HTML
 
-** Documentation
+** End-user documentation
 
 Find out more here: https://github.com/orgzly/documentation
 
@@ -38,6 +38,13 @@ example:
 
 Make sure you [[https://developer.android.com/training/testing/espresso/setup][turn off animations]] for the device you're testing on.
 
+Java 8 is required for command line usage. Later versions are currently not compatible.
+
+*** Dropbox
+
+Dropbox integration, and associated tests, are disabled in the default configuration.
+To enable, follow the instructions in sample.app.properties.
+
 ** License
 
 The project is licensed under the [[https://github.com/orgzly/orgzly-android/blob/master/LICENSE][GNU General Public License version 3 (or newer)]].

app/src/androidTest/java/com/orgzly/android/espresso/MiscTest.java

@@ -7,6 +7,7 @@
 
 import androidx.test.rule.ActivityTestRule;
 
+import com.orgzly.test.BuildConfig;
 import com.orgzly.R;
 import com.orgzly.android.OrgzlyTest;
 import com.orgzly.android.db.entity.NotePosition;
@@ -15,6 +16,7 @@
 import com.orgzly.android.ui.repos.ReposActivity;
 
 import org.hamcrest.Matcher;
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -478,6 +480,8 @@ public void testMainActivityFragments() {
 
     @Test
     public void testReposActivityFragments() {
+        Assume.assumeTrue(BuildConfig.IS_DROPBOX_ENABLED);
+
         ActivityTestRule rule = new EspressoActivityTestRule<>(ReposActivity.class);
 
         testUtils.setupRepo(RepoType.DIRECTORY, "file:/");

app/src/androidTest/java/com/orgzly/android/espresso/ReposActivityTest.java

@@ -2,10 +2,12 @@
 
 import androidx.test.rule.ActivityTestRule;
 
+import com.orgzly.test.BuildConfig;
 import com.orgzly.R;
 import com.orgzly.android.OrgzlyTest;
 import com.orgzly.android.ui.repos.ReposActivity;
 
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -59,6 +61,8 @@ public void testDirectoryRepoWithPercentCharacter() {
 
     @Test
     public void testDropboxRepoWithPercentCharacter() {
+        Assume.assumeTrue(BuildConfig.IS_DROPBOX_ENABLED);
+
         String localDir = "/Documents/user@host%2Fdir";
 
         activityRule.launchActivity(null);

app/src/androidTest/java/com/orgzly/android/espresso/SyncingTest.java

@@ -14,8 +14,10 @@
 import com.orgzly.android.sync.BookSyncStatus;
 import com.orgzly.android.sync.SyncService;
 import com.orgzly.android.ui.main.MainActivity;
+import com.orgzly.test.BuildConfig;
 
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -562,6 +564,8 @@ public void testEncodingAfterSyncSaving() {
 
     @Test
     public void testSettingLinkToRenamedRepo() {
+        Assume.assumeTrue(BuildConfig.IS_DROPBOX_ENABLED);
+
         Repo repo = testUtils.setupRepo(RepoType.MOCK, "mock://repo-a");
         testUtils.setupRook(repo, "mock://repo-a/booky.org", "Täht", "1abcde", 1400067156000L);
         activityRule.launchActivity(null);
@@ -616,6 +620,8 @@ public void testSettingLinkToRenamedRepo() {
 
     @Test
     public void testRenamingReposRemovesLinksWhatUsedThem() {
+        Assume.assumeTrue(BuildConfig.IS_DROPBOX_ENABLED);
+
         testUtils.setupRepo(RepoType.MOCK, "mock://repo-a");
         testUtils.setupRepo(RepoType.MOCK, "mock://repo-b");
         testUtils.setupBook("booky", "");

app/src/androidTest/java/com/orgzly/android/repos/DropboxRepoTest.java

@@ -7,6 +7,7 @@
 import com.orgzly.android.prefs.AppPreferences;
 import com.orgzly.android.util.MiscUtils;
 
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -24,6 +25,7 @@ public class DropboxRepoTest extends OrgzlyTest {
     @Before
     public void setUp() throws Exception {
         super.setUp();
+        Assume.assumeTrue(com.orgzly.test.BuildConfig.IS_DROPBOX_ENABLED);
 
         AppPreferences.dropboxToken(context, BuildConfig.DROPBOX_TOKEN);
     }

app/src/androidTest/java/com/orgzly/android/repos/RepoFactoryTest.java

@@ -2,6 +2,7 @@
 
 import com.orgzly.android.OrgzlyTest;
 
+import org.junit.Assume;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -12,13 +13,17 @@ public class RepoFactoryTest extends OrgzlyTest {
 
     @Test
     public void testCreateRepoFromUrl1() {
+        Assume.assumeTrue(com.orgzly.test.BuildConfig.IS_DROPBOX_ENABLED);
+
         SyncRepo repo = testUtils.repoInstance(RepoType.DROPBOX, "dropbox:");
         assertTrue(repo instanceof DropboxRepo);
         assertEquals("dropbox:", repo.getUri().toString());
     }
 
     @Test
     public void testCreateRepoFromUrl2() {
+        Assume.assumeTrue(com.orgzly.test.BuildConfig.IS_DROPBOX_ENABLED);
+
         SyncRepo repo = testUtils.repoInstance(RepoType.DROPBOX, "dropbox:/path");
         assertTrue(repo instanceof DropboxRepo);
         assertEquals("dropbox:/path", repo.getUri().toString());

app/src/main/java/com/orgzly/android/ui/repos/ReposActivity.kt

@@ -24,6 +24,7 @@ import com.orgzly.android.ui.repo.directory.DirectoryRepoActivity
 import com.orgzly.android.ui.repo.dropbox.DropboxRepoActivity
 import com.orgzly.android.ui.repo.git.GitRepoActivity
 import com.orgzly.android.ui.repo.webdav.WebdavRepoActivity
+import com.orgzly.android.util.LogUtils
 import com.orgzly.databinding.ActivityReposBinding
 import javax.inject.Inject
 

sample.app.properties

@@ -1,7 +1,7 @@
 # You should copy this file to "app.properties" which is required by build.
 #
 # If you don't modify the values below, you will still be able to run the app.
-# Some tests will fail and you won't be able to use Dropbox as a repository,
+# Some tests will be ignored and you won't be able to use Dropbox as a repository,
 # but everything else should be working fine.
 
 # Token used by few tests which use Dropbox.