Parse emote-sets as String as it can contain UUIDs

Author: Rakambda

src/main/java/org/kitteh/irc/client/library/feature/twitch/messagetag/EmoteSets.java

@@ -50,19 +50,19 @@ public class EmoteSets extends MessageTagManager.DefaultMessageTag {
     @SuppressWarnings("ConstantConditions")
     public static final TriFunction<Client, String, String, EmoteSets> FUNCTION = (client, name, value) -> new EmoteSets(name, value);
 
-    private final List<Integer> emoteSets;
+    private final List<String> emoteSets;
 
     private EmoteSets(@NonNull String name, @Nullable String value) {
         super(name, value);
-        this.emoteSets = (value == null) ? Collections.emptyList() : Collections.unmodifiableList(Arrays.stream(value.split(",")).map(Integer::valueOf).collect(Collectors.toList()));
+        this.emoteSets = (value == null) ? Collections.emptyList() : Collections.unmodifiableList(Arrays.asList(value.split(",")));
     }
 
     /**
      * Gets the list of emote sets.
      *
      * @return list of integers, at least containing 0.
      */
-    public @NonNull List<Integer> getEmoteSets() {
+    public @NonNull List<String> getEmoteSets() {
         return this.emoteSets;
     }
 

src/test/java/org/kitteh/irc/client/library/feature/twitch/messagetag/EmoteSetsTest.java

@@ -0,0 +1,48 @@
+package org.kitteh.irc.client.library.feature.twitch.messagetag;
+
+import org.kitteh.irc.client.library.Client;
+import org.mockito.Mockito;
+import org.junit.Assert;
+import org.junit.Test;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class EmoteSetsTest{
+	private static final String NAME = "emote-sets";
+	
+	/**
+	 * Verifies integer format is accepted.
+	 */
+	@Test
+	public void verifyInteger(){
+		Client client = Mockito.mock(Client.class);
+		EmoteSets tested = EmoteSets.FUNCTION.apply(client, NAME, "123,456,789");
+		
+		List<String> expected = Arrays.asList("123", "456", "789");
+		Assert.assertEquals(expected, tested.getEmoteSets());
+	}
+	
+	/**
+	 * Verifies UUID format is accepted.
+	 */
+	@Test
+	public void verifyUUID(){
+		Client client = Mockito.mock(Client.class);
+		EmoteSets tested = EmoteSets.FUNCTION.apply(client, NAME, "fb70df85-0e31-41ea-a13f-c3201bac7013,1a313266-b8e1-49c2-9409-68526a85a350");
+		
+		List<String> expected = Arrays.asList("fb70df85-0e31-41ea-a13f-c3201bac7013", "1a313266-b8e1-49c2-9409-68526a85a350");
+		Assert.assertEquals(expected, tested.getEmoteSets());
+	}
+	
+	/**
+	 * Verifies null values returns an empty list.
+	 */
+	@Test
+	public void verifyNull(){
+		Client client = Mockito.mock(Client.class);
+		EmoteSets tested = EmoteSets.FUNCTION.apply(client, NAME, null);
+		
+		Assert.assertEquals(Collections.emptyList(), tested.getEmoteSets());
+	}
+}