From 867703c77443eec7d1d660d9fdcf0dcc9f07fc2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Wed, 28 Sep 2022 11:33:57 +0200
Subject: [PATCH] Upgrade mailbox-lib and refactor to match new API
---
briar-mailbox | 2 +-
.../bramble/mailbox/MailboxApiIntegrationTest.java | 5 +++--
.../mailbox/OwnMailboxContactListWorkerIntegrationTest.java | 5 +++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/briar-mailbox b/briar-mailbox
index f31269f25b..7a48ccc1b8 160000
--- a/briar-mailbox
+++ b/briar-mailbox
@@ -1 +1 @@
-Subproject commit f31269f25be859690217ad49ee0a46ed1482d32b
+Subproject commit 7a48ccc1b8ab6fd306ef71c7e6960735b3595873
diff --git a/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/MailboxApiIntegrationTest.java b/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/MailboxApiIntegrationTest.java
index 32f29aef6d..38ef74338c 100644
--- a/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/MailboxApiIntegrationTest.java
+++ b/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/MailboxApiIntegrationTest.java
@@ -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
diff --git a/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerIntegrationTest.java b/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerIntegrationTest.java
index 6f7fdfce82..7c46bb703f 100644
--- a/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerIntegrationTest.java
+++ b/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerIntegrationTest.java
@@ -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)
--
GitLab