Static imports.

briar-core/src/main/java/org/briarproject/briar/blog/BlogPostFactoryImpl.java

@@ -9,7 +9,6 @@ import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.api.blog.BlogPost;
 import org.briarproject.briar.api.blog.BlogPostFactory;
 import org.briarproject.briar.api.blog.MessageType;
@@ -20,6 +19,7 @@ import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
+import static org.briarproject.bramble.util.StringUtils.toUtf8;
 import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_COMMENT_TEXT_LENGTH;
 import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH;
 import static org.briarproject.briar.api.blog.MessageType.COMMENT;
@@ -46,7 +46,7 @@ class BlogPostFactoryImpl implements BlogPostFactory {
 			throws FormatException, GeneralSecurityException {
 
 		// Validate the arguments
-		int textLength = StringUtils.toUtf8(text).length;
+		int textLength = toUtf8(text).length;
 		if (textLength > MAX_BLOG_POST_TEXT_LENGTH)
 			throw new IllegalArgumentException();
 
@@ -70,7 +70,7 @@ class BlogPostFactoryImpl implements BlogPostFactory {
 			throws FormatException, GeneralSecurityException {
 
 		if (comment != null) {
-			int commentLength = StringUtils.toUtf8(comment).length;
+			int commentLength = toUtf8(comment).length;
 			if (commentLength == 0) throw new IllegalArgumentException();
 			if (commentLength > MAX_BLOG_COMMENT_TEXT_LENGTH)
 				throw new IllegalArgumentException();

briar-core/src/main/java/org/briarproject/briar/feed/FeedFactoryImpl.java

@@ -13,7 +13,6 @@ import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorFactory;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.api.blog.Blog;
 import org.briarproject.briar.api.blog.BlogFactory;
 import org.briarproject.briar.api.feed.Feed;
@@ -21,6 +20,7 @@ import org.briarproject.briar.api.feed.Feed;
 import javax.inject.Inject;
 
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.bramble.util.StringUtils.truncateUtf8;
 import static org.briarproject.briar.api.feed.FeedConstants.KEY_FEED_ADDED;
 import static org.briarproject.briar.api.feed.FeedConstants.KEY_FEED_AUTHOR;
 import static org.briarproject.briar.api.feed.FeedConstants.KEY_FEED_DESC;
@@ -53,7 +53,7 @@ class FeedFactoryImpl implements FeedFactory {
 	public Feed createFeed(String url, SyndFeed syndFeed) {
 		String title = syndFeed.getTitle();
 		if (title == null) title = "RSS";
-		else title = StringUtils.truncateUtf8(title, MAX_AUTHOR_NAME_LENGTH);
+		else title = truncateUtf8(title, MAX_AUTHOR_NAME_LENGTH);
 
 		KeyPair keyPair = cryptoComponent.generateSignatureKeyPair();
 		LocalAuthor localAuthor = authorFactory.createLocalAuthor(title,

briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java

@@ -29,7 +29,6 @@ import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.Scheduler;
-import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.api.blog.Blog;
 import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPost;
@@ -41,7 +40,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -61,9 +59,13 @@ import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
+import static java.util.Collections.sort;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
+import static org.briarproject.bramble.util.StringUtils.truncateUtf8;
 import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH;
 import static org.briarproject.briar.api.feed.FeedConstants.FETCH_DELAY_INITIAL;
 import static org.briarproject.briar.api.feed.FeedConstants.FETCH_INTERVAL;
@@ -79,7 +81,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
 		BlogManager.RemoveBlogHook {
 
 	private static final Logger LOG =
-			Logger.getLogger(FeedManagerImpl.class.getName());
+			getLogger(FeedManagerImpl.class.getName());
 
 	private static final int CONNECT_TIMEOUT = 60 * 1000; // Milliseconds
 
@@ -319,21 +321,18 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
 			throw new IOException("Feed has no entries");
 
 		// clean title
-		String title =
-				StringUtils.isNullOrEmpty(f.getTitle()) ? null : f.getTitle();
+		String title = isNullOrEmpty(f.getTitle()) ? null : f.getTitle();
 		if (title != null) title = clean(title, STRIP_ALL);
 		f.setTitle(title);
 
 		// clean description
-		String description =
-				StringUtils.isNullOrEmpty(f.getDescription()) ? null :
-						f.getDescription();
+		String description = isNullOrEmpty(f.getDescription()) ? null :
+				f.getDescription();
 		if (description != null) description = clean(description, STRIP_ALL);
 		f.setDescription(description);
 
 		// clean author
-		String author =
-				StringUtils.isNullOrEmpty(f.getAuthor()) ? null : f.getAuthor();
+		String author = isNullOrEmpty(f.getAuthor()) ? null : f.getAuthor();
 		if (author != null) author = clean(author, STRIP_ALL);
 		f.setAuthor(author);
 
@@ -386,7 +385,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
 		long lastEntryTime = feed.getLastEntryTime();
 		Transaction txn = db.startTransaction(false);
 		try {
-			Collections.sort(entries, getEntryComparator());
+			sort(entries, getEntryComparator());
 			for (SyndEntry entry : entries) {
 				long entryTime;
 				if (entry.getPublishedDate() != null) {
@@ -416,7 +415,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
 		// build post text
 		StringBuilder b = new StringBuilder();
 
-		if (!StringUtils.isNullOrEmpty(entry.getTitle())) {
+		if (!isNullOrEmpty(entry.getTitle())) {
 			b.append("<h1>").append(entry.getTitle()).append("</h1>");
 		}
 		for (SyndContent content : entry.getContents()) {
@@ -429,7 +428,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
 				b.append(entry.getDescription().getValue());
 		}
 		b.append("<p>");
-		if (!StringUtils.isNullOrEmpty(entry.getAuthor())) {
+		if (!isNullOrEmpty(entry.getAuthor())) {
 			b.append("-- ").append(entry.getAuthor());
 		}
 		if (entry.getPublishedDate() != null) {
@@ -441,7 +440,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
 		}
 		b.append("</p>");
 		String link = entry.getLink();
-		if (!StringUtils.isNullOrEmpty(link)) {
+		if (!isNullOrEmpty(link)) {
 			b.append("<a href=\"").append(link).append("\">").append(link)
 					.append("</a>");
 		}
@@ -471,7 +470,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
 
 	private String getPostText(String text) {
 		text = clean(text, ARTICLE);
-		return StringUtils.truncateUtf8(text, MAX_BLOG_POST_TEXT_LENGTH);
+		return truncateUtf8(text, MAX_BLOG_POST_TEXT_LENGTH);
 	}
 
 	private Comparator<SyndEntry> getEntryComparator() {

briar-core/src/main/java/org/briarproject/briar/forum/ForumFactoryImpl.java

@@ -6,7 +6,6 @@ import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.GroupFactory;
-import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.api.forum.Forum;
 import org.briarproject.briar.api.forum.ForumFactory;
 
@@ -15,6 +14,7 @@ import java.security.SecureRandom;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
+import static org.briarproject.bramble.util.StringUtils.toUtf8;
 import static org.briarproject.briar.api.forum.ForumConstants.FORUM_SALT_LENGTH;
 import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_NAME_LENGTH;
 import static org.briarproject.briar.api.forum.ForumManager.CLIENT_ID;
@@ -38,7 +38,7 @@ class ForumFactoryImpl implements ForumFactory {
 
 	@Override
 	public Forum createForum(String name) {
-		int length = StringUtils.toUtf8(name).length;
+		int length = toUtf8(name).length;
 		if (length == 0) throw new IllegalArgumentException();
 		if (length > MAX_FORUM_NAME_LENGTH)
 			throw new IllegalArgumentException();

briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java

@@ -41,6 +41,7 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.introduction.IntroduceeState.AWAIT_AUTH;
 import static org.briarproject.briar.introduction.IntroduceeState.AWAIT_RESPONSES;
@@ -56,7 +57,7 @@ class IntroduceeProtocolEngine
 		extends AbstractProtocolEngine<IntroduceeSession> {
 
 	private final static Logger LOG =
-			Logger.getLogger(IntroduceeProtocolEngine.class.getName());
+			getLogger(IntroduceeProtocolEngine.class.getName());
 
 	private final IntroductionCrypto crypto;
 	private final KeyManager keyManager;

briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeSession.java

@@ -17,9 +17,9 @@ import java.util.Map;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import static org.briarproject.briar.api.introduction.Role.INTRODUCEE;
 import static org.briarproject.briar.introduction.IntroduceeState.AWAIT_ACTIVATE;
 import static org.briarproject.briar.introduction.IntroduceeState.START;
-import static org.briarproject.briar.api.introduction.Role.INTRODUCEE;
 
 @Immutable
 @NotNullByDefault

briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupFactoryImpl.java

@@ -7,7 +7,6 @@ import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.GroupFactory;
-import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.api.privategroup.PrivateGroup;
 import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 
@@ -16,6 +15,7 @@ import java.security.SecureRandom;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
+import static org.briarproject.bramble.util.StringUtils.toUtf8;
 import static org.briarproject.bramble.util.ValidationUtils.checkLength;
 import static org.briarproject.bramble.util.ValidationUtils.checkSize;
 import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.GROUP_SALT_LENGTH;
@@ -42,7 +42,7 @@ class PrivateGroupFactoryImpl implements PrivateGroupFactory {
 
 	@Override
 	public PrivateGroup createPrivateGroup(String name, Author creator) {
-		int length = StringUtils.toUtf8(name).length;
+		int length = toUtf8(name).length;
 		if (length == 0 || length > MAX_GROUP_NAME_LENGTH)
 			throw new IllegalArgumentException();
 		byte[] salt = new byte[GROUP_SALT_LENGTH];

briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java

@@ -13,12 +13,12 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager;
 import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.conversation.ConversationRequest;
 import org.briarproject.briar.api.forum.Forum;
 import org.briarproject.briar.api.forum.ForumInvitationResponse;
 import org.briarproject.briar.api.forum.ForumManager;
 import org.briarproject.briar.api.forum.event.ForumInvitationRequestReceivedEvent;
 import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent;
-import org.briarproject.briar.api.conversation.ConversationRequest;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;

briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java

@@ -56,6 +56,7 @@ import javax.inject.Inject;
 import static java.util.Collections.emptyList;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.util.StringUtils.getRandomString;
@@ -66,7 +67,7 @@ import static org.briarproject.briar.test.TestData.GROUP_NAMES;
 public class TestDataCreatorImpl implements TestDataCreator {
 
 	private final Logger LOG =
-			Logger.getLogger(TestDataCreatorImpl.class.getName());
+			getLogger(TestDataCreatorImpl.class.getName());
 
 	private final AuthorFactory authorFactory;
 	private final Clock clock;

briar-core/src/test/java/org/briarproject/briar/client/MessageTrackerTest.java

@@ -7,21 +7,22 @@ import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.test.BrambleMockTestCase;
-import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.briar.api.client.MessageTracker;
 import org.jmock.Expectations;
-import org.junit.Assert;
 import org.junit.Test;
 
+import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.briar.client.MessageTrackerConstants.GROUP_KEY_STORED_MESSAGE_ID;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 public class MessageTrackerTest extends BrambleMockTestCase {
 
-	protected final GroupId groupId = new GroupId(TestUtils.getRandomId());
+	protected final GroupId groupId = new GroupId(getRandomId());
 	protected final ClientHelper clientHelper =
 			context.mock(ClientHelper.class);
 	private final DatabaseComponent db = context.mock(DatabaseComponent.class);
-	private final MessageId messageId = new MessageId(TestUtils.getRandomId());
+	private final MessageId messageId = new MessageId(getRandomId());
 	private final MessageTracker messageTracker =
 			new MessageTrackerImpl(db, clientHelper);
 	private final BdfDictionary dictionary = BdfDictionary.of(
@@ -43,8 +44,8 @@ public class MessageTrackerTest extends BrambleMockTestCase {
 			will(returnValue(dictionary));
 		}});
 		MessageId loadedId = messageTracker.loadStoredMessageId(groupId);
-		Assert.assertNotNull(loadedId);
-		Assert.assertTrue(messageId.equals(loadedId));
+		assertNotNull(loadedId);
+		assertEquals(messageId, loadedId);
 	}
 
 }

briar-core/src/test/java/org/briarproject/briar/client/MessageTreeImplTest.java

@@ -2,7 +2,6 @@ package org.briarproject.briar.client;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.briar.api.client.MessageTree;
 import org.junit.Test;
 
@@ -11,6 +10,7 @@ import java.util.Collections;
 
 import javax.annotation.Nullable;
 
+import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.junit.Assert.assertEquals;
 
 public class MessageTreeImplTest {
@@ -62,7 +62,7 @@ public class MessageTreeImplTest {
 	@NotNullByDefault
 	private class TestNode implements MessageTree.MessageNode {
 
-		private final MessageId id = new MessageId(TestUtils.getRandomId());
+		private final MessageId id = new MessageId(getRandomId());
 		@Nullable
 		private MessageId parentId;
 		private long timestamp;

briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTest.java

@@ -10,7 +10,6 @@ import org.briarproject.bramble.lifecycle.LifecycleModule;
 import org.briarproject.bramble.sync.validation.ValidationModule;
 import org.briarproject.bramble.system.SystemModule;
 import org.briarproject.bramble.test.TestDatabaseModule;
-import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.versioning.VersioningModule;
 import org.briarproject.briar.api.blog.Blog;
@@ -27,7 +26,9 @@ import org.junit.Test;
 import java.io.File;
 import java.util.Collection;
 
+import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
+import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -37,7 +38,7 @@ public class FeedManagerIntegrationTest extends BriarTestCase {
 	private LifecycleManager lifecycleManager;
 	private FeedManager feedManager;
 	private BlogManager blogManager;
-	private final File testDir = TestUtils.getTestDirectory();
+	private final File testDir = getTestDirectory();
 	private final File testFile = new File(testDir, "feedTest");
 
 	@Before
@@ -116,7 +117,7 @@ public class FeedManagerIntegrationTest extends BriarTestCase {
 	public void tearDown() throws Exception {
 		lifecycleManager.stopServices();
 		lifecycleManager.waitForShutdown();
-		TestUtils.deleteTestDirectory(testDir);
+		deleteTestDirectory(testDir);
 	}
 
 	protected void injectEagerSingletons(

briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java

@@ -24,7 +24,6 @@ import org.briarproject.bramble.lifecycle.LifecycleModule;
 import org.briarproject.bramble.sync.validation.ValidationModule;
 import org.briarproject.bramble.system.SystemModule;
 import org.briarproject.bramble.test.TestDatabaseModule;
-import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.versioning.VersioningModule;
 import org.briarproject.briar.api.messaging.MessagingManager;
@@ -45,6 +44,7 @@ import static java.util.Collections.emptyList;
 import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH;
 import static org.briarproject.bramble.test.TestPluginConfigModule.MAX_LATENCY;
 import static org.briarproject.bramble.test.TestPluginConfigModule.TRANSPORT_ID;
+import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
 import static org.junit.Assert.assertEquals;
@@ -184,7 +184,7 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 
 	@After
 	public void tearDown() {
-		TestUtils.deleteTestDirectory(testDir);
+		deleteTestDirectory(testDir);
 	}
 
 	private static void injectEagerSingletons(

briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java

@@ -21,7 +21,6 @@ import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager;
 import org.briarproject.bramble.test.BrambleMockTestCase;
-import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.briar.api.client.MessageTracker;
 import org.briarproject.briar.api.client.SessionId;
 import org.briarproject.briar.api.conversation.ConversationMessageHeader;
@@ -648,7 +647,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testGetInvitationMessages() throws Exception {
 		BdfDictionary query = BdfDictionary.of(new BdfEntry("q", "u"));
-		MessageId messageId2 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId2 = new MessageId(getRandomId());
 		BdfDictionary meta2 = BdfDictionary.of(new BdfEntry("m2", "e"));
 		Map<MessageId, BdfDictionary> results = new HashMap<>();
 		results.put(message.getId(), meta);

briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java

@@ -34,7 +34,6 @@ import org.briarproject.bramble.lifecycle.LifecycleModule;
 import org.briarproject.bramble.properties.PropertiesModule;
 import org.briarproject.bramble.sync.validation.ValidationModule;
 import org.briarproject.bramble.system.SystemModule;
-import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.versioning.VersioningModule;
 import org.briarproject.briar.api.blog.BlogFactory;
@@ -71,12 +70,15 @@ import javax.inject.Inject;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
 import static junit.framework.Assert.assertNotNull;
 import static org.briarproject.bramble.api.sync.validation.MessageState.DELIVERED;
 import static org.briarproject.bramble.api.sync.validation.MessageState.INVALID;
 import static org.briarproject.bramble.api.sync.validation.MessageState.PENDING;
 import static org.briarproject.bramble.test.TestPluginConfigModule.MAX_LATENCY;
+import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
+import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -88,7 +90,8 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 		extends BriarTestCase {
 
 	private static final Logger LOG =
-			Logger.getLogger(BriarIntegrationTest.class.getName());
+			getLogger(BriarIntegrationTest.class.getName());
+
 	private static final boolean DEBUG = false;
 
 	@Nullable
@@ -140,7 +143,7 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 
 	private final Semaphore messageSemaphore = new Semaphore(0);
 	private final AtomicInteger messageCounter = new AtomicInteger(0);
-	private final File testDir = TestUtils.getTestDirectory();
+	private final File testDir = getTestDirectory();
 	private final String AUTHOR0 = "Author 0";
 	private final String AUTHOR1 = "Author 1";
 	private final String AUTHOR2 = "Author 2";
@@ -341,7 +344,7 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 	@After
 	public void tearDown() throws Exception {
 		stopLifecycles();
-		TestUtils.deleteTestDirectory(testDir);
+		deleteTestDirectory(testDir);
 	}
 
 	private void stopLifecycles() throws InterruptedException {