Code cleanup.

This commit is contained in:
akwizgran
2018-11-23 12:56:34 +00:00
parent 61276c81d2
commit ce7d6d3db5
7 changed files with 18 additions and 15 deletions

View File

@@ -1,7 +1,6 @@
package org.briarproject.bramble.system;
import org.briarproject.bramble.test.BrambleTestCase;
import org.briarproject.bramble.util.OsUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -11,6 +10,8 @@ import java.security.Provider;
import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
import static org.briarproject.bramble.util.OsUtils.isLinux;
import static org.briarproject.bramble.util.OsUtils.isMac;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -22,7 +23,7 @@ public class UnixSecureRandomProviderTest extends BrambleTestCase {
@Before
public void setUp() {
assumeTrue(OsUtils.isLinux() || OsUtils.isMac());
assumeTrue(isLinux() || isMac());
assertTrue(testDir.mkdirs());
}

View File

@@ -4,7 +4,6 @@ import org.briarproject.bramble.api.Bytes;
import org.briarproject.bramble.test.BrambleTestCase;
import org.briarproject.bramble.test.TestUtils;
import org.briarproject.bramble.util.IoUtils;
import org.briarproject.bramble.util.OsUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -17,6 +16,8 @@ import java.util.Set;
import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
import static org.briarproject.bramble.util.OsUtils.isLinux;
import static org.briarproject.bramble.util.OsUtils.isMac;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -32,7 +33,7 @@ public class UnixSecureRandomSpiTest extends BrambleTestCase {
@Before
public void setUp() {
assumeTrue(OsUtils.isLinux() || OsUtils.isMac());
assumeTrue(isLinux() || isMac());
assertTrue(testDir.mkdirs());
}