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

Fix SharerLeavesBeforeResponse Integration Test

Browse Source 
Closes #575
This commit is contained in:
Torsten Grote
2016-08-03 18:15:14 -03:00
parent 4a4366078a
commit 16da3f2cab
1 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java
View File

@@ -113,6 +113,7 @@ public class ForumSharingIntegrationTest extends BriarTestCase {
private final String SHARER = "Sharer"; private final String SHARER = "Sharer";
private final String INVITEE = "Invitee"; private final String INVITEE = "Invitee";
private final String SHARER2 = "Sharer2"; private final String SHARER2 = "Sharer2";
private boolean respond = true;
private static final Logger LOG = private static final Logger LOG =
Logger.getLogger(ForumSharingIntegrationTest.class.getName()); Logger.getLogger(ForumSharingIntegrationTest.class.getName());
@@ -408,7 +409,7 @@ public class ForumSharingIntegrationTest extends BriarTestCase {
public void testSharerLeavesBeforeResponse() throws Exception { public void testSharerLeavesBeforeResponse() throws Exception {
startLifecycles(); startLifecycles();
try { try {
// initialize and let invitee accept all requests // initialize except event listeners
defaultInit(true); defaultInit(true);
// send invitation // send invitation
@@ -418,17 +419,43 @@ public class ForumSharingIntegrationTest extends BriarTestCase {
// sharer un-subscribes from forum // sharer un-subscribes from forum
forumManager0.removeForum(forum0); forumManager0.removeForum(forum0);
// from here on expect the response to fail with an AssertionError, // prevent invitee response before syncing messages
// because there is in fact no invited forum available anymore respond = false;
thrown.expect(AssertionError.class);
// sync first request message and leave message // sync first request message and leave message
syncToInvitee(); syncToInvitee();
eventWaiter.await(TIMEOUT, 1); eventWaiter.await(TIMEOUT, 1);
assertTrue(listener1.requestReceived); assertTrue(listener1.requestReceived);
// invitee has no forums available // wait also for second message to arrive
msgWaiter.await(TIMEOUT, 1);
// ensure that invitee has no forum invitations available
assertEquals(0, forumSharingManager1.getInvited().size()); assertEquals(0, forumSharingManager1.getInvited().size());
assertEquals(0, forumManager1.getForums().size());
// Try again, this time allow the response
addForumForSharer();
respond = true;
// send invitation
forumSharingManager0
.sendInvitation(forum0.getId(), contactId1, null);
// sharer un-subscribes from forum
forumManager0.removeForum(forum0);
// sync first request message and leave message
syncToInvitee();
eventWaiter.await(TIMEOUT, 1);
assertTrue(listener1.requestReceived);
// wait also for second message to arrive
msgWaiter.await(TIMEOUT, 1);
// ensure that invitee has no forum invitations available
assertEquals(0, forumSharingManager1.getInvited().size());
assertEquals(1, forumManager1.getForums().size());
} finally { } finally {
stopLifecycles(); stopLifecycles();
} }
@@ -979,9 +1006,12 @@ public class ForumSharingIntegrationTest extends BriarTestCase {
try { try {
eventWaiter.assertEquals(1, eventWaiter.assertEquals(1,
forumSharingManager1.getInvited().size()); forumSharingManager1.getInvited().size());
Contact c = if (respond) {
contactManager1.getContact(event.getContactId()); Contact c =
forumSharingManager1.respondToInvitation(f, c, accept); contactManager1
.getContact(event.getContactId());
forumSharingManager1.respondToInvitation(f, c, accept);
}
} catch (DbException ex) { } catch (DbException ex) {
eventWaiter.rethrow(ex); eventWaiter.rethrow(ex);
} finally { } finally {