Get the automated tests up and running again

* Fix the build.gradle file
* Use the correct VisibleForTesting class
* Fix the Android test setUp() logic
* Enable a test in DeliveryReceiptJobTest.java where the @Test anotation was missing

It should be noted that the tests in AttachmentDatabaseTest.java fail.

Fixes #3474
Closes #5882
This commit is contained in:
Niklas Wenzel
2016-11-03 17:36:45 +01:00
committed by Moxie Marlinspike
parent 3787551878
commit 0d493a3af9
12 changed files with 14 additions and 14 deletions

View File

@@ -6,7 +6,7 @@ import android.test.InstrumentationTestCase;
public class TextSecureTestCase extends InstrumentationTestCase {
@Override
public void setUp() throws Exception {
public void setUp() {
System.setProperty("dexmaker.dexcache", getInstrumentation().getTargetContext().getCacheDir().getPath());
}

View File

@@ -29,6 +29,7 @@ public class AttachmentDatabaseTest extends TextSecureTestCase {
@Override
public void setUp() {
super.setUp();
database = spy(DatabaseFactory.getAttachmentDatabase(getInstrumentation().getTargetContext()));
}

View File

@@ -16,7 +16,8 @@ public class CanonicalAddressDatabaseTest extends TextSecureTestCase {
private CanonicalAddressDatabase db;
public void setUp() throws Exception {
@Override
public void setUp() {
super.setUp();
this.db = CanonicalAddressDatabase.getInstance(getInstrumentation().getTargetContext());
}