From df7d48d54d6b996e866176552f9f68bb56a884c5 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 11 May 2018 09:40:10 +0100
Subject: [PATCH] Fix test expectations.
---
.../android/login/SetupControllerImplTest.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/briar-android/src/test/java/org/briarproject/briar/android/login/SetupControllerImplTest.java b/briar-android/src/test/java/org/briarproject/briar/android/login/SetupControllerImplTest.java
index 6fe3f42c89..b705241026 100644
--- a/briar-android/src/test/java/org/briarproject/briar/android/login/SetupControllerImplTest.java
+++ b/briar-android/src/test/java/org/briarproject/briar/android/login/SetupControllerImplTest.java
@@ -1,6 +1,7 @@
package org.briarproject.briar.android.login;
import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
import org.briarproject.bramble.api.crypto.CryptoComponent;
import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
@@ -8,10 +9,13 @@ import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.db.DatabaseConfig;
import org.briarproject.bramble.test.BrambleMockTestCase;
import org.briarproject.bramble.test.ImmediateExecutor;
+import org.briarproject.bramble.test.TestUtils;
import org.jmock.Expectations;
import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
import org.junit.Test;
+import java.io.File;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -40,6 +44,7 @@ public class SetupControllerImplTest extends BrambleMockTestCase {
private final String encryptedHex = "010203";
private final byte[] encryptedBytes = new byte[] {1, 2, 3};
private final SecretKey key = getSecretKey();
+ private final File testDir = TestUtils.getTestDirectory();
public SetupControllerImplTest() {
context.setImposteriser(ClassImposteriser.INSTANCE);
@@ -50,6 +55,11 @@ public class SetupControllerImplTest extends BrambleMockTestCase {
@SuppressWarnings("ResultOfMethodCallIgnored")
public void testCreateAccount() {
context.checking(new Expectations() {{
+ // Allow the contents of the data directory to be logged
+ allowing(setupActivity).getApplicationInfo();
+ will(returnValue(new ApplicationInfo() {{
+ dataDir = testDir.getAbsolutePath();
+ }}));
// Set the author name and password
oneOf(setupActivity).setAuthorName(authorName);
oneOf(setupActivity).setPassword(password);
@@ -84,4 +94,9 @@ public class SetupControllerImplTest extends BrambleMockTestCase {
s.createAccount(result -> called.set(true));
assertTrue(called.get());
}
+
+ @After
+ public void tearDown() {
+ TestUtils.deleteTestDirectory(testDir);
+ }
}
--
GitLab