Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 19:59:05 +01:00
Code Issues Projects Releases Wiki Activity

Rename sync record reader/writer.

Browse Source
This commit is contained in:
akwizgran
2018-04-19 12:01:08 +01:00
parent 6fa6ceb5ee
commit 4100daaa47
17 changed files with 110 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java
View File

@@ -6,7 +6,7 @@ import org.briarproject.bramble.api.db.Transaction;
import org.briarproject.bramble.api.event.EventBus;
import org.briarproject.bramble.api.sync.Ack;
import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.bramble.api.sync.RecordWriter;
import org.briarproject.bramble.api.sync.SyncRecordWriter;
import org.briarproject.bramble.test.BrambleTestCase;
import org.briarproject.bramble.test.ImmediateExecutor;
import org.briarproject.bramble.test.TestUtils;
@@ -29,14 +29,14 @@ public class SimplexOutgoingSessionTest extends BrambleTestCase {
private final ContactId contactId;
private final MessageId messageId;
private final int maxLatency;
private final RecordWriter recordWriter;
private final SyncRecordWriter recordWriter;
public SimplexOutgoingSessionTest() {
context = new Mockery();
db = context.mock(DatabaseComponent.class);
dbExecutor = new ImmediateExecutor();
eventBus = context.mock(EventBus.class);
recordWriter = context.mock(RecordWriter.class);
recordWriter = context.mock(SyncRecordWriter.class);
contactId = new ContactId(234);
messageId = new MessageId(TestUtils.getRandomId());
maxLatency = Integer.MAX_VALUE;

16
bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java
View File

@@ -12,11 +12,11 @@ import org.briarproject.bramble.api.sync.Message;
import org.briarproject.bramble.api.sync.MessageFactory;
import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.bramble.api.sync.Offer;
import org.briarproject.bramble.api.sync.RecordReader;
import org.briarproject.bramble.api.sync.RecordReaderFactory;
import org.briarproject.bramble.api.sync.RecordWriter;
import org.briarproject.bramble.api.sync.RecordWriterFactory;
import org.briarproject.bramble.api.sync.Request;
import org.briarproject.bramble.api.sync.SyncRecordReader;
import org.briarproject.bramble.api.sync.SyncRecordReaderFactory;
import org.briarproject.bramble.api.sync.SyncRecordWriter;
import org.briarproject.bramble.api.sync.SyncRecordWriterFactory;
import org.briarproject.bramble.api.transport.StreamContext;
import org.briarproject.bramble.api.transport.StreamReaderFactory;
import org.briarproject.bramble.api.transport.StreamWriterFactory;
@@ -54,9 +54,9 @@ public class SyncIntegrationTest extends BrambleTestCase {
@Inject
StreamWriterFactory streamWriterFactory;
@Inject
RecordReaderFactory recordReaderFactory;
SyncRecordReaderFactory recordReaderFactory;
@Inject
RecordWriterFactory recordWriterFactory;
SyncRecordWriterFactory recordWriterFactory;
@Inject
TransportCrypto transportCrypto;
@@ -104,7 +104,7 @@ public class SyncIntegrationTest extends BrambleTestCase {
headerKey, streamNumber);
OutputStream streamWriter = streamWriterFactory.createStreamWriter(out,
ctx);
RecordWriter recordWriter = recordWriterFactory.createRecordWriter(
SyncRecordWriter recordWriter = recordWriterFactory.createRecordWriter(
streamWriter);
recordWriter.writeAck(new Ack(messageIds));
@@ -134,7 +134,7 @@ public class SyncIntegrationTest extends BrambleTestCase {
headerKey, streamNumber);
InputStream streamReader = streamReaderFactory.createStreamReader(in,
ctx);
RecordReader recordReader = recordReaderFactory.createRecordReader(
SyncRecordReader recordReader = recordReaderFactory.createRecordReader(
streamReader);
// Read the ack

50
bramble-core/src/test/java/org/briarproject/bramble/sync/RecordReaderImplTest.java → bramble-core/src/test/java/org/briarproject/bramble/sync/SyncRecordReaderImplTest.java
View File

@@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public class RecordReaderImplTest extends BrambleMockTestCase {
public class SyncRecordReaderImplTest extends BrambleMockTestCase {
private final MessageFactory messageFactory =
context.mock(MessageFactory.class);
@@ -32,7 +32,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testFormatExceptionIfAckIsTooLarge() throws Exception {
byte[] b = createAck(true);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.readAck();
}
@@ -40,7 +41,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testNoFormatExceptionIfAckIsMaximumSize() throws Exception {
byte[] b = createAck(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.readAck();
}
@@ -48,7 +50,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testFormatExceptionIfAckIsEmpty() throws Exception {
byte[] b = createEmptyAck();
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.readAck();
}
@@ -56,7 +59,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testFormatExceptionIfOfferIsTooLarge() throws Exception {
byte[] b = createOffer(true);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.readOffer();
}
@@ -64,7 +68,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testNoFormatExceptionIfOfferIsMaximumSize() throws Exception {
byte[] b = createOffer(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.readOffer();
}
@@ -72,7 +77,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testFormatExceptionIfOfferIsEmpty() throws Exception {
byte[] b = createEmptyOffer();
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.readOffer();
}
@@ -80,7 +86,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testFormatExceptionIfRequestIsTooLarge() throws Exception {
byte[] b = createRequest(true);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.readRequest();
}
@@ -88,7 +95,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testNoFormatExceptionIfRequestIsMaximumSize() throws Exception {
byte[] b = createRequest(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.readRequest();
}
@@ -96,14 +104,16 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testFormatExceptionIfRequestIsEmpty() throws Exception {
byte[] b = createEmptyRequest();
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.readRequest();
}
@Test
public void testEofReturnsTrueWhenAtEndOfStream() throws Exception {
ByteArrayInputStream in = new ByteArrayInputStream(new byte[0]);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
assertTrue(reader.eof());
}
@@ -111,7 +121,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
public void testEofReturnsFalseWhenNotAtEndOfStream() throws Exception {
byte[] b = createAck(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
assertFalse(reader.eof());
}
@@ -121,7 +132,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
b[0] = PROTOCOL_VERSION;
b[1] = ACK;
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.eof();
}
@@ -133,7 +145,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
b[1] = ACK;
ByteUtils.writeUint16(payloadLength, b, 2);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.eof();
}
@@ -143,7 +156,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
byte version = (byte) (PROTOCOL_VERSION + 1);
byte[] b = createRecord(version, ACK, new byte[0]);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.eof();
}
@@ -152,7 +166,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
byte[] payload = new byte[MAX_RECORD_PAYLOAD_LENGTH + 1];
byte[] b = createRecord(PROTOCOL_VERSION, ACK, payload);
ByteArrayInputStream in = new ByteArrayInputStream(b);
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
reader.eof();
}
@@ -168,7 +183,8 @@ public class RecordReaderImplTest extends BrambleMockTestCase {
input.write(skip2);
input.write(ack);
ByteArrayInputStream in = new ByteArrayInputStream(input.toByteArray());
RecordReaderImpl reader = new RecordReaderImpl(messageFactory, in);
SyncRecordReaderImpl
reader = new SyncRecordReaderImpl(messageFactory, in);
assertTrue(reader.hasAck());
Ack a = reader.readAck();
assertEquals(MAX_MESSAGE_IDS, a.getMessageIds().size());