Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-04 17:59:56 +01:00
Code Issues Projects Releases Wiki Activity

Fixed BungeeSystemTest#testEnableNoMySQL

Browse Source 
Test was failing because travis runs MySQL on 3306 port with root user,
these were default Plan settings. Fixed by removing message expectation
on travis
This commit is contained in:
Rsl1122 2018-12-27 19:05:56 +02:00
parent 4641c7a4fd
commit 26c706a411
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plan/bungeecord/src/test/java/com/djrapitops/plan/BungeeSystemTest.java
View File

@ -8,7 +8,6 @@ import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.system.PlanSystem; import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.database.DBSystem; import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.DatabaseSettings;
import com.djrapitops.plan.system.settings.paths.ProxySettings; import com.djrapitops.plan.system.settings.paths.ProxySettings;
import com.djrapitops.plan.system.settings.paths.WebserverSettings; import com.djrapitops.plan.system.settings.paths.WebserverSettings;
import org.junit.ClassRule; import org.junit.ClassRule;
@ -20,6 +19,7 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import rules.BungeeComponentMocker; import rules.BungeeComponentMocker;
import rules.ComponentMocker; import rules.ComponentMocker;
import utilities.CIProperties;
import utilities.RandomData; import utilities.RandomData;
/** /**
@ -60,12 +60,13 @@ public class BungeeSystemTest {
@Test @Test
public void bungeeDoesNotEnableWithDefaultIP() throws Exception { public void bungeeDoesNotEnableWithDefaultIP() throws Exception {
thrown.expect(EnableException.class); thrown.expect(EnableException.class);
thrown.expectMessage("IP setting still 0.0.0.0 - Configure AlternativeIP/IP that connects to the Proxy server."); if (!Boolean.parseBoolean(System.getenv(CIProperties.IS_TRAVIS))) {
thrown.expectMessage("IP setting still 0.0.0.0 - Configure AlternativeIP/IP that connects to the Proxy server.");
}
PlanSystem bungeeSystem = component.getPlanSystem(); PlanSystem bungeeSystem = component.getPlanSystem();
try { try {
PlanConfig config = bungeeSystem.getConfigSystem().getConfig(); PlanConfig config = bungeeSystem.getConfigSystem().getConfig();
config.set(DatabaseSettings.MYSQL_PORT, "6000");
config.set(WebserverSettings.PORT, TEST_PORT_NUMBER); config.set(WebserverSettings.PORT, TEST_PORT_NUMBER);
config.set(ProxySettings.IP, "0.0.0.0"); config.set(ProxySettings.IP, "0.0.0.0");