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

Convert BriarIntegrationTest to use test reader and writer.

Browse Source
This commit is contained in:
akwizgran
2019-05-31 17:17:24 +01:00
parent f8d240a320
commit 85a1fd2caa
3 changed files with 68 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
View File

@@ -7,6 +7,7 @@ import org.briarproject.bramble.api.client.ClientHelper;
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;
import org.briarproject.bramble.api.contact.event.ContactAddedEvent; import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfDictionary;
import org.briarproject.bramble.api.data.BdfEntry; import org.briarproject.bramble.api.data.BdfEntry;
import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.BdfList;
@@ -37,10 +38,8 @@ import org.briarproject.briar.test.BriarIntegrationTest;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeoutException;
import static org.briarproject.bramble.test.TestPluginConfigModule.SIMPLEX_TRANSPORT_ID; import static org.briarproject.bramble.test.TestPluginConfigModule.SIMPLEX_TRANSPORT_ID;
import static org.briarproject.bramble.test.TestUtils.getAgreementPublicKey; import static org.briarproject.bramble.test.TestUtils.getAgreementPublicKey;
@@ -1009,13 +1008,12 @@ public class IntroductionIntegrationTest
// 0 and 1 remove and re-add each other // 0 and 1 remove and re-add each other
contactManager0.removeContact(contactId1From0); contactManager0.removeContact(contactId1From0);
contactManager1.removeContact(contactId0From1); contactManager1.removeContact(contactId0From1);
contactId1From0 = contactManager0 SecretKey rootKey0_1 = getSecretKey();
.addContact(author1, author0.getId(), getSecretKey(), contactId1From0 = contactManager0.addContact(author1, author0.getId(),
clock.currentTimeMillis(), true, true, true); rootKey0_1, clock.currentTimeMillis(), true, true, true);
contact1From0 = contactManager0.getContact(contactId1From0); contact1From0 = contactManager0.getContact(contactId1From0);
contactId0From1 = contactManager1 contactId0From1 = contactManager1.addContact(author0, author1.getId(),
.addContact(author0, author1.getId(), getSecretKey(), rootKey0_1, clock.currentTimeMillis(), false, true, true);
clock.currentTimeMillis(), true, true, true);
contact0From1 = contactManager1.getContact(contactId0From1); contact0From1 = contactManager1.getContact(contactId0From1);
// Sync initial client versioning updates and transport properties // Sync initial client versioning updates and transport properties
@@ -1044,8 +1042,7 @@ public class IntroductionIntegrationTest
assertTrue(listener1.requestReceived); assertTrue(listener1.requestReceived);
} }
private void testModifiedResponse(StateVisitor visitor) private void testModifiedResponse(StateVisitor visitor) throws Exception {
throws Exception {
addListeners(true, true); addListeners(true, true);
// make introduction // make introduction
@@ -1157,20 +1154,22 @@ public class IntroductionIntegrationTest
); );
} }
private void addTransportProperties() private void addTransportProperties() throws Exception {
throws DbException, IOException, TimeoutException {
TransportPropertyManager tpm0 = c0.getTransportPropertyManager(); TransportPropertyManager tpm0 = c0.getTransportPropertyManager();
TransportPropertyManager tpm1 = c1.getTransportPropertyManager(); TransportPropertyManager tpm1 = c1.getTransportPropertyManager();
TransportPropertyManager tpm2 = c2.getTransportPropertyManager(); TransportPropertyManager tpm2 = c2.getTransportPropertyManager();
tpm0.mergeLocalProperties(SIMPLEX_TRANSPORT_ID, getTransportProperties(2)); tpm0.mergeLocalProperties(SIMPLEX_TRANSPORT_ID,
getTransportProperties(2));
sync0To1(1, true); sync0To1(1, true);
sync0To2(1, true); sync0To2(1, true);
tpm1.mergeLocalProperties(SIMPLEX_TRANSPORT_ID, getTransportProperties(2)); tpm1.mergeLocalProperties(SIMPLEX_TRANSPORT_ID,
getTransportProperties(2));
sync1To0(1, true); sync1To0(1, true);
tpm2.mergeLocalProperties(SIMPLEX_TRANSPORT_ID, getTransportProperties(2)); tpm2.mergeLocalProperties(SIMPLEX_TRANSPORT_ID,
getTransportProperties(2));
sync2To0(1, true); sync2To0(1, true);
} }

122
briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
View File

@@ -9,6 +9,7 @@ import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.CryptoComponent;
import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.BdfList;
import org.briarproject.bramble.api.data.BdfStringUtils; import org.briarproject.bramble.api.data.BdfStringUtils;
import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DatabaseComponent;
@@ -23,11 +24,10 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.sync.MessageFactory;
import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.bramble.api.sync.SyncSession;
import org.briarproject.bramble.api.sync.SyncSessionFactory;
import org.briarproject.bramble.api.sync.event.MessageStateChangedEvent; import org.briarproject.bramble.api.sync.event.MessageStateChangedEvent;
import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.Clock;
import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.test.TestTransportConnectionReader;
import org.briarproject.bramble.test.TestTransportConnectionWriter;
import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.test.TestUtils;
import org.briarproject.briar.api.blog.BlogFactory; import org.briarproject.briar.api.blog.BlogFactory;
import org.briarproject.briar.api.blog.BlogPostFactory; import org.briarproject.briar.api.blog.BlogPostFactory;
@@ -43,10 +43,8 @@ import org.junit.Before;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -56,11 +54,12 @@ import javax.inject.Inject;
import static java.util.concurrent.Executors.newSingleThreadExecutor; import static java.util.concurrent.Executors.newSingleThreadExecutor;
import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger;
import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNotNull;
import static org.briarproject.bramble.api.sync.validation.MessageState.DELIVERED; import static org.briarproject.bramble.api.sync.validation.MessageState.DELIVERED;
import static org.briarproject.bramble.api.sync.validation.MessageState.INVALID; import static org.briarproject.bramble.api.sync.validation.MessageState.INVALID;
import static org.briarproject.bramble.api.sync.validation.MessageState.PENDING; import static org.briarproject.bramble.api.sync.validation.MessageState.PENDING;
import static org.briarproject.bramble.test.TestPluginConfigModule.MAX_LATENCY; import static org.briarproject.bramble.test.TestPluginConfigModule.SIMPLEX_TRANSPORT_ID;
import static org.briarproject.bramble.test.TestUtils.getSecretKey; import static org.briarproject.bramble.test.TestUtils.getSecretKey;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@@ -73,9 +72,12 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
extends BriarTestCase { extends BriarTestCase {
private static final Logger LOG = private static final Logger LOG =
Logger.getLogger(BriarIntegrationTest.class.getName()); getLogger(BriarIntegrationTest.class.getName());
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
protected final static int TIMEOUT = 15000;
@Nullable @Nullable
protected ContactId contactId1From2, contactId2From1; protected ContactId contactId1From2, contactId2From1;
protected ContactId contactId0From1, contactId0From2, contactId1From0, protected ContactId contactId0From1, contactId0From2, contactId1From0,
@@ -91,7 +93,9 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
private LifecycleManager lifecycleManager0, lifecycleManager1, private LifecycleManager lifecycleManager0, lifecycleManager1,
lifecycleManager2; lifecycleManager2;
private SyncSessionFactory sync0, sync1, sync2; private SecretKey rootKey0_1 = getSecretKey();
private SecretKey rootKey0_2 = getSecretKey();
private SecretKey rootKey1_2 = getSecretKey();
@Inject @Inject
protected Clock clock; protected Clock clock;
@@ -120,7 +124,6 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
private volatile Waiter validationWaiter; private volatile Waiter validationWaiter;
private volatile Waiter deliveryWaiter; private volatile Waiter deliveryWaiter;
protected final static int TIMEOUT = 15000;
protected C c0, c1, c2; protected C c0, c1, c2;
private final Semaphore messageSemaphore = new Semaphore(0); private final Semaphore messageSemaphore = new Semaphore(0);
@@ -151,9 +154,6 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
db0 = c0.getDatabaseComponent(); db0 = c0.getDatabaseComponent();
db1 = c1.getDatabaseComponent(); db1 = c1.getDatabaseComponent();
db2 = c2.getDatabaseComponent(); db2 = c2.getDatabaseComponent();
sync0 = c0.getSyncSessionFactory();
sync1 = c1.getSyncSessionFactory();
sync2 = c2.getSyncSessionFactory();
// initialize waiters fresh for each test // initialize waiters fresh for each test
validationWaiter = new Waiter(); validationWaiter = new Waiter();
@@ -251,21 +251,17 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
} }
protected void addDefaultContacts() throws Exception { protected void addDefaultContacts() throws Exception {
contactId1From0 = contactManager0 contactId1From0 = contactManager0.addContact(author1, author0.getId(),
.addContact(author1, author0.getId(), getSecretKey(), rootKey0_1, clock.currentTimeMillis(), true, true, true);
clock.currentTimeMillis(), true, true, true);
contact1From0 = contactManager0.getContact(contactId1From0); contact1From0 = contactManager0.getContact(contactId1From0);
contactId0From1 = contactManager1 contactId0From1 = contactManager1.addContact(author0, author1.getId(),
.addContact(author0, author1.getId(), getSecretKey(), rootKey0_1, clock.currentTimeMillis(), false, true, true);
clock.currentTimeMillis(), true, true, true);
contact0From1 = contactManager1.getContact(contactId0From1); contact0From1 = contactManager1.getContact(contactId0From1);
contactId2From0 = contactManager0 contactId2From0 = contactManager0.addContact(author2, author0.getId(),
.addContact(author2, author0.getId(), getSecretKey(), rootKey0_2, clock.currentTimeMillis(), true, true, true);
clock.currentTimeMillis(), true, true, true);
contact2From0 = contactManager0.getContact(contactId2From0); contact2From0 = contactManager0.getContact(contactId2From0);
contactId0From2 = contactManager2 contactId0From2 = contactManager2.addContact(author0, author2.getId(),
.addContact(author0, author2.getId(), getSecretKey(), rootKey0_2, clock.currentTimeMillis(), false, true, true);
clock.currentTimeMillis(), true, true, true);
contact0From2 = contactManager2.getContact(contactId0From2); contact0From2 = contactManager2.getContact(contactId0From2);
// Sync initial client versioning updates // Sync initial client versioning updates
@@ -283,12 +279,10 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
protected void addContacts1And2(boolean haveTransportProperties) protected void addContacts1And2(boolean haveTransportProperties)
throws Exception { throws Exception {
contactId2From1 = contactManager1 contactId2From1 = contactManager1.addContact(author2, author1.getId(),
.addContact(author2, author1.getId(), getSecretKey(), rootKey1_2, clock.currentTimeMillis(), true, true, true);
clock.currentTimeMillis(), true, true, true); contactId1From2 = contactManager2.addContact(author1, author2.getId(),
contactId1From2 = contactManager2 rootKey1_2, clock.currentTimeMillis(), false, true, true);
.addContact(author1, author2.getId(), getSecretKey(),
clock.currentTimeMillis(), true, true, true);
// Sync initial client versioning updates // Sync initial client versioning updates
sync1To2(1, true); sync1To2(1, true);
@@ -322,69 +316,55 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
lifecycleManager2.waitForShutdown(); lifecycleManager2.waitForShutdown();
} }
protected void sync0To1(int num, boolean valid) protected void sync0To1(int num, boolean valid) throws Exception {
throws IOException, TimeoutException { syncMessage(c0, c1, contactId1From0, num, valid);
syncMessage(sync0, contactId0From1, sync1, contactId1From0, num, valid);
} }
protected void sync0To2(int num, boolean valid) protected void sync0To2(int num, boolean valid) throws Exception {
throws IOException, TimeoutException { syncMessage(c0, c2, contactId2From0, num, valid);
syncMessage(sync0, contactId0From2, sync2, contactId2From0, num, valid);
} }
protected void sync1To0(int num, boolean valid) protected void sync1To0(int num, boolean valid) throws Exception {
throws IOException, TimeoutException { syncMessage(c1, c0, contactId0From1, num, valid);
syncMessage(sync1, contactId1From0, sync0, contactId0From1, num, valid);
} }
protected void sync2To0(int num, boolean valid) protected void sync2To0(int num, boolean valid) throws Exception {
throws IOException, TimeoutException { syncMessage(c2, c0, contactId0From2, num, valid);
syncMessage(sync2, contactId2From0, sync0, contactId0From2, num, valid);
} }
protected void sync2To1(int num, boolean valid) protected void sync2To1(int num, boolean valid) throws Exception {
throws IOException, TimeoutException {
assertNotNull(contactId2From1);
assertNotNull(contactId1From2); assertNotNull(contactId1From2);
syncMessage(sync2, contactId2From1, sync1, contactId1From2, num, valid); syncMessage(c2, c1, contactId1From2, num, valid);
} }
protected void sync1To2(int num, boolean valid) protected void sync1To2(int num, boolean valid) throws Exception {
throws IOException, TimeoutException {
assertNotNull(contactId2From1); assertNotNull(contactId2From1);
assertNotNull(contactId1From2); syncMessage(c1, c2, contactId2From1, num, valid);
syncMessage(sync1, contactId1From2, sync2, contactId2From1, num, valid);
} }
private void syncMessage(SyncSessionFactory fromSync, ContactId fromId, private void syncMessage(BriarIntegrationTestComponent fromComponent,
SyncSessionFactory toSync, ContactId toId, int num, boolean valid) BriarIntegrationTestComponent toComponent, ContactId toId, int num,
throws IOException, TimeoutException { boolean valid) throws Exception {
// Debug output // Debug output
String from = "0"; String from =
if (fromSync == sync1) from = "1"; fromComponent.getIdentityManager().getLocalAuthor().getName();
else if (fromSync == sync2) from = "2"; String to = toComponent.getIdentityManager().getLocalAuthor().getName();
String to = "0";
if (toSync == sync1) to = "1";
else if (toSync == sync2) to = "2";
LOG.info("TEST: Sending " + num + " message(s) from " + from + " to " + LOG.info("TEST: Sending " + num + " message(s) from " + from + " to " +
to); to);
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
StreamWriter streamWriter = new TestStreamWriter(out); TestTransportConnectionWriter writer =
// Create an outgoing sync session new TestTransportConnectionWriter(out);
SyncSession sessionFrom = fromSync.createSimplexOutgoingSession(toId, fromComponent.getConnectionManager().manageOutgoingConnection(toId,
MAX_LATENCY, streamWriter); SIMPLEX_TRANSPORT_ID, writer);
// Write whatever needs to be written writer.getDisposedLatch().await(TIMEOUT, MILLISECONDS);
sessionFrom.run();
out.close();
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
// Create an incoming sync session TestTransportConnectionReader reader =
SyncSession sessionTo = toSync.createIncomingSession(fromId, in); new TestTransportConnectionReader(in);
// Read whatever needs to be read toComponent.getConnectionManager().manageIncomingConnection(
sessionTo.run(); SIMPLEX_TRANSPORT_ID, reader);
in.close();
if (valid) { if (valid) {
deliveryWaiter.await(TIMEOUT, num); deliveryWaiter.await(TIMEOUT, num);

6
briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java
View File

@@ -9,8 +9,8 @@ import org.briarproject.bramble.api.event.EventBus;
import org.briarproject.bramble.api.identity.AuthorFactory; import org.briarproject.bramble.api.identity.AuthorFactory;
import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.IdentityManager;
import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.bramble.api.plugin.ConnectionManager;
import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.api.properties.TransportPropertyManager;
import org.briarproject.bramble.api.sync.SyncSessionFactory;
import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule;
import org.briarproject.briar.api.blog.BlogFactory; import org.briarproject.briar.api.blog.BlogFactory;
import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogManager;
@@ -87,8 +87,6 @@ public interface BriarIntegrationTestComponent
ContactManager getContactManager(); ContactManager getContactManager();
SyncSessionFactory getSyncSessionFactory();
DatabaseComponent getDatabaseComponent(); DatabaseComponent getDatabaseComponent();
BlogManager getBlogManager(); BlogManager getBlogManager();
@@ -112,4 +110,6 @@ public interface BriarIntegrationTestComponent
AuthorFactory getAuthorFactory(); AuthorFactory getAuthorFactory();
BlogFactory getBlogFactory(); BlogFactory getBlogFactory();
ConnectionManager getConnectionManager();
} }