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

Fix error when Mockito isn't present in prod

Browse source
This commit is contained in:
Norbi Peti 2020-09-15 03:42:49 +02:00
parent ab4dd75684
commit 01dd8a477e
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package buttondevteam.core;
import buttondevteam.core.component.channel.Channel; import buttondevteam.core.component.channel.Channel;
import buttondevteam.core.component.channel.ChannelComponent; import buttondevteam.core.component.channel.ChannelComponent;
import buttondevteam.lib.ChromaUtils;
import buttondevteam.lib.architecture.Component; import buttondevteam.lib.architecture.Component;
import buttondevteam.lib.chat.Color; import buttondevteam.lib.chat.Color;
import buttondevteam.lib.chat.TBMCChatAPI; import buttondevteam.lib.chat.TBMCChatAPI;
@ -19,12 +20,9 @@ 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; ChromaUtils.setTest(); //Needs to be in a separate class because of the potential lack of Mockito
Bukkit.setServer(Mockito.mock(Server.class, new Answer<Object>() { Bukkit.setServer(Mockito.mock(Server.class, new Answer<Object>() {
@Override @Override

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

@ -1,6 +1,6 @@
package buttondevteam.core.component.channel; package buttondevteam.core.component.channel;
import buttondevteam.core.TestPrepare; import buttondevteam.lib.ChromaUtils;
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.*;
@ -36,7 +36,7 @@ public class ChannelComponent extends Component {
} }
void registerChannelCommand(Channel channel) { void registerChannelCommand(Channel channel) {
if (!TestPrepare.isTest()) if (!ChromaUtils.isTest())
registerCommand(new ChannelCommand(channel)); registerCommand(new ChannelCommand(channel));
} }

12
Chroma-Core/src/main/java/buttondevteam/lib/ChromaUtils.java
View file

@ -86,4 +86,16 @@ public final class ChromaUtils {
return what.get(); return what.get();
return def; return def;
} }
private static boolean test = false;
/**
* Returns true while unit testing.
*/
public static boolean isTest() { return test; }
/**
* Call when unit testing.
*/
public static void setTest() { test = true; }
} }