Fixed tests

This commit is contained in:
Rsl1122 2018-07-18 10:48:32 +03:00
parent a40c10f6bb
commit cd88af2f77
2 changed files with 4 additions and 8 deletions

View File

@ -65,8 +65,6 @@ public class SQLiteTest {
@BeforeClass
public static void setUpClass() throws Exception {
new TestDatabaseCreator();
System.out.println("--- Test Class Setup ---");
SystemMockUtil mockUtil = SystemMockUtil.setUp(temporaryFolder.getRoot())
.enableConfigSystem();

View File

@ -18,8 +18,6 @@ import utilities.TestConstants;
import utilities.TestErrorManager;
import utilities.mocks.SystemMockUtil;
import java.sql.SQLException;
import static org.junit.Assert.assertEquals;
public class NetworkSettingsTest {
@ -33,10 +31,10 @@ public class NetworkSettingsTest {
Teardown.resetSettingsTempValues();
StaticHolder.saveInstance(NetworkSettingsTest.class, Plan.class);
SystemMockUtil mockUtil = SystemMockUtil.setUp(temporaryFolder.getRoot())
.enableConfigSystem();
db = new SQLiteDB();
SystemMockUtil.setUp(temporaryFolder.getRoot())
.enableConfigSystem()
.enableDatabaseSystem(db)
mockUtil.enableDatabaseSystem(db)
.enableServerInfoSystem();
Log.setErrorManager(new TestErrorManager());
@ -53,7 +51,7 @@ public class NetworkSettingsTest {
}
@Before
public void setUp() throws DBException, SQLException {
public void setUp() {
db.remove().everything();
ServerTable serverTable = db.getServerTable();
serverTable.saveCurrentServerInfo(new Server(-1, TestConstants.SERVER_UUID, "ServerName", "", 20));