ChromaGaming/ChromaCore
1
0
Fork 0
Code Issues 23 Pull requests 1 Projects Releases 11 Packages Wiki Activity

Test and config fixes

Browse source 
Added method to check if testing
This commit is contained in:
Norbi Peti 2020-09-04 17:52:36 +02:00
parent 5b27af8925
commit ab4dd75684
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Chroma-Core/src/main/java/buttondevteam/core/TestPrepare.java
View file

@ -19,11 +19,16 @@ import java.util.Collections;
import java.util.logging.Logger; import java.util.logging.Logger;
public class TestPrepare { public class TestPrepare {
private static boolean test = false;
public static boolean isTest() { return test; }
public static void PrepareServer() { public static void PrepareServer() {
test = true;
Bukkit.setServer(Mockito.mock(Server.class, new Answer<Object>() { Bukkit.setServer(Mockito.mock(Server.class, new Answer<Object>() {
@Override @Override
public Object answer(InvocationOnMock invocation) { public Object answer(InvocationOnMock invocation) {
if (returns(invocation, String.class)) if (returns(invocation, String.class))
return "test"; return "test";
if (returns(invocation, Logger.class)) if (returns(invocation, Logger.class))

4
Chroma-Core/src/main/java/buttondevteam/core/component/channel/ChannelComponent.java
View file

@ -1,5 +1,6 @@
package buttondevteam.core.component.channel; package buttondevteam.core.component.channel;
import buttondevteam.core.TestPrepare;
import buttondevteam.lib.TBMCSystemChatEvent; import buttondevteam.lib.TBMCSystemChatEvent;
import buttondevteam.lib.architecture.Component; import buttondevteam.lib.architecture.Component;
import buttondevteam.lib.chat.*; import buttondevteam.lib.chat.*;
@ -35,7 +36,8 @@ public class ChannelComponent extends Component {
} }
void registerChannelCommand(Channel channel) { void registerChannelCommand(Channel channel) {
registerCommand(new ChannelCommand(channel)); if (!TestPrepare.isTest())
registerCommand(new ChannelCommand(channel));
} }
@CommandClass @CommandClass

2
Chroma-Core/src/main/java/buttondevteam/lib/architecture/ConfigData.java
View file

@ -117,7 +117,7 @@ public class ConfigData<T> {
if (setter != null && value != null) if (setter != null && value != null)
val = setter.apply(value); val = setter.apply(value);
else val = value; else val = value;
if (config != null) if (config.getConfig() != null)
setInternal(val); setInternal(val);
this.value = value; this.value = value;
} }

1
Chroma-Core/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java
View file

@ -186,6 +186,7 @@ public final class IHaveConfig {
*/ */
public void reset(ConfigurationSection config) { public void reset(ConfigurationSection config) {
this.config = config; this.config = config;
datamap.forEach((path, data) -> data.reset());
} }
/** /**