Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Ensure that observers see the final state even if they're added late.

Browse Source
This commit is contained in:
akwizgran
2021-05-07 16:30:53 +01:00
committed by Torsten Grote
parent c010dd9401
commit dc2ad48a7f
5 changed files with 94 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTest.java
View File

@@ -11,7 +11,6 @@ import org.briarproject.bramble.api.identity.IdentityManager;
import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.plugin.file.RemovableDriveTask;
import org.briarproject.bramble.api.plugin.file.RemovableDriveTask.Observer;
import org.briarproject.bramble.api.sync.event.MessageStateChangedEvent;
import org.briarproject.bramble.test.BrambleTestCase;
import org.briarproject.bramble.test.TestDatabaseConfigModule;
@@ -100,15 +99,8 @@ public class RemovableDriveIntegrationTest extends BrambleTestCase {
RemovableDriveTask reader = device.getRemovableDriveManager()
.startReaderTask(contactId, file);
CountDownLatch disposedLatch = new CountDownLatch(1);
reader.addObserver(new Observer() {
@Override
public void onProgress(long done, long total) {
}
@Override
public void onCompletion(boolean success) {
disposedLatch.countDown();
}
reader.addObserver(state -> {
if (state.isFinished()) disposedLatch.countDown();
});
// Wait for the messages to be delivered
assertTrue(listener.delivered.await(TIMEOUT_MS, MILLISECONDS));
@@ -125,15 +117,8 @@ public class RemovableDriveIntegrationTest extends BrambleTestCase {
RemovableDriveTask writer = device.getRemovableDriveManager()
.startWriterTask(contactId, file);
CountDownLatch disposedLatch = new CountDownLatch(1);
writer.addObserver(new Observer() {
@Override
public void onProgress(long done, long total) {
}
@Override
public void onCompletion(boolean success) {
disposedLatch.countDown();
}
writer.addObserver(state -> {
if (state.isFinished()) disposedLatch.countDown();
});
// Wait for the writer to be disposed
disposedLatch.await(TIMEOUT_MS, MILLISECONDS);