From ca8f31bdc70a2ec626274b4659b99732ec602969 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 28 Jan 2018 18:00:24 +1100
Subject: [PATCH] Merge unit tests

---
 .../md_5/bungee/api/chat/ComponentsTest.java  | 30 ++++++++++++++
 .../bungee/api/chat/TextComponentTest.java    | 39 -------------------
 2 files changed, 30 insertions(+), 39 deletions(-)
 delete mode 100644 chat/src/test/java/net/md_5/bungee/api/chat/TextComponentTest.java

diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
index f09adc04..43420f2b 100644
--- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
@@ -191,4 +191,34 @@ public class ComponentsTest
         a.addExtra( b );
         ComponentSerializer.toString( a );
     }
+
+    @Test
+    public void testInvalidColorCodes()
+    {
+        StringBuilder allInvalidColorCodes = new StringBuilder();
+
+        // collect all invalid color codes (e.g. §z, §g, ...)
+        for ( char alphChar : "0123456789abcdefghijklmnopqrstuvwxyz".toCharArray() )
+        {
+            if ( ChatColor.ALL_CODES.indexOf( alphChar ) == -1 )
+            {
+                allInvalidColorCodes.append( ChatColor.COLOR_CHAR );
+                allInvalidColorCodes.append( alphChar );
+            }
+        }
+
+        // last char is a single '§'
+        allInvalidColorCodes.append( ChatColor.COLOR_CHAR );
+
+        String invalidColorCodesLegacyText = fromAndToLegacyText( allInvalidColorCodes.toString() );
+        String emptyLegacyText = fromAndToLegacyText( "" );
+
+        // all invalid color codes and the trailing '§' should be ignored
+        Assert.assertEquals( emptyLegacyText, invalidColorCodesLegacyText );
+    }
+
+    private String fromAndToLegacyText(String legacyText)
+    {
+        return BaseComponent.toLegacyText( TextComponent.fromLegacyText( legacyText ) );
+    }
 }
diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/TextComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TextComponentTest.java
deleted file mode 100644
index f7937f07..00000000
--- a/chat/src/test/java/net/md_5/bungee/api/chat/TextComponentTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.md_5.bungee.api.chat;
-
-import net.md_5.bungee.api.ChatColor;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class TextComponentTest
-{
-
-    @Test
-    public void testInvalidColorCodes()
-    {
-        StringBuilder allInvalidColorCodes = new StringBuilder();
-
-        // collect all invalid color codes (e.g. §z, §g, ...)
-        for ( char alphChar : "0123456789abcdefghijklmnopqrstuvwxyz".toCharArray() )
-        {
-            if ( ChatColor.ALL_CODES.indexOf( alphChar ) == -1 )
-            {
-                allInvalidColorCodes.append( ChatColor.COLOR_CHAR );
-                allInvalidColorCodes.append( alphChar );
-            }
-        }
-
-        // last char is a single '§'
-        allInvalidColorCodes.append( ChatColor.COLOR_CHAR );
-
-        String invalidColorCodesLegacyText = fromAndToLegacyText( allInvalidColorCodes.toString() );
-        String emptyLegacyText = fromAndToLegacyText( "" );
-
-        // all invalid color codes and the trailing '§' should be ignored
-        assertEquals( emptyLegacyText, invalidColorCodesLegacyText );
-    }
-
-    private String fromAndToLegacyText(String legacyText)
-    {
-        return BaseComponent.toLegacyText( TextComponent.fromLegacyText( legacyText ) );
-    }
-}