Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 06:39:54 +01:00
Code Issues Projects Releases Wiki Activity

prevent crash in testDataCreator when blogs or forums are not enabled in core

Browse Source
This commit is contained in:
ialokim
2022-10-25 10:47:03 +02:00
parent bc9c4c9e3f
commit 53c7c81c0f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.test; package org.briarproject.briar.test;
import org.briarproject.bramble.api.FeatureFlags;
import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.FormatException;
import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactId;
@@ -91,6 +92,8 @@ public class TestDataCreatorImpl implements TestDataCreator {
private final TestAvatarCreator testAvatarCreator; private final TestAvatarCreator testAvatarCreator;
private final AvatarMessageEncoder avatarMessageEncoder; private final AvatarMessageEncoder avatarMessageEncoder;
private final FeatureFlags featureFlags;
@IoExecutor @IoExecutor
private final Executor ioExecutor; private final Executor ioExecutor;
@@ -110,6 +113,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
ForumManager forumManager, ForumManager forumManager,
TestAvatarCreator testAvatarCreator, TestAvatarCreator testAvatarCreator,
AvatarMessageEncoder avatarMessageEncoder, AvatarMessageEncoder avatarMessageEncoder,
FeatureFlags featureFlags,
@IoExecutor Executor ioExecutor) { @IoExecutor Executor ioExecutor) {
this.authorFactory = authorFactory; this.authorFactory = authorFactory;
this.clock = clock; this.clock = clock;
@@ -126,6 +130,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
this.forumManager = forumManager; this.forumManager = forumManager;
this.testAvatarCreator = testAvatarCreator; this.testAvatarCreator = testAvatarCreator;
this.avatarMessageEncoder = avatarMessageEncoder; this.avatarMessageEncoder = avatarMessageEncoder;
this.featureFlags = featureFlags;
this.ioExecutor = ioExecutor; this.ioExecutor = ioExecutor;
} }
@@ -381,6 +386,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
private void createBlogPosts(List<Contact> contacts, int numBlogPosts) private void createBlogPosts(List<Contact> contacts, int numBlogPosts)
throws DbException { throws DbException {
if (!featureFlags.shouldEnableBlogsInCore()) return;
LocalAuthor localAuthor = identityManager.getLocalAuthor(); LocalAuthor localAuthor = identityManager.getLocalAuthor();
Blog ours = blogManager.getPersonalBlog(localAuthor); Blog ours = blogManager.getPersonalBlog(localAuthor);
for (Contact contact : contacts) { for (Contact contact : contacts) {
@@ -415,6 +421,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
private List<Forum> createForums(List<Contact> contacts, int numForums) private List<Forum> createForums(List<Contact> contacts, int numForums)
throws DbException { throws DbException {
if (!featureFlags.shouldEnableForumsInCore()) return emptyList();
List<Forum> forums = new ArrayList<>(numForums); List<Forum> forums = new ArrayList<>(numForums);
for (int i = 0; i < numForums; i++) { for (int i = 0; i < numForums; i++) {
// create forum // create forum