From 4ca286b28ec16ff0a6adbefcfee300537c2b9d71 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 19 Mar 2021 14:24:19 -0300 Subject: [PATCH] Allow to decide whether test contacts should have alias --- .../briarproject/briar/android/SetupDataTest.java | 2 +- .../briar/api/test/TestDataCreator.java | 3 ++- .../briar/test/TestDataCreatorImpl.java | 13 +++++++------ .../contact/ContactControllerIntegrationTest.kt | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java index f40c70aef..04e5a854e 100644 --- a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java +++ b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java @@ -116,7 +116,7 @@ public class SetupDataTest extends ScreenshotTest { throws DbException { Context ctx = getApplicationContext(); String bobName = ctx.getString(R.string.screenshot_bob); - Contact bob = testDataCreator.addContact(bobName, true); + Contact bob = testDataCreator.addContact(bobName, false, true); // TODO add messages diff --git a/briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java b/briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java index 0f8ebc2ff..b96100e0f 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java @@ -24,5 +24,6 @@ public interface TestDataCreator { int numBlogPosts, int numForums, int numForumPosts); @IoExecutor - Contact addContact(String name, boolean avatar) throws DbException; + Contact addContact(String name, boolean alias, boolean avatar) + throws DbException; } 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 e773d3195..987e4cc28 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 @@ -158,15 +158,15 @@ public class TestDataCreatorImpl implements TestDataCreator { LocalAuthor localAuthor = identityManager.getLocalAuthor(); for (int i = 0; i < numContacts; i++) { LocalAuthor remote = getRandomAuthor(); - Contact contact = - addContact(localAuthor.getId(), remote, avatarPercent); + Contact contact = addContact(localAuthor.getId(), remote, + random.nextBoolean(), avatarPercent); contacts.add(contact); } return contacts; } private Contact addContact(AuthorId localAuthorId, LocalAuthor remote, - int avatarPercent) throws DbException { + boolean alias, int avatarPercent) throws DbException { // prepare to add contact SecretKey secretKey = getSecretKey(); long timestamp = clock.currentTimeMillis(); @@ -179,7 +179,7 @@ public class TestDataCreatorImpl implements TestDataCreator { Contact contact = db.transactionWithResult(false, txn -> { ContactId contactId = contactManager.addContact(txn, remote, localAuthorId, secretKey, timestamp, true, verified, true); - if (random.nextBoolean()) { + if (alias) { contactManager.setContactAlias(txn, contactId, getRandomAuthorName()); } @@ -197,11 +197,12 @@ public class TestDataCreatorImpl implements TestDataCreator { } @Override - public Contact addContact(String name, boolean avatar) throws DbException { + public Contact addContact(String name, boolean alias, boolean avatar) + throws DbException { LocalAuthor localAuthor = identityManager.getLocalAuthor(); LocalAuthor remote = authorFactory.createLocalAuthor(name); int avatarPercent = avatar ? 100 : 0; - return addContact(localAuthor.getId(), remote, avatarPercent); + return addContact(localAuthor.getId(), remote, alias, avatarPercent); } private String getRandomAuthorName() { diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt index ee88dfce1..dca4e336d 100644 --- a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt +++ b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt @@ -25,7 +25,7 @@ class ContactControllerIntegrationTest: IntegrationTest() { // add one test contact val testContactName= "testContactName" - testDataCreator.addContact(testContactName, false) + testDataCreator.addContact(testContactName, true, false) // retrieve list with one test contact response = get("$url/contacts")