Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Upgrade mailbox-lib and refactor to match new API

Browse Source
This commit is contained in:
Sebastian Kürten
2022-09-28 11:33:57 +02:00
parent f38f8afc5c
commit 867703c774
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-mailbox

Submodule briar-mailbox updated: f31269f25b...7a48ccc1b8

5
mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/MailboxApiIntegrationTest.java
View File

@@ -12,6 +12,7 @@ import org.briarproject.bramble.mailbox.MailboxApi.MailboxFile;
import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException; import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException;
import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.BrambleTestCase;
import org.briarproject.mailbox.lib.Mailbox; import org.briarproject.mailbox.lib.Mailbox;
import org.briarproject.mailbox.lib.TestMailbox;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@@ -56,7 +57,7 @@ public class MailboxApiIntegrationTest extends BrambleTestCase {
@Before @Before
public void setUp() public void setUp()
throws IOException, ApiException, InvalidMailboxIdException { throws IOException, ApiException, InvalidMailboxIdException {
mailbox = new Mailbox(dataDirectory.getRoot()); mailbox = new TestMailbox(dataDirectory.getRoot());
mailbox.init(); mailbox.init();
mailbox.startLifecycle(); mailbox.startLifecycle();
@@ -70,7 +71,7 @@ public class MailboxApiIntegrationTest extends BrambleTestCase {
@After @After
public void tearDown() { public void tearDown() {
mailbox.stopLifecycle(); mailbox.stopLifecycle(true);
} }
@Test @Test

5
mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerIntegrationTest.java
View File

@@ -16,6 +16,7 @@ import org.briarproject.bramble.api.mailbox.MailboxProperties;
import org.briarproject.bramble.mailbox.MailboxApi.ApiException; import org.briarproject.bramble.mailbox.MailboxApi.ApiException;
import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.BrambleTestCase;
import org.briarproject.mailbox.lib.Mailbox; import org.briarproject.mailbox.lib.Mailbox;
import org.briarproject.mailbox.lib.TestMailbox;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@@ -68,7 +69,7 @@ public class OwnMailboxContactListWorkerIntegrationTest
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
mailbox = new Mailbox(mailboxDataDirectory.getRoot()); mailbox = new TestMailbox(mailboxDataDirectory.getRoot());
mailbox.init(); mailbox.init();
mailbox.startLifecycle(); mailbox.startLifecycle();
@@ -97,7 +98,7 @@ public class OwnMailboxContactListWorkerIntegrationTest
@After @After
public void tearDown() { public void tearDown() {
mailbox.stopLifecycle(); mailbox.stopLifecycle(true);
} }
private Identity setUp(MailboxIntegrationTestComponent device, String name) private Identity setUp(MailboxIntegrationTestComponent device, String name)