Skip to content
Snippets Groups Projects
Commit 17e149e5 authored by akwizgran's avatar akwizgran
Browse files

Merge branch '766-unit-tests-for-invitee-protocol-engine' into 'master' 

Add unit tests for InviteeProtocolEngine

Next part of #766

See merge request !444
parents 7df6abbc 55888556
Branches
Tags
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
briar-tests/src/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngineTest.java
+ 21
− 5
View file @ 17e149e5
......@@ -24,7 +24,7 @@ import org.jmock.Expectations;
import static org.briarproject.TestUtils.getRandomBytes;
import static org.briarproject.TestUtils.getRandomId;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_ID;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.*;
import static org.briarproject.briar.privategroup.invitation.GroupInvitationConstants.GROUP_KEY_CONTACT_ID;
import static org.briarproject.briar.privategroup.invitation.MessageType.ABORT;
import static org.briarproject.briar.privategroup.invitation.MessageType.INVITE;
......@@ -80,6 +80,21 @@ public abstract class AbstractProtocolEngineTest extends BriarMockTestCase {
BdfDictionary.of(new BdfEntry("me", "ta"));
protected final ContactId contactId = new ContactId(5);
protected final InviteMessage inviteMessage =
new InviteMessage(new MessageId(getRandomId()), contactGroupId,
privateGroupId, 0L, privateGroup.getName(),
privateGroup.getCreator(), privateGroup.getSalt(), "msg",
signature);
protected final JoinMessage joinMessage =
new JoinMessage(new MessageId(getRandomId()), contactGroupId,
privateGroupId, 0L, lastRemoteMessageId);
protected final LeaveMessage leaveMessage =
new LeaveMessage(new MessageId(getRandomId()), contactGroupId,
privateGroupId, 0L, lastRemoteMessageId);
protected final AbortMessage abortMessage =
new AbortMessage(messageId, contactGroupId, privateGroupId,
inviteTimestamp + 1);
protected void assertSessionConstantsUnchanged(Session s1, Session s2) {
assertEquals(s1.getRole(), s2.getRole());
assertEquals(s1.getContactGroupId(), s2.getContactGroupId());
......@@ -112,7 +127,8 @@ public abstract class AbstractProtocolEngineTest extends BriarMockTestCase {
expectSendMessage(INVITE, true);
}
protected void expectSendJoinMessage(final JoinMessage m) throws Exception {
protected void expectSendJoinMessage(final JoinMessage m, boolean visible)
throws Exception {
expectGetLocalTimestamp(messageTimestamp);
context.checking(new Expectations() {{
oneOf(messageEncoder).encodeJoinMessage(m.getContactGroupId(),
......@@ -120,10 +136,10 @@ public abstract class AbstractProtocolEngineTest extends BriarMockTestCase {
lastLocalMessageId);
will(returnValue(message));
}});
expectSendMessage(JOIN, false);
expectSendMessage(JOIN, visible);
}
protected void expectSendLeaveMessage() throws Exception {
protected void expectSendLeaveMessage(boolean visible) throws Exception {
expectGetLocalTimestamp(messageTimestamp);
context.checking(new Expectations() {{
oneOf(messageEncoder)
......@@ -131,7 +147,7 @@ public abstract class AbstractProtocolEngineTest extends BriarMockTestCase {
messageTimestamp, lastLocalMessageId);
will(returnValue(message));
}});
expectSendMessage(LEAVE, false);
expectSendMessage(LEAVE, visible);
}
protected void expectSendAbortMessage() throws Exception {
......
briar-tests/src/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngineTest.java
+ 60
− 77
View file @ 17e149e5
......@@ -22,12 +22,6 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
new CreatorProtocolEngine(db, clientHelper, privateGroupManager,
privateGroupFactory, groupMessageFactory, identityManager,
messageParser, messageEncoder, messageTracker, clock);
private final JoinMessage joinMessage =
new JoinMessage(new MessageId(getRandomId()), contactGroupId,
privateGroupId, 0L, lastRemoteMessageId);
private final LeaveMessage leaveMessage =
new LeaveMessage(new MessageId(getRandomId()), contactGroupId,
privateGroupId, 0L, lastRemoteMessageId);
private CreatorSession getDefaultSession(CreatorState state) {
return new CreatorSession(contactGroupId, privateGroupId,
......@@ -185,7 +179,7 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
private void expectOnLocalLeave() throws Exception {
expectSetPrivateGroupVisibility(INVISIBLE);
expectSendLeaveMessage();
expectSendLeaveMessage(false);
}
// onMemberAddedAction
......@@ -214,27 +208,34 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
// onInviteMessage
@Test
public void testOnInviteMessageInAnyState() throws Exception {
InviteMessage inviteMessage =
new InviteMessage(new MessageId(getRandomId()), contactGroupId,
privateGroupId, inviteTimestamp, privateGroup.getName(),
author, privateGroup.getSalt(), null, signature);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
public void testOnInviteMessageInAnyStateWhenSubscribed() throws Exception {
expectAbortWhenSubscribedToGroup();
CreatorSession session = getDefaultSession(LEFT);
CreatorSession newSession =
engine.onInviteMessage(txn, session, inviteMessage);
assertEquals(ERROR, newSession.getState());
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
session = getDefaultSession(START);
newSession =
engine.onInviteMessage(txn, session, inviteMessage);
assertSessionAborted(session, newSession);
}
@Test
public void testOnInviteMessageInAnyStateWhenNotSubscribed()
throws Exception {
expectAbortWhenNotSubscribedToGroup();
CreatorSession session = getDefaultSession(LEFT);
CreatorSession newSession =
engine.onInviteMessage(txn, session, inviteMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
expectAbortWhenNotSubscribedToGroup();
session = getDefaultSession(START);
newSession =
engine.onInviteMessage(txn, session, inviteMessage);
assertSessionAborted(session, newSession);
}
// onJoinMessage
......@@ -243,39 +244,30 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
public void testOnJoinMessageFromStart() throws Exception {
CreatorSession session = getDefaultSession(START);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onJoinMessage(txn, session, joinMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
public void testOnJoinMessageFromJoined() throws Exception {
CreatorSession session = getDefaultSession(JOINED);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onJoinMessage(txn, session, joinMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
public void testOnJoinMessageFromLeft() throws Exception {
CreatorSession session = getDefaultSession(LEFT);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onJoinMessage(txn, session, joinMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
......@@ -283,13 +275,10 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
throws Exception {
CreatorSession session = getDefaultSession(INVITED);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onJoinMessage(txn, session, joinMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
......@@ -300,13 +289,10 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
new JoinMessage(messageId, contactGroupId, privateGroupId,
inviteTimestamp + 1, messageId);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onJoinMessage(txn, session, invalidJoinMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
......@@ -317,7 +303,7 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
privateGroupId, inviteTimestamp + 1,
lastRemoteMessageId);
expectSendJoinMessage(properJoinMessage);
expectSendJoinMessage(properJoinMessage, false);
expectMarkMessageVisibleInUi(properJoinMessage.getId(), true);
context.checking(new Expectations() {{
oneOf(messageTracker)
......@@ -358,39 +344,30 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
inviteTimestamp, lastLocalMessageId);
CreatorSession session = getDefaultSession(START);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onLeaveMessage(txn, session, leaveMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
public void testOnLeaveMessageFromLeft() throws Exception {
CreatorSession session = getDefaultSession(LEFT);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onLeaveMessage(txn, session, leaveMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
public void testOnLeaveMessageFromInvitedWithWrongTime() throws Exception {
CreatorSession session = getDefaultSession(INVITED);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onLeaveMessage(txn, session, leaveMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
......@@ -401,13 +378,10 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
inviteTimestamp + 1, lastLocalMessageId);
CreatorSession session = getDefaultSession(INVITED);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onLeaveMessage(txn, session, invalidLeaveMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
......@@ -455,34 +429,43 @@ public class CreatorProtocolEngineTest extends AbstractProtocolEngineTest {
@Test
public void testOnAbortMessageWhenNotSubscribed() throws Exception {
AbortMessage abortMessage =
new AbortMessage(messageId, contactGroupId, privateGroupId,
inviteTimestamp + 1);
CreatorSession session = getDefaultSession(START);
expectIsNotSubscribedPrivateGroup();
expectSendAbortMessage();
CreatorSession newSession =
engine.onAbortMessage(txn, session, abortMessage);
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionAborted(session, newSession);
}
@Test
public void testOnAbortMessageWhenSubscribed() throws Exception {
AbortMessage abortMessage =
new AbortMessage(messageId, contactGroupId, privateGroupId,
inviteTimestamp + 1);
CreatorSession session = getDefaultSession(START);
expectIsSubscribedPrivateGroup();
expectSendAbortMessage();
expectAbortWhenSubscribedToGroup();
CreatorSession newSession =
engine.onAbortMessage(txn, session, abortMessage);
assertSessionAborted(session, newSession);
}
// helper methods
private void expectAbortWhenSubscribedToGroup() throws Exception {
expectIsSubscribedPrivateGroup();
expectSetPrivateGroupVisibility(INVISIBLE);
expectSendAbortMessage();
}
private void expectAbortWhenNotSubscribedToGroup() throws Exception {
expectIsNotSubscribedPrivateGroup();
expectSendAbortMessage();
}
private void assertSessionAborted(CreatorSession oldSession,
CreatorSession newSession) throws Exception {
assertEquals(ERROR, newSession.getState());
assertSessionRecordedSentMessage(newSession);
assertSessionConstantsUnchanged(session, newSession);
assertSessionConstantsUnchanged(oldSession, newSession);
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment