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

Refactoring: renamed package 'protocol' -> 'messaging'.

Browse Source
This commit is contained in:
akwizgran
2013-01-30 17:48:43 +00:00
parent d7a7e9ab96
commit 9a78071bde
116 changed files with 582 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
View File

@@ -17,25 +17,25 @@ import java.util.Random;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.protocol.Ack;
import net.sf.briar.api.protocol.Author;
import net.sf.briar.api.protocol.AuthorFactory;
import net.sf.briar.api.protocol.Group;
import net.sf.briar.api.protocol.GroupFactory;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageFactory;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.MessageVerifier;
import net.sf.briar.api.protocol.Offer;
import net.sf.briar.api.protocol.ProtocolReader;
import net.sf.briar.api.protocol.ProtocolReaderFactory;
import net.sf.briar.api.protocol.ProtocolWriter;
import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.Request;
import net.sf.briar.api.protocol.SubscriptionUpdate;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.TransportUpdate;
import net.sf.briar.api.protocol.UnverifiedMessage;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Author;
import net.sf.briar.api.messaging.AuthorFactory;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageFactory;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.Offer;
import net.sf.briar.api.messaging.PacketReader;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.Request;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
@@ -45,9 +45,9 @@ import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.db.DatabaseModule;
import net.sf.briar.lifecycle.LifecycleModule;
import net.sf.briar.protocol.ProtocolModule;
import net.sf.briar.protocol.duplex.DuplexProtocolModule;
import net.sf.briar.protocol.simplex.SimplexProtocolModule;
import net.sf.briar.messaging.MessagingModule;
import net.sf.briar.messaging.duplex.DuplexMessagingModule;
import net.sf.briar.messaging.simplex.SimplexMessagingModule;
import net.sf.briar.serial.SerialModule;
import net.sf.briar.transport.TransportModule;
@@ -60,8 +60,8 @@ public class ProtocolIntegrationTest extends BriarTestCase {
private final ConnectionReaderFactory connectionReaderFactory;
private final ConnectionWriterFactory connectionWriterFactory;
private final ProtocolReaderFactory protocolReaderFactory;
private final ProtocolWriterFactory protocolWriterFactory;
private final PacketReaderFactory packetReaderFactory;
private final PacketWriterFactory packetWriterFactory;
private final MessageVerifier messageVerifier;
private final ContactId contactId;
@@ -80,13 +80,13 @@ public class ProtocolIntegrationTest extends BriarTestCase {
super();
Injector i = Guice.createInjector(new TestDatabaseModule(),
new ClockModule(), new CryptoModule(), new DatabaseModule(),
new LifecycleModule(), new ProtocolModule(),
new DuplexProtocolModule(), new SimplexProtocolModule(),
new LifecycleModule(), new MessagingModule(),
new DuplexMessagingModule(), new SimplexMessagingModule(),
new SerialModule(), new TransportModule());
connectionReaderFactory = i.getInstance(ConnectionReaderFactory.class);
connectionWriterFactory = i.getInstance(ConnectionWriterFactory.class);
protocolReaderFactory = i.getInstance(ProtocolReaderFactory.class);
protocolWriterFactory = i.getInstance(ProtocolWriterFactory.class);
packetReaderFactory = i.getInstance(PacketReaderFactory.class);
packetWriterFactory = i.getInstance(PacketWriterFactory.class);
messageVerifier = i.getInstance(MessageVerifier.class);
contactId = new ContactId(234);
// Create a shared secret
@@ -137,7 +137,7 @@ public class ProtocolIntegrationTest extends BriarTestCase {
ConnectionWriter conn = connectionWriterFactory.createConnectionWriter(
out, Long.MAX_VALUE, ctx, false, true);
OutputStream out1 = conn.getOutputStream();
ProtocolWriter writer = protocolWriterFactory.createProtocolWriter(out1,
PacketWriter writer = packetWriterFactory.createPacketWriter(out1,
false);
writer.writeAck(new Ack(messageIds));
@@ -176,7 +176,7 @@ public class ProtocolIntegrationTest extends BriarTestCase {
ConnectionReader conn = connectionReaderFactory.createConnectionReader(
in, ctx, true, true);
InputStream in1 = conn.getInputStream();
ProtocolReader reader = protocolReaderFactory.createProtocolReader(in1);
PacketReader reader = packetReaderFactory.createPacketReader(in1);
// Read the ack
assertTrue(reader.hasAck());

8
briar-tests/src/net/sf/briar/TestMessage.java
View File

@@ -3,10 +3,10 @@ package net.sf.briar;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import net.sf.briar.api.protocol.AuthorId;
import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
public class TestMessage implements Message {

2
briar-tests/src/net/sf/briar/TestUtils.java
View File

@@ -10,7 +10,7 @@ import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.TestCase;
import net.sf.briar.api.protocol.UniqueId;
import net.sf.briar.api.messaging.UniqueId;
public class TestUtils {

22
briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
View File

@@ -22,17 +22,17 @@ import net.sf.briar.api.db.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.db.event.RatingChangedEvent;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.protocol.Ack;
import net.sf.briar.api.protocol.AuthorId;
import net.sf.briar.api.protocol.Group;
import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.Offer;
import net.sf.briar.api.protocol.Request;
import net.sf.briar.api.protocol.SubscriptionUpdate;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.TransportUpdate;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.Offer;
import net.sf.briar.api.messaging.Request;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;

12
briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
View File

@@ -27,12 +27,12 @@ import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.protocol.AuthorId;
import net.sf.briar.api.protocol.Group;
import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;

49
briar-tests/src/net/sf/briar/protocol/ConstantsTest.java → briar-tests/src/net/sf/briar/messaging/ConstantsTest.java
View File

@@ -1,11 +1,11 @@
package net.sf.briar.protocol;
package net.sf.briar.messaging;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_BODY_LENGTH;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_GROUP_NAME_LENGTH;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_SUBJECT_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SUBJECT_LENGTH;
import java.io.ByteArrayOutputStream;
import java.security.PrivateKey;
@@ -15,20 +15,21 @@ import java.util.Collection;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.protocol.Ack;
import net.sf.briar.api.protocol.Author;
import net.sf.briar.api.protocol.AuthorFactory;
import net.sf.briar.api.protocol.Group;
import net.sf.briar.api.protocol.GroupFactory;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageFactory;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.Offer;
import net.sf.briar.api.protocol.ProtocolWriter;
import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.UniqueId;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Author;
import net.sf.briar.api.messaging.AuthorFactory;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageFactory;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.Offer;
import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.UniqueId;
import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.messaging.MessagingModule;
import net.sf.briar.serial.SerialModule;
import org.junit.Test;
@@ -42,17 +43,17 @@ public class ConstantsTest extends BriarTestCase {
private final GroupFactory groupFactory;
private final AuthorFactory authorFactory;
private final MessageFactory messageFactory;
private final ProtocolWriterFactory protocolWriterFactory;
private final PacketWriterFactory packetWriterFactory;
public ConstantsTest() throws Exception {
super();
Injector i = Guice.createInjector(new ClockModule(), new CryptoModule(),
new ProtocolModule(), new SerialModule());
new MessagingModule(), new SerialModule());
crypto = i.getInstance(CryptoComponent.class);
groupFactory = i.getInstance(GroupFactory.class);
authorFactory = i.getInstance(AuthorFactory.class);
messageFactory = i.getInstance(MessageFactory.class);
protocolWriterFactory = i.getInstance(ProtocolWriterFactory.class);
packetWriterFactory = i.getInstance(PacketWriterFactory.class);
}
@Test
@@ -68,7 +69,7 @@ public class ConstantsTest extends BriarTestCase {
private void testMessageIdsFitIntoAck(int length) throws Exception {
// Create an ack with as many message IDs as possible
ByteArrayOutputStream out = new ByteArrayOutputStream(length);
ProtocolWriter writer = protocolWriterFactory.createProtocolWriter(out,
PacketWriter writer = packetWriterFactory.createPacketWriter(out,
true);
int maxMessages = writer.getMaxMessagesForAck(length);
Collection<MessageId> acked = new ArrayList<MessageId>();
@@ -118,7 +119,7 @@ public class ConstantsTest extends BriarTestCase {
private void testMessageIdsFitIntoOffer(int length) throws Exception {
// Create an offer with as many message IDs as possible
ByteArrayOutputStream out = new ByteArrayOutputStream(length);
ProtocolWriter writer = protocolWriterFactory.createProtocolWriter(out,
PacketWriter writer = packetWriterFactory.createPacketWriter(out,
true);
int maxMessages = writer.getMaxMessagesForOffer(length);
Collection<MessageId> offered = new ArrayList<MessageId>();

2
briar-tests/src/net/sf/briar/protocol/ConsumersTest.java → briar-tests/src/net/sf/briar/messaging/ConsumersTest.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.protocol;
package net.sf.briar.messaging;
import static org.junit.Assert.assertArrayEquals;

35
briar-tests/src/net/sf/briar/protocol/ProtocolReaderImplTest.java → briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.protocol;
package net.sf.briar.messaging;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.protocol.Types.ACK;
import static net.sf.briar.api.protocol.Types.OFFER;
import static net.sf.briar.api.protocol.Types.REQUEST;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.Types.ACK;
import static net.sf.briar.api.messaging.Types.OFFER;
import static net.sf.briar.api.messaging.Types.REQUEST;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -12,11 +12,12 @@ import java.util.BitSet;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.protocol.Request;
import net.sf.briar.api.messaging.Request;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.SerialComponent;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.messaging.PacketReaderImpl;
import net.sf.briar.serial.SerialModule;
import org.junit.Test;
@@ -24,7 +25,7 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class ProtocolReaderImplTest extends BriarTestCase {
public class PacketReaderImplTest extends BriarTestCase {
// FIXME: This is an integration test, not a unit test
@@ -32,7 +33,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
private final ReaderFactory readerFactory;
private final WriterFactory writerFactory;
public ProtocolReaderImplTest() throws Exception {
public PacketReaderImplTest() throws Exception {
super();
Injector i = Guice.createInjector(new SerialModule());
serial = i.getInstance(SerialComponent.class);
@@ -44,7 +45,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
public void testFormatExceptionIfAckIsTooLarge() throws Exception {
byte[] b = createAck(true);
ByteArrayInputStream in = new ByteArrayInputStream(b);
ProtocolReaderImpl reader = new ProtocolReaderImpl(readerFactory, null,
PacketReaderImpl reader = new PacketReaderImpl(readerFactory, null,
null, in);
try {
reader.readAck();
@@ -56,7 +57,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
public void testNoFormatExceptionIfAckIsMaximumSize() throws Exception {
byte[] b = createAck(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
ProtocolReaderImpl reader = new ProtocolReaderImpl(readerFactory, null,
PacketReaderImpl reader = new PacketReaderImpl(readerFactory, null,
null, in);
reader.readAck();
}
@@ -65,7 +66,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
public void testEmptyAck() throws Exception {
byte[] b = createEmptyAck();
ByteArrayInputStream in = new ByteArrayInputStream(b);
ProtocolReaderImpl reader = new ProtocolReaderImpl(readerFactory, null,
PacketReaderImpl reader = new PacketReaderImpl(readerFactory, null,
null, in);
try {
reader.readAck();
@@ -77,7 +78,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
public void testFormatExceptionIfOfferIsTooLarge() throws Exception {
byte[] b = createOffer(true);
ByteArrayInputStream in = new ByteArrayInputStream(b);
ProtocolReaderImpl reader = new ProtocolReaderImpl(readerFactory, null,
PacketReaderImpl reader = new PacketReaderImpl(readerFactory, null,
null, in);
try {
reader.readOffer();
@@ -89,7 +90,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
public void testNoFormatExceptionIfOfferIsMaximumSize() throws Exception {
byte[] b = createOffer(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
ProtocolReaderImpl reader = new ProtocolReaderImpl(readerFactory, null,
PacketReaderImpl reader = new PacketReaderImpl(readerFactory, null,
null, in);
reader.readOffer();
}
@@ -98,7 +99,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
public void testEmptyOffer() throws Exception {
byte[] b = createEmptyOffer();
ByteArrayInputStream in = new ByteArrayInputStream(b);
ProtocolReaderImpl reader = new ProtocolReaderImpl(readerFactory, null,
PacketReaderImpl reader = new PacketReaderImpl(readerFactory, null,
null, in);
try {
reader.readOffer();
@@ -110,7 +111,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
public void testFormatExceptionIfRequestIsTooLarge() throws Exception {
byte[] b = createRequest(true);
ByteArrayInputStream in = new ByteArrayInputStream(b);
ProtocolReaderImpl reader = new ProtocolReaderImpl(readerFactory, null,
PacketReaderImpl reader = new PacketReaderImpl(readerFactory, null,
null, in);
try {
reader.readRequest();
@@ -122,7 +123,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
public void testNoFormatExceptionIfRequestIsMaximumSize() throws Exception {
byte[] b = createRequest(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
ProtocolReaderImpl reader = new ProtocolReaderImpl(readerFactory, null,
PacketReaderImpl reader = new PacketReaderImpl(readerFactory, null,
null, in);
reader.readRequest();
}
@@ -148,7 +149,7 @@ public class ProtocolReaderImplTest extends BriarTestCase {
byte[] b = createRequest(bitmap);
// Deserialise the request
ByteArrayInputStream in = new ByteArrayInputStream(b);
ProtocolReaderImpl reader = new ProtocolReaderImpl(readerFactory,
PacketReaderImpl reader = new PacketReaderImpl(readerFactory,
null, null, in);
Request request = reader.readRequest();
BitSet decoded = request.getBitmap();

18
briar-tests/src/net/sf/briar/protocol/ProtocolWriterImplTest.java → briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java
View File

@@ -1,16 +1,18 @@
package net.sf.briar.protocol;
package net.sf.briar.messaging;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.BitSet;
import net.sf.briar.BriarTestCase;
import net.sf.briar.api.protocol.ProtocolWriter;
import net.sf.briar.api.protocol.Request;
import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.Request;
import net.sf.briar.api.serial.SerialComponent;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.messaging.MessagingModule;
import net.sf.briar.messaging.PacketWriterImpl;
import net.sf.briar.serial.SerialModule;
import net.sf.briar.util.StringUtils;
@@ -19,17 +21,17 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class ProtocolWriterImplTest extends BriarTestCase {
public class PacketWriterImplTest extends BriarTestCase {
// FIXME: This is an integration test, not a unit test
private final SerialComponent serial;
private final WriterFactory writerFactory;
public ProtocolWriterImplTest() {
public PacketWriterImplTest() {
super();
Injector i = Guice.createInjector(new ClockModule(), new CryptoModule(),
new ProtocolModule(), new SerialModule());
new MessagingModule(), new SerialModule());
serial = i.getInstance(SerialComponent.class);
writerFactory = i.getInstance(WriterFactory.class);
}
@@ -37,7 +39,7 @@ public class ProtocolWriterImplTest extends BriarTestCase {
@Test
public void testWriteBitmapNoPadding() throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ProtocolWriter w = new ProtocolWriterImpl(serial, writerFactory, out,
PacketWriter w = new PacketWriterImpl(serial, writerFactory, out,
true);
BitSet b = new BitSet();
// 11011001 = 0xD9
@@ -61,7 +63,7 @@ public class ProtocolWriterImplTest extends BriarTestCase {
@Test
public void testWriteBitmapWithPadding() throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ProtocolWriter w = new ProtocolWriterImpl(serial, writerFactory, out,
PacketWriter w = new PacketWriterImpl(serial, writerFactory, out,
true);
BitSet b = new BitSet();
// 01011001 = 0x59

28
briar-tests/src/net/sf/briar/protocol/simplex/OutgoingSimplexConnectionTest.java → briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.protocol.simplex;
package net.sf.briar.messaging.simplex;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.HEADER_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MAC_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MIN_CONNECTION_LENGTH;
@@ -17,18 +17,20 @@ import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.protocol.Ack;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.UniqueId;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.UniqueId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.protocol.ProtocolModule;
import net.sf.briar.protocol.duplex.DuplexProtocolModule;
import net.sf.briar.messaging.MessagingModule;
import net.sf.briar.messaging.duplex.DuplexMessagingModule;
import net.sf.briar.messaging.simplex.OutgoingSimplexConnection;
import net.sf.briar.messaging.simplex.SimplexMessagingModule;
import net.sf.briar.serial.SerialModule;
import net.sf.briar.transport.TransportModule;
@@ -49,7 +51,7 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
private final DatabaseComponent db;
private final ConnectionRegistry connRegistry;
private final ConnectionWriterFactory connFactory;
private final ProtocolWriterFactory protoFactory;
private final PacketWriterFactory protoFactory;
private final ContactId contactId;
private final MessageId messageId;
private final TransportId transportId;
@@ -70,11 +72,11 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
};
Injector i = Guice.createInjector(testModule, new ClockModule(),
new CryptoModule(), new SerialModule(), new TransportModule(),
new SimplexProtocolModule(), new ProtocolModule(),
new DuplexProtocolModule());
new SimplexMessagingModule(), new MessagingModule(),
new DuplexMessagingModule());
connRegistry = i.getInstance(ConnectionRegistry.class);
connFactory = i.getInstance(ConnectionWriterFactory.class);
protoFactory = i.getInstance(ProtocolWriterFactory.class);
protoFactory = i.getInstance(PacketWriterFactory.class);
contactId = new ContactId(234);
messageId = new MessageId(TestUtils.getRandomId());
transportId = new TransportId(TestUtils.getRandomId());

41
briar-tests/src/net/sf/briar/protocol/simplex/SimplexProtocolIntegrationTest.java → briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.protocol.simplex;
package net.sf.briar.messaging.simplex;
import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
@@ -17,13 +17,13 @@ import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageFactory;
import net.sf.briar.api.protocol.MessageVerifier;
import net.sf.briar.api.protocol.ProtocolReaderFactory;
import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.TransportUpdate;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageFactory;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRecogniser;
@@ -34,9 +34,12 @@ import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.db.DatabaseModule;
import net.sf.briar.lifecycle.LifecycleModule;
import net.sf.briar.messaging.MessagingModule;
import net.sf.briar.messaging.duplex.DuplexMessagingModule;
import net.sf.briar.messaging.simplex.IncomingSimplexConnection;
import net.sf.briar.messaging.simplex.OutgoingSimplexConnection;
import net.sf.briar.messaging.simplex.SimplexMessagingModule;
import net.sf.briar.plugins.ImmediateExecutor;
import net.sf.briar.protocol.ProtocolModule;
import net.sf.briar.protocol.duplex.DuplexProtocolModule;
import net.sf.briar.serial.SerialModule;
import net.sf.briar.transport.TransportModule;
@@ -47,7 +50,7 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class SimplexProtocolIntegrationTest extends BriarTestCase {
public class SimplexMessagingIntegrationTest extends BriarTestCase {
private static final long CLOCK_DIFFERENCE = 60 * 1000L;
private static final long LATENCY = 60 * 1000L;
@@ -61,7 +64,7 @@ public class SimplexProtocolIntegrationTest extends BriarTestCase {
private Injector alice, bob;
public SimplexProtocolIntegrationTest() throws Exception {
public SimplexMessagingIntegrationTest() throws Exception {
super();
transportId = new TransportId(TestUtils.getRandomId());
// Create matching secrets for Alice and Bob
@@ -81,9 +84,9 @@ public class SimplexProtocolIntegrationTest extends BriarTestCase {
private Injector createInjector(File dir) {
return Guice.createInjector(new ClockModule(), new CryptoModule(),
new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(),
new TestDatabaseModule(dir), new SimplexProtocolModule(),
new TransportModule(), new DuplexProtocolModule());
new MessagingModule(), new SerialModule(),
new TestDatabaseModule(dir), new SimplexMessagingModule(),
new TransportModule(), new DuplexMessagingModule());
}
@Test
@@ -124,8 +127,8 @@ public class SimplexProtocolIntegrationTest extends BriarTestCase {
alice.getInstance(ConnectionRegistry.class);
ConnectionWriterFactory connFactory =
alice.getInstance(ConnectionWriterFactory.class);
ProtocolWriterFactory protoFactory =
alice.getInstance(ProtocolWriterFactory.class);
PacketWriterFactory protoFactory =
alice.getInstance(PacketWriterFactory.class);
TestSimplexTransportWriter transport = new TestSimplexTransportWriter(
out, Long.MAX_VALUE, false);
ConnectionContext ctx = km.getConnectionContext(contactId, transportId);
@@ -179,8 +182,8 @@ public class SimplexProtocolIntegrationTest extends BriarTestCase {
bob.getInstance(ConnectionRegistry.class);
ConnectionReaderFactory connFactory =
bob.getInstance(ConnectionReaderFactory.class);
ProtocolReaderFactory protoFactory =
bob.getInstance(ProtocolReaderFactory.class);
PacketReaderFactory protoFactory =
bob.getInstance(PacketReaderFactory.class);
TestSimplexTransportReader transport =
new TestSimplexTransportReader(in);
IncomingSimplexConnection simplex = new IncomingSimplexConnection(

2
briar-tests/src/net/sf/briar/protocol/simplex/TestSimplexTransportReader.java → briar-tests/src/net/sf/briar/messaging/simplex/TestSimplexTransportReader.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.protocol.simplex;
package net.sf.briar.messaging.simplex;
import java.io.InputStream;

2
briar-tests/src/net/sf/briar/protocol/simplex/TestSimplexTransportWriter.java → briar-tests/src/net/sf/briar/messaging/simplex/TestSimplexTransportWriter.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.protocol.simplex;
package net.sf.briar.messaging.simplex;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;

2
briar-tests/src/net/sf/briar/plugins/PluginManagerImplTest.java
View File

@@ -10,11 +10,11 @@ import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.duplex.DuplexPluginConfig;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.plugins.simplex.SimplexPluginConfig;
import net.sf.briar.api.plugins.simplex.SimplexPluginFactory;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.ui.UiCallback;
import net.sf.briar.plugins.file.RemovableDrivePluginFactory;

2
briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java
View File

@@ -6,7 +6,7 @@ import java.util.Collections;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionRegistry;
import org.junit.Test;

2
briar-tests/src/net/sf/briar/transport/TransportConnectionRecogniserTest.java
View File

@@ -14,7 +14,7 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.ErasableKey;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.TemporarySecret;
import net.sf.briar.util.ByteUtils;

4
briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.transport;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MIN_CONNECTION_LENGTH;
import static org.junit.Assert.assertArrayEquals;
@@ -16,7 +16,7 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.crypto.AuthenticatedCipher;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.ErasableKey;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;