From 947da886bf5855866a297e1f07e47ca5e2a6214d Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 10 Dec 2015 15:14:50 +0000
Subject: [PATCH] Fixed broken tests.
---
.../src/org/briarproject/db/DatabaseComponentTest.java | 3 +++
briar-tests/src/org/briarproject/db/H2DatabaseTest.java | 3 ++-
.../briarproject/plugins/file/RemovableDrivePluginTest.java | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java b/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java
index 2e94aa96a3..364d2ef622 100644
--- a/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java
+++ b/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java
@@ -28,6 +28,7 @@ import org.briarproject.api.event.MessageRequestedEvent;
import org.briarproject.api.event.MessageToAckEvent;
import org.briarproject.api.event.MessageToRequestEvent;
import org.briarproject.api.event.MessagesAckedEvent;
+import org.briarproject.api.event.MessagesSentEvent;
import org.briarproject.api.event.SubscriptionAddedEvent;
import org.briarproject.api.event.SubscriptionRemovedEvent;
import org.briarproject.api.lifecycle.ShutdownManager;
@@ -705,6 +706,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
maxLatency);
oneOf(database).lowerRequestedFlag(txn, contactId, ids);
oneOf(database).commitTransaction(txn);
+ oneOf(eventBus).broadcast(with(any(MessagesSentEvent.class)));
}});
DatabaseComponent db = createDatabaseComponent(database, cleaner,
eventBus, shutdown);
@@ -805,6 +807,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
maxLatency);
oneOf(database).lowerRequestedFlag(txn, contactId, ids);
oneOf(database).commitTransaction(txn);
+ oneOf(eventBus).broadcast(with(any(MessagesSentEvent.class)));
}});
DatabaseComponent db = createDatabaseComponent(database, cleaner,
eventBus, shutdown);
diff --git a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
index 430a9a7ec9..ea698960ff 100644
--- a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
+++ b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
@@ -41,6 +41,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
+import static org.briarproject.api.db.MessageHeader.State.STORED;
import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -1516,7 +1517,7 @@ public class H2DatabaseTest extends BriarTestCase {
assertEquals(timestamp, header.getTimestamp());
assertEquals(local, header.isLocal());
assertEquals(false, header.isRead());
- assertEquals(seen, header.isDelivered());
+ assertEquals(STORED, header.getStatus());
assertFalse(header.isRead());
db.commitTransaction(txn);
diff --git a/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java b/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
index cb29fc2694..0ba391422c 100644
--- a/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
+++ b/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
@@ -1,6 +1,5 @@
package org.briarproject.plugins.file;
-import com.google.inject.Inject;
import org.briarproject.BriarTestCase;
import org.briarproject.TestUtils;
import org.briarproject.api.ContactId;
@@ -9,6 +8,7 @@ import org.briarproject.api.plugins.simplex.SimplexPluginCallback;
import org.briarproject.api.system.FileUtils;
import org.briarproject.plugins.ImmediateExecutor;
import org.briarproject.plugins.file.RemovableDriveMonitor.Callback;
+import org.briarproject.system.FileUtilsImpl;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.After;
@@ -34,7 +34,7 @@ public class RemovableDrivePluginTest extends BriarTestCase {
private final File testDir = TestUtils.getTestDirectory();
private final ContactId contactId = new ContactId(234);
- @Inject private FileUtils fileUtils;
+ private final FileUtils fileUtils = new FileUtilsImpl();
@Before
public void setUp() {
--
GitLab