From b1ec344bdb5f570f76fbdbf130c22fc23835eb2f Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 14 Jul 2020 11:28:33 +0100 Subject: [PATCH] Update account manager test. --- .../bramble/account/AndroidAccountManagerTest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/bramble-android/src/test/java/org/briarproject/bramble/account/AndroidAccountManagerTest.java b/bramble-android/src/test/java/org/briarproject/bramble/account/AndroidAccountManagerTest.java index 2b7b8bb88..4ccd98427 100644 --- a/bramble-android/src/test/java/org/briarproject/bramble/account/AndroidAccountManagerTest.java +++ b/bramble-android/src/test/java/org/briarproject/bramble/account/AndroidAccountManagerTest.java @@ -7,6 +7,7 @@ import android.content.pm.ApplicationInfo; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.identity.IdentityManager; +import org.briarproject.bramble.api.logging.PersistentLogManager; import org.briarproject.bramble.test.BrambleMockTestCase; import org.jmock.Expectations; import org.jmock.lib.legacy.ClassImposteriser; @@ -15,7 +16,9 @@ import org.junit.Before; import org.junit.Test; import java.io.File; +import java.util.logging.Logger; +import static android.content.Context.MODE_PRIVATE; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; @@ -27,6 +30,8 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase { context.mock(SharedPreferences.class, "prefs"); private final SharedPreferences defaultPrefs = context.mock(SharedPreferences.class, "defaultPrefs"); + private final PersistentLogManager logManager = + context.mock(PersistentLogManager.class); private final DatabaseConfig databaseConfig = context.mock(DatabaseConfig.class); private final CryptoComponent crypto = context.mock(CryptoComponent.class); @@ -40,6 +45,7 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase { private final File testDir = getTestDirectory(); private final File keyDir = new File(testDir, "key"); private final File dbDir = new File(testDir, "db"); + private final File logDir = new File(testDir, "log"); private AndroidAccountManager accountManager; @@ -61,7 +67,7 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase { will(returnValue(app)); }}); accountManager = new AndroidAccountManager(databaseConfig, crypto, - identityManager, prefs, app) { + identityManager, prefs, logManager, app) { @Override SharedPreferences getDefaultSharedPreferences() { return defaultPrefs; @@ -109,10 +115,15 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase { will(returnValue(cacheDir)); oneOf(app).getExternalCacheDir(); will(returnValue(externalCacheDir)); + oneOf(app).getDir("log", MODE_PRIVATE); + will(returnValue(logDir)); + oneOf(logManager).addLogHandler(with(logDir), + with(any(Logger.class))); }}); assertTrue(dbDir.mkdirs()); assertTrue(keyDir.mkdirs()); + assertTrue(logDir.mkdirs()); assertTrue(codeCacheDir.mkdirs()); assertTrue(codeCacheFile.createNewFile()); assertTrue(libDir.mkdirs());