mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-11 18:29:05 +01:00
Upgrade mailbox-lib and refactor to match new API
This commit is contained in:
Submodule briar-mailbox updated: f31269f25b...7a48ccc1b8
@@ -12,6 +12,7 @@ import org.briarproject.bramble.mailbox.MailboxApi.MailboxFile;
|
||||
import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException;
|
||||
import org.briarproject.bramble.test.BrambleTestCase;
|
||||
import org.briarproject.mailbox.lib.Mailbox;
|
||||
import org.briarproject.mailbox.lib.TestMailbox;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
@@ -56,7 +57,7 @@ public class MailboxApiIntegrationTest extends BrambleTestCase {
|
||||
@Before
|
||||
public void setUp()
|
||||
throws IOException, ApiException, InvalidMailboxIdException {
|
||||
mailbox = new Mailbox(dataDirectory.getRoot());
|
||||
mailbox = new TestMailbox(dataDirectory.getRoot());
|
||||
mailbox.init();
|
||||
mailbox.startLifecycle();
|
||||
|
||||
@@ -70,7 +71,7 @@ public class MailboxApiIntegrationTest extends BrambleTestCase {
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
mailbox.stopLifecycle();
|
||||
mailbox.stopLifecycle(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -16,6 +16,7 @@ import org.briarproject.bramble.api.mailbox.MailboxProperties;
|
||||
import org.briarproject.bramble.mailbox.MailboxApi.ApiException;
|
||||
import org.briarproject.bramble.test.BrambleTestCase;
|
||||
import org.briarproject.mailbox.lib.Mailbox;
|
||||
import org.briarproject.mailbox.lib.TestMailbox;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
@@ -68,7 +69,7 @@ public class OwnMailboxContactListWorkerIntegrationTest
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
mailbox = new Mailbox(mailboxDataDirectory.getRoot());
|
||||
mailbox = new TestMailbox(mailboxDataDirectory.getRoot());
|
||||
mailbox.init();
|
||||
mailbox.startLifecycle();
|
||||
|
||||
@@ -97,7 +98,7 @@ public class OwnMailboxContactListWorkerIntegrationTest
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
mailbox.stopLifecycle();
|
||||
mailbox.stopLifecycle(true);
|
||||
}
|
||||
|
||||
private Identity setUp(MailboxIntegrationTestComponent device, String name)
|
||||
|
||||
Reference in New Issue
Block a user