From e60df3cece5d48a439f28885cc1bc26567498d4a Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 12 Sep 2018 13:44:56 -0300 Subject: [PATCH] Don't crash when creating test data with 0 contacts If no contacts exist, at least one will be created --- .../briarproject/briar/test/TestDataCreatorImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java b/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java index 811f3a351..b58b28b64 100644 --- a/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java @@ -116,9 +116,6 @@ public class TestDataCreatorImpl implements TestDataCreator { @Override public void createTestData(int numContacts, int numPrivateMsgs, int numBlogPosts, int numForums, int numForumPosts) { - if (numContacts == 0) - throw new IllegalArgumentException( - "Number of contacts must be >= 1"); ioExecutor.execute(() -> { try { createTestDataOnIoExecutor(numContacts, numPrivateMsgs, @@ -133,7 +130,13 @@ public class TestDataCreatorImpl implements TestDataCreator { private void createTestDataOnIoExecutor(int numContacts, int numPrivateMsgs, int numBlogPosts, int numForums, int numForumPosts) throws DbException { - List contacts = createContacts(numContacts); + List contacts; + if (numContacts == 0) { + contacts = new ArrayList<>(contactManager.getActiveContacts()); + if (contacts.isEmpty()) contacts = createContacts(1); + } else { + contacts = createContacts(numContacts); + } createPrivateMessages(contacts, numPrivateMsgs); createBlogPosts(contacts, numBlogPosts); List forums = createForums(contacts, numForums, numForumPosts);