ChromaGaming/Chroma-Chat
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases 8 Packages Wiki Activity

No longer sending messages to "commands only" mode players, added /lenny, fixes related to testing #69

Merged
NorbiPeti merged 3 commits from dev into master 2017-08-17 16:12:56 +00:00
Conversation 0 Commits 3 Files changed 7 +46 -13
3 changed files with 46 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 51c3e1dec6 - Show all commits

18
pom.xml
View file

@ -82,6 +82,22 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.12.4</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
</plugins>
</build>
<groupId>buttondevteam</groupId>
@ -121,7 +137,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12-R0.1-SNAPSHOT</version>
<version>1.12.1-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.TBMCPlugins.ButtonCore</groupId>

18
src/main/java/buttondevteam/chat/commands/appendtext/LennyCommand.java Normal file
View file

@ -0,0 +1,18 @@
package buttondevteam.chat.commands.appendtext;
public final class LennyCommand extends AppendTextCommandBase {
@Override
public String[] GetHelpText(String alias) {
return new String[] { "§6---- Lenny ----", //
"This command appends a Lenny face after your message", //
"Or just sends ne", //
"Use either /" + alias + " <message> or just /" + alias }; //
}
@Override
public String GetAppendedText() {
return "( ͡° ͜ʖ ͡°)";
}
}

23
src/test/java/buttondevteam/chat/ChatFormatTest.java → src/test/java/buttondevteam/chat/ChatFormatIT.java
View file

@ -21,7 +21,7 @@ import buttondevteam.lib.chat.Color;
import junit.framework.TestCase;
@RunWith(ObjectTestRunner.class)
public class ChatFormatTest extends TestCase {
public class ChatFormatIT extends TestCase {
@Objects
public static List<Object> data() {
TestPrepare.PrepareServer();
@ -30,18 +30,18 @@ public class ChatFormatTest extends TestCase {
List<Object> list = new ArrayList<Object>();
list.add(new ChatFormatTest(sender, "*test*", new TellrawPart("test").setItalic(true).setColor(Color.White)));
list.add(new ChatFormatTest(sender, "**test**", new TellrawPart("test").setBold(true).setColor(Color.White)));
list.add(new ChatFormatTest(sender, "***test***",
list.add(new ChatFormatIT(sender, "*test*", new TellrawPart("test").setItalic(true).setColor(Color.White)));
list.add(new ChatFormatIT(sender, "**test**", new TellrawPart("test").setBold(true).setColor(Color.White)));
list.add(new ChatFormatIT(sender, "***test***",
new TellrawPart("test").setBold(true).setItalic(true).setColor(Color.White)));
list.add(new ChatFormatTest(sender, "***_test_***",
list.add(new ChatFormatIT(sender, "***_test_***",
new TellrawPart("test").setBold(true).setItalic(true).setUnderlined(true).setColor(Color.White)));
list.add(new ChatFormatTest(sender, "***_~~test~~_***", new TellrawPart("test").setBold(true).setItalic(true)
list.add(new ChatFormatIT(sender, "***_~~test~~_***", new TellrawPart("test").setBold(true).setItalic(true)
.setUnderlined(true).setStrikethrough(true).setColor(Color.White)));
list.add(new ChatFormatTest(sender, "¯\\\\\\_(ツ)\\_/¯", new TellrawPart("¯").setColor(Color.White),
list.add(new ChatFormatIT(sender, "¯\\\\\\_(ツ)\\_/¯", new TellrawPart("¯").setColor(Color.White),
new TellrawPart("\\").setColor(Color.White), new TellrawPart("_(ツ)").setColor(Color.White),
new TellrawPart("_/¯").setColor(Color.White)));
list.add(new ChatFormatTest(sender, "https://google.hu/",
list.add(new ChatFormatIT(sender, "https://google.hu/",
new TellrawPart("https://google.hu/").setColor(Color.White).setUnderlined(true)
.setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT,
new TellrawPart("Click to open").setColor(Color.Blue)))
@ -54,7 +54,7 @@ public class ChatFormatTest extends TestCase {
private final String message;
private final TellrawPart[] extras;
public ChatFormatTest(CommandSender sender, String message, TellrawPart... expectedextras) {
public ChatFormatIT(CommandSender sender, String message, TellrawPart... expectedextras) {
this.sender = sender;
this.message = message;
this.extras = expectedextras;
@ -62,7 +62,7 @@ public class ChatFormatTest extends TestCase {
@Test
public void testMessage() {
/*ArrayList<ChatFormatter> cfs = ChatProcessing.addFormatters(Color.White);
ArrayList<ChatFormatter> cfs = ChatProcessing.addFormatters(Color.White);
final String chid = ChatProcessing.getChannelID(Channel.GlobalChat, sender, null);
final TellrawPart tp = ChatProcessing.createTellraw(sender, message, null, null, chid);
ChatFormatter.Combine(cfs, message, tp);
@ -72,7 +72,6 @@ public class ChatFormatTest extends TestCase {
// System.out.println("Raw: " + ChatProcessing.toJson(expectedtp));
for (TellrawPart extra : extras)
expectedtp.addExtra(extra);
assertEquals(ChatProcessing.toJson(expectedtp), ChatProcessing.toJson(tp));*/
assertTrue(true);
assertEquals(ChatProcessing.toJson(expectedtp), ChatProcessing.toJson(tp));
}
}