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

Renamed some variables to match renamed classes.

Browse Source
This commit is contained in:
akwizgran
2013-02-01 19:44:43 +00:00
parent 0229d94531
commit 14177e51f6
9 changed files with 68 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
briar-core/src/net/sf/briar/messaging/duplex/DuplexConnection.java
View File

@@ -78,8 +78,8 @@ abstract class DuplexConnection implements DatabaseListener {
protected final ConnectionRegistry connRegistry; protected final ConnectionRegistry connRegistry;
protected final ConnectionReaderFactory connReaderFactory; protected final ConnectionReaderFactory connReaderFactory;
protected final ConnectionWriterFactory connWriterFactory; protected final ConnectionWriterFactory connWriterFactory;
protected final PacketReaderFactory protoReaderFactory; protected final PacketReaderFactory packetReaderFactory;
protected final PacketWriterFactory protoWriterFactory; protected final PacketWriterFactory packetWriterFactory;
protected final ConnectionContext ctx; protected final ConnectionContext ctx;
protected final DuplexTransportConnection transport; protected final DuplexTransportConnection transport;
protected final ContactId contactId; protected final ContactId contactId;
@@ -100,8 +100,8 @@ abstract class DuplexConnection implements DatabaseListener {
ConnectionRegistry connRegistry, ConnectionRegistry connRegistry,
ConnectionReaderFactory connReaderFactory, ConnectionReaderFactory connReaderFactory,
ConnectionWriterFactory connWriterFactory, ConnectionWriterFactory connWriterFactory,
PacketReaderFactory protoReaderFactory, PacketReaderFactory packetReaderFactory,
PacketWriterFactory protoWriterFactory, ConnectionContext ctx, PacketWriterFactory packetWriterFactory, ConnectionContext ctx,
DuplexTransportConnection transport) { DuplexTransportConnection transport) {
this.dbExecutor = dbExecutor; this.dbExecutor = dbExecutor;
this.verificationExecutor = verificationExecutor; this.verificationExecutor = verificationExecutor;
@@ -110,8 +110,8 @@ abstract class DuplexConnection implements DatabaseListener {
this.connRegistry = connRegistry; this.connRegistry = connRegistry;
this.connReaderFactory = connReaderFactory; this.connReaderFactory = connReaderFactory;
this.connWriterFactory = connWriterFactory; this.connWriterFactory = connWriterFactory;
this.protoReaderFactory = protoReaderFactory; this.packetReaderFactory = packetReaderFactory;
this.protoWriterFactory = protoWriterFactory; this.packetWriterFactory = packetWriterFactory;
this.ctx = ctx; this.ctx = ctx;
this.transport = transport; this.transport = transport;
contactId = ctx.getContactId(); contactId = ctx.getContactId();
@@ -161,7 +161,7 @@ abstract class DuplexConnection implements DatabaseListener {
void read() { void read() {
try { try {
InputStream in = createConnectionReader().getInputStream(); InputStream in = createConnectionReader().getInputStream();
PacketReader reader = protoReaderFactory.createPacketReader(in); PacketReader reader = packetReaderFactory.createPacketReader(in);
while(!reader.eof()) { while(!reader.eof()) {
if(reader.hasAck()) { if(reader.hasAck()) {
Ack a = reader.readAck(); Ack a = reader.readAck();
@@ -226,7 +226,7 @@ abstract class DuplexConnection implements DatabaseListener {
db.addListener(this); db.addListener(this);
try { try {
OutputStream out = createConnectionWriter().getOutputStream(); OutputStream out = createConnectionWriter().getOutputStream();
writer = protoWriterFactory.createPacketWriter(out, writer = packetWriterFactory.createPacketWriter(out,
transport.shouldFlush()); transport.shouldFlush());
// Send the initial packets: updates, acks, offer // Send the initial packets: updates, acks, offer
dbExecutor.execute(new GenerateTransportAcks()); dbExecutor.execute(new GenerateTransportAcks());

19
briar-core/src/net/sf/briar/messaging/duplex/DuplexConnectionFactoryImpl.java
View File

@@ -35,8 +35,8 @@ class DuplexConnectionFactoryImpl implements DuplexConnectionFactory {
private final ConnectionRegistry connRegistry; private final ConnectionRegistry connRegistry;
private final ConnectionReaderFactory connReaderFactory; private final ConnectionReaderFactory connReaderFactory;
private final ConnectionWriterFactory connWriterFactory; private final ConnectionWriterFactory connWriterFactory;
private final PacketReaderFactory protoReaderFactory; private final PacketReaderFactory packetReaderFactory;
private final PacketWriterFactory protoWriterFactory; private final PacketWriterFactory packetWriterFactory;
@Inject @Inject
DuplexConnectionFactoryImpl(@DatabaseExecutor Executor dbExecutor, DuplexConnectionFactoryImpl(@DatabaseExecutor Executor dbExecutor,
@@ -45,7 +45,8 @@ class DuplexConnectionFactoryImpl implements DuplexConnectionFactory {
KeyManager keyManager, ConnectionRegistry connRegistry, KeyManager keyManager, ConnectionRegistry connRegistry,
ConnectionReaderFactory connReaderFactory, ConnectionReaderFactory connReaderFactory,
ConnectionWriterFactory connWriterFactory, ConnectionWriterFactory connWriterFactory,
PacketReaderFactory protoReaderFactory, PacketWriterFactory protoWriterFactory) { PacketReaderFactory packetReaderFactory,
PacketWriterFactory packetWriterFactory) {
this.dbExecutor = dbExecutor; this.dbExecutor = dbExecutor;
this.verificationExecutor = verificationExecutor; this.verificationExecutor = verificationExecutor;
this.messageVerifier = messageVerifier; this.messageVerifier = messageVerifier;
@@ -54,16 +55,16 @@ class DuplexConnectionFactoryImpl implements DuplexConnectionFactory {
this.connRegistry = connRegistry; this.connRegistry = connRegistry;
this.connReaderFactory = connReaderFactory; this.connReaderFactory = connReaderFactory;
this.connWriterFactory = connWriterFactory; this.connWriterFactory = connWriterFactory;
this.protoReaderFactory = protoReaderFactory; this.packetReaderFactory = packetReaderFactory;
this.protoWriterFactory = protoWriterFactory; this.packetWriterFactory = packetWriterFactory;
} }
public void createIncomingConnection(ConnectionContext ctx, public void createIncomingConnection(ConnectionContext ctx,
DuplexTransportConnection transport) { DuplexTransportConnection transport) {
final DuplexConnection conn = new IncomingDuplexConnection(dbExecutor, final DuplexConnection conn = new IncomingDuplexConnection(dbExecutor,
verificationExecutor, messageVerifier, db, connRegistry, verificationExecutor, messageVerifier, db, connRegistry,
connReaderFactory, connWriterFactory, protoReaderFactory, connReaderFactory, connWriterFactory, packetReaderFactory,
protoWriterFactory, ctx, transport); packetWriterFactory, ctx, transport);
Runnable write = new Runnable() { Runnable write = new Runnable() {
public void run() { public void run() {
conn.write(); conn.write();
@@ -88,8 +89,8 @@ class DuplexConnectionFactoryImpl implements DuplexConnectionFactory {
} }
final DuplexConnection conn = new OutgoingDuplexConnection(dbExecutor, final DuplexConnection conn = new OutgoingDuplexConnection(dbExecutor,
verificationExecutor, messageVerifier, db, connRegistry, verificationExecutor, messageVerifier, db, connRegistry,
connReaderFactory, connWriterFactory, protoReaderFactory, connReaderFactory, connWriterFactory, packetReaderFactory,
protoWriterFactory, ctx, transport); packetWriterFactory, ctx, transport);
Runnable write = new Runnable() { Runnable write = new Runnable() {
public void run() { public void run() {
conn.write(); conn.write();

6
briar-core/src/net/sf/briar/messaging/duplex/IncomingDuplexConnection.java
View File

@@ -25,12 +25,12 @@ class IncomingDuplexConnection extends DuplexConnection {
ConnectionRegistry connRegistry, ConnectionRegistry connRegistry,
ConnectionReaderFactory connReaderFactory, ConnectionReaderFactory connReaderFactory,
ConnectionWriterFactory connWriterFactory, ConnectionWriterFactory connWriterFactory,
PacketReaderFactory protoReaderFactory, PacketReaderFactory packetReaderFactory,
PacketWriterFactory protoWriterFactory, PacketWriterFactory packetWriterFactory,
ConnectionContext ctx, DuplexTransportConnection transport) { ConnectionContext ctx, DuplexTransportConnection transport) {
super(dbExecutor, verificationExecutor, messageVerifier, db, super(dbExecutor, verificationExecutor, messageVerifier, db,
connRegistry, connReaderFactory, connWriterFactory, connRegistry, connReaderFactory, connWriterFactory,
protoReaderFactory, protoWriterFactory, ctx, transport); packetReaderFactory, packetWriterFactory, ctx, transport);
} }
@Override @Override

6
briar-core/src/net/sf/briar/messaging/duplex/OutgoingDuplexConnection.java
View File

@@ -25,12 +25,12 @@ class OutgoingDuplexConnection extends DuplexConnection {
ConnectionRegistry connRegistry, ConnectionRegistry connRegistry,
ConnectionReaderFactory connReaderFactory, ConnectionReaderFactory connReaderFactory,
ConnectionWriterFactory connWriterFactory, ConnectionWriterFactory connWriterFactory,
PacketReaderFactory protoReaderFactory, PacketReaderFactory packetReaderFactory,
PacketWriterFactory protoWriterFactory, ConnectionContext ctx, PacketWriterFactory packetWriterFactory, ConnectionContext ctx,
DuplexTransportConnection transport) { DuplexTransportConnection transport) {
super(dbExecutor, verificationExecutor, messageVerifier, db, super(dbExecutor, verificationExecutor, messageVerifier, db,
connRegistry, connReaderFactory, connWriterFactory, connRegistry, connReaderFactory, connWriterFactory,
protoReaderFactory, protoWriterFactory, ctx, transport); packetReaderFactory, packetWriterFactory, ctx, transport);
} }
@Override @Override

16
briar-core/src/net/sf/briar/messaging/simplex/IncomingSimplexConnection.java
View File

@@ -43,8 +43,8 @@ class IncomingSimplexConnection {
private final MessageVerifier messageVerifier; private final MessageVerifier messageVerifier;
private final DatabaseComponent db; private final DatabaseComponent db;
private final ConnectionRegistry connRegistry; private final ConnectionRegistry connRegistry;
private final ConnectionReaderFactory connFactory; private final ConnectionReaderFactory connReaderFactory;
private final PacketReaderFactory protoFactory; private final PacketReaderFactory packetReaderFactory;
private final ConnectionContext ctx; private final ConnectionContext ctx;
private final SimplexTransportReader transport; private final SimplexTransportReader transport;
private final ContactId contactId; private final ContactId contactId;
@@ -54,16 +54,16 @@ class IncomingSimplexConnection {
@VerificationExecutor Executor verificationExecutor, @VerificationExecutor Executor verificationExecutor,
MessageVerifier messageVerifier, DatabaseComponent db, MessageVerifier messageVerifier, DatabaseComponent db,
ConnectionRegistry connRegistry, ConnectionRegistry connRegistry,
ConnectionReaderFactory connFactory, ConnectionReaderFactory connReaderFactory,
PacketReaderFactory protoFactory, ConnectionContext ctx, PacketReaderFactory packetReaderFactory, ConnectionContext ctx,
SimplexTransportReader transport) { SimplexTransportReader transport) {
this.dbExecutor = dbExecutor; this.dbExecutor = dbExecutor;
this.verificationExecutor = verificationExecutor; this.verificationExecutor = verificationExecutor;
this.messageVerifier = messageVerifier; this.messageVerifier = messageVerifier;
this.db = db; this.db = db;
this.connRegistry = connRegistry; this.connRegistry = connRegistry;
this.connFactory = connFactory; this.connReaderFactory = connReaderFactory;
this.protoFactory = protoFactory; this.packetReaderFactory = packetReaderFactory;
this.ctx = ctx; this.ctx = ctx;
this.transport = transport; this.transport = transport;
contactId = ctx.getContactId(); contactId = ctx.getContactId();
@@ -73,10 +73,10 @@ class IncomingSimplexConnection {
void read() { void read() {
connRegistry.registerConnection(contactId, transportId); connRegistry.registerConnection(contactId, transportId);
try { try {
ConnectionReader conn = connFactory.createConnectionReader( ConnectionReader conn = connReaderFactory.createConnectionReader(
transport.getInputStream(), ctx, true, true); transport.getInputStream(), ctx, true, true);
InputStream in = conn.getInputStream(); InputStream in = conn.getInputStream();
PacketReader reader = protoFactory.createPacketReader(in); PacketReader reader = packetReaderFactory.createPacketReader(in);
// Read packets until EOF // Read packets until EOF
while(!reader.eof()) { while(!reader.eof()) {
if(reader.hasAck()) { if(reader.hasAck()) {

20
briar-core/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnection.java
View File

@@ -36,8 +36,8 @@ class OutgoingSimplexConnection {
private final DatabaseComponent db; private final DatabaseComponent db;
private final ConnectionRegistry connRegistry; private final ConnectionRegistry connRegistry;
private final ConnectionWriterFactory connFactory; private final ConnectionWriterFactory connWriterFactory;
private final PacketWriterFactory protoFactory; private final PacketWriterFactory packetWriterFactory;
private final ConnectionContext ctx; private final ConnectionContext ctx;
private final SimplexTransportWriter transport; private final SimplexTransportWriter transport;
private final ContactId contactId; private final ContactId contactId;
@@ -45,13 +45,13 @@ class OutgoingSimplexConnection {
OutgoingSimplexConnection(DatabaseComponent db, OutgoingSimplexConnection(DatabaseComponent db,
ConnectionRegistry connRegistry, ConnectionRegistry connRegistry,
ConnectionWriterFactory connFactory, ConnectionWriterFactory connWriterFactory,
PacketWriterFactory protoFactory, ConnectionContext ctx, PacketWriterFactory packetWriterFactory, ConnectionContext ctx,
SimplexTransportWriter transport) { SimplexTransportWriter transport) {
this.db = db; this.db = db;
this.connRegistry = connRegistry; this.connRegistry = connRegistry;
this.connFactory = connFactory; this.connWriterFactory = connWriterFactory;
this.protoFactory = protoFactory; this.packetWriterFactory = packetWriterFactory;
this.ctx = ctx; this.ctx = ctx;
this.transport = transport; this.transport = transport;
contactId = ctx.getContactId(); contactId = ctx.getContactId();
@@ -61,13 +61,13 @@ class OutgoingSimplexConnection {
void write() { void write() {
connRegistry.registerConnection(contactId, transportId); connRegistry.registerConnection(contactId, transportId);
try { try {
ConnectionWriter conn = connFactory.createConnectionWriter( ConnectionWriter conn = connWriterFactory.createConnectionWriter(
transport.getOutputStream(), transport.getCapacity(), transport.getOutputStream(), transport.getCapacity(), ctx,
ctx, false, true); false, true);
OutputStream out = conn.getOutputStream(); OutputStream out = conn.getOutputStream();
if(conn.getRemainingCapacity() < MAX_PACKET_LENGTH) if(conn.getRemainingCapacity() < MAX_PACKET_LENGTH)
throw new EOFException(); throw new EOFException();
PacketWriter writer = protoFactory.createPacketWriter(out, PacketWriter writer = packetWriterFactory.createPacketWriter(out,
transport.shouldFlush()); transport.shouldFlush());
// Send the initial packets: updates and acks // Send the initial packets: updates and acks
boolean hasSpace = writeTransportAcks(conn, writer); boolean hasSpace = writeTransportAcks(conn, writer);

16
briar-core/src/net/sf/briar/messaging/simplex/SimplexConnectionFactoryImpl.java
View File

@@ -36,8 +36,8 @@ class SimplexConnectionFactoryImpl implements SimplexConnectionFactory {
private final ConnectionRegistry connRegistry; private final ConnectionRegistry connRegistry;
private final ConnectionReaderFactory connReaderFactory; private final ConnectionReaderFactory connReaderFactory;
private final ConnectionWriterFactory connWriterFactory; private final ConnectionWriterFactory connWriterFactory;
private final PacketReaderFactory protoReaderFactory; private final PacketReaderFactory packetReaderFactory;
private final PacketWriterFactory protoWriterFactory; private final PacketWriterFactory packetWriterFactory;
@Inject @Inject
SimplexConnectionFactoryImpl(@DatabaseExecutor Executor dbExecutor, SimplexConnectionFactoryImpl(@DatabaseExecutor Executor dbExecutor,
@@ -46,8 +46,8 @@ class SimplexConnectionFactoryImpl implements SimplexConnectionFactory {
KeyManager keyManager, ConnectionRegistry connRegistry, KeyManager keyManager, ConnectionRegistry connRegistry,
ConnectionReaderFactory connReaderFactory, ConnectionReaderFactory connReaderFactory,
ConnectionWriterFactory connWriterFactory, ConnectionWriterFactory connWriterFactory,
PacketReaderFactory protoReaderFactory, PacketReaderFactory packetReaderFactory,
PacketWriterFactory protoWriterFactory) { PacketWriterFactory packetWriterFactory) {
this.dbExecutor = dbExecutor; this.dbExecutor = dbExecutor;
this.verificationExecutor = verificationExecutor; this.verificationExecutor = verificationExecutor;
this.messageVerifier = messageVerifier; this.messageVerifier = messageVerifier;
@@ -56,14 +56,14 @@ class SimplexConnectionFactoryImpl implements SimplexConnectionFactory {
this.connRegistry = connRegistry; this.connRegistry = connRegistry;
this.connReaderFactory = connReaderFactory; this.connReaderFactory = connReaderFactory;
this.connWriterFactory = connWriterFactory; this.connWriterFactory = connWriterFactory;
this.protoReaderFactory = protoReaderFactory; this.packetReaderFactory = packetReaderFactory;
this.protoWriterFactory = protoWriterFactory; this.packetWriterFactory = packetWriterFactory;
} }
public void createIncomingConnection(ConnectionContext ctx, SimplexTransportReader r) { public void createIncomingConnection(ConnectionContext ctx, SimplexTransportReader r) {
final IncomingSimplexConnection conn = new IncomingSimplexConnection( final IncomingSimplexConnection conn = new IncomingSimplexConnection(
dbExecutor, verificationExecutor, messageVerifier, db, dbExecutor, verificationExecutor, messageVerifier, db,
connRegistry, connReaderFactory, protoReaderFactory, ctx, r); connRegistry, connReaderFactory, packetReaderFactory, ctx, r);
Runnable read = new Runnable() { Runnable read = new Runnable() {
public void run() { public void run() {
conn.read(); conn.read();
@@ -81,7 +81,7 @@ class SimplexConnectionFactoryImpl implements SimplexConnectionFactory {
return; return;
} }
final OutgoingSimplexConnection conn = new OutgoingSimplexConnection(db, final OutgoingSimplexConnection conn = new OutgoingSimplexConnection(db,
connRegistry, connWriterFactory, protoWriterFactory, ctx, w); connRegistry, connWriterFactory, packetWriterFactory, ctx, w);
Runnable write = new Runnable() { Runnable write = new Runnable() {
public void run() { public void run() {
conn.write(); conn.write();

17
briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java
View File

@@ -50,8 +50,8 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
private final Mockery context; private final Mockery context;
private final DatabaseComponent db; private final DatabaseComponent db;
private final ConnectionRegistry connRegistry; private final ConnectionRegistry connRegistry;
private final ConnectionWriterFactory connFactory; private final ConnectionWriterFactory connWriterFactory;
private final PacketWriterFactory protoFactory; private final PacketWriterFactory packetWriterFactory;
private final ContactId contactId; private final ContactId contactId;
private final MessageId messageId; private final MessageId messageId;
private final TransportId transportId; private final TransportId transportId;
@@ -75,8 +75,8 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
new SimplexMessagingModule(), new MessagingModule(), new SimplexMessagingModule(), new MessagingModule(),
new DuplexMessagingModule()); new DuplexMessagingModule());
connRegistry = i.getInstance(ConnectionRegistry.class); connRegistry = i.getInstance(ConnectionRegistry.class);
connFactory = i.getInstance(ConnectionWriterFactory.class); connWriterFactory = i.getInstance(ConnectionWriterFactory.class);
protoFactory = i.getInstance(PacketWriterFactory.class); packetWriterFactory = i.getInstance(PacketWriterFactory.class);
contactId = new ContactId(234); contactId = new ContactId(234);
messageId = new MessageId(TestUtils.getRandomId()); messageId = new MessageId(TestUtils.getRandomId());
transportId = new TransportId(TestUtils.getRandomId()); transportId = new TransportId(TestUtils.getRandomId());
@@ -91,7 +91,8 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
ConnectionContext ctx = new ConnectionContext(contactId, transportId, ConnectionContext ctx = new ConnectionContext(contactId, transportId,
secret, 0L, true); secret, 0L, true);
OutgoingSimplexConnection connection = new OutgoingSimplexConnection(db, OutgoingSimplexConnection connection = new OutgoingSimplexConnection(db,
connRegistry, connFactory, protoFactory, ctx, transport); connRegistry, connWriterFactory, packetWriterFactory, ctx,
transport);
connection.write(); connection.write();
// Nothing should have been written // Nothing should have been written
assertEquals(0, out.size()); assertEquals(0, out.size());
@@ -108,7 +109,8 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
ConnectionContext ctx = new ConnectionContext(contactId, transportId, ConnectionContext ctx = new ConnectionContext(contactId, transportId,
secret, 0L, true); secret, 0L, true);
OutgoingSimplexConnection connection = new OutgoingSimplexConnection(db, OutgoingSimplexConnection connection = new OutgoingSimplexConnection(db,
connRegistry, connFactory, protoFactory, ctx, transport); connRegistry, connWriterFactory, packetWriterFactory, ctx,
transport);
context.checking(new Expectations() {{ context.checking(new Expectations() {{
// No transport acks to send // No transport acks to send
oneOf(db).generateTransportAcks(contactId); oneOf(db).generateTransportAcks(contactId);
@@ -152,7 +154,8 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
ConnectionContext ctx = new ConnectionContext(contactId, transportId, ConnectionContext ctx = new ConnectionContext(contactId, transportId,
secret, 0L, true); secret, 0L, true);
OutgoingSimplexConnection connection = new OutgoingSimplexConnection(db, OutgoingSimplexConnection connection = new OutgoingSimplexConnection(db,
connRegistry, connFactory, protoFactory, ctx, transport); connRegistry, connWriterFactory, packetWriterFactory, ctx,
transport);
final byte[] raw = new byte[1234]; final byte[] raw = new byte[1234];
context.checking(new Expectations() {{ context.checking(new Expectations() {{
// No transport acks to send // No transport acks to send

15
briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java
View File

@@ -121,16 +121,17 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
ConnectionRegistry connRegistry = ConnectionRegistry connRegistry =
alice.getInstance(ConnectionRegistry.class); alice.getInstance(ConnectionRegistry.class);
ConnectionWriterFactory connFactory = ConnectionWriterFactory connWriterFactory =
alice.getInstance(ConnectionWriterFactory.class); alice.getInstance(ConnectionWriterFactory.class);
PacketWriterFactory protoFactory = PacketWriterFactory packetWriterFactory =
alice.getInstance(PacketWriterFactory.class); alice.getInstance(PacketWriterFactory.class);
TestSimplexTransportWriter transport = new TestSimplexTransportWriter( TestSimplexTransportWriter transport = new TestSimplexTransportWriter(
out, Long.MAX_VALUE, false); out, Long.MAX_VALUE, false);
ConnectionContext ctx = km.getConnectionContext(contactId, transportId); ConnectionContext ctx = km.getConnectionContext(contactId, transportId);
assertNotNull(ctx); assertNotNull(ctx);
OutgoingSimplexConnection simplex = new OutgoingSimplexConnection(db, OutgoingSimplexConnection simplex = new OutgoingSimplexConnection(db,
connRegistry, connFactory, protoFactory, ctx, transport); connRegistry, connWriterFactory, packetWriterFactory, ctx,
transport);
// Write whatever needs to be written // Write whatever needs to be written
simplex.write(); simplex.write();
assertTrue(transport.getDisposed()); assertTrue(transport.getDisposed());
@@ -173,16 +174,16 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
bob.getInstance(MessageVerifier.class); bob.getInstance(MessageVerifier.class);
ConnectionRegistry connRegistry = ConnectionRegistry connRegistry =
bob.getInstance(ConnectionRegistry.class); bob.getInstance(ConnectionRegistry.class);
ConnectionReaderFactory connFactory = ConnectionReaderFactory connWriterFactory =
bob.getInstance(ConnectionReaderFactory.class); bob.getInstance(ConnectionReaderFactory.class);
PacketReaderFactory protoFactory = PacketReaderFactory packetWriterFactory =
bob.getInstance(PacketReaderFactory.class); bob.getInstance(PacketReaderFactory.class);
TestSimplexTransportReader transport = TestSimplexTransportReader transport =
new TestSimplexTransportReader(in); new TestSimplexTransportReader(in);
IncomingSimplexConnection simplex = new IncomingSimplexConnection( IncomingSimplexConnection simplex = new IncomingSimplexConnection(
new ImmediateExecutor(), new ImmediateExecutor(), new ImmediateExecutor(), new ImmediateExecutor(),
messageVerifier, db, connRegistry, connFactory, protoFactory, messageVerifier, db, connRegistry, connWriterFactory,
ctx, transport); packetWriterFactory, ctx, transport);
// No messages should have been added yet // No messages should have been added yet
assertFalse(listener.messagesAdded); assertFalse(listener.messagesAdded);
// Read whatever needs to be read // Read whatever needs to be read