From d87fa860e68a80eb8eab66e8ae9327305f8d0e9e Mon Sep 17 00:00:00 2001
From: ljacqu <ljacqu@users.noreply.github.com>
Date: Tue, 6 Aug 2019 19:42:06 +0200
Subject: [PATCH] Add test for UuidUtils

---
 .../java/fr/xephi/authme/util/UuidUtils.java  |  8 ++---
 .../fr/xephi/authme/util/UuidUtilsTest.java   | 29 +++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/fr/xephi/authme/util/UuidUtilsTest.java

diff --git a/src/main/java/fr/xephi/authme/util/UuidUtils.java b/src/main/java/fr/xephi/authme/util/UuidUtils.java
index 4a2306af..be35a935 100644
--- a/src/main/java/fr/xephi/authme/util/UuidUtils.java
+++ b/src/main/java/fr/xephi/authme/util/UuidUtils.java
@@ -12,15 +12,15 @@ public final class UuidUtils {
     }
 
     /**
-     * Returns whether the given string as an UUID or null
+     * Returns the given string as an UUID or null.
      *
      * @param string the uuid to parse
-     * @return parsed UUID if succeed or null
+     * @return parsed UUID if succeeded or null
      */
     public static UUID parseUuidSafely(String string) {
         try {
-            return UUID.fromString(string);
-        } catch (IllegalArgumentException | NullPointerException ex) {
+            return string == null ? null : UUID.fromString(string);
+        } catch (IllegalArgumentException ex) {
             return null;
         }
     }
diff --git a/src/test/java/fr/xephi/authme/util/UuidUtilsTest.java b/src/test/java/fr/xephi/authme/util/UuidUtilsTest.java
new file mode 100644
index 00000000..b98bdba9
--- /dev/null
+++ b/src/test/java/fr/xephi/authme/util/UuidUtilsTest.java
@@ -0,0 +1,29 @@
+package fr.xephi.authme.util;
+
+import org.junit.Test;
+
+import java.util.UUID;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Test for {@link UuidUtils}.
+ */
+public class UuidUtilsTest {
+
+    @Test
+    public void shouldParseUuidSafely() {
+        // given
+        UUID correctUuid = UUID.fromString("8e0a9aaa-5eda-42ef-8daf-e6c6359f607e");
+
+        // when / then
+        assertThat(UuidUtils.parseUuidSafely("8e0a9aaa-5eda-42ef-8daf-e6c6359f607e"), equalTo(correctUuid));
+
+        assertThat(UuidUtils.parseUuidSafely(null), nullValue());
+        assertThat(UuidUtils.parseUuidSafely(""), nullValue());
+        assertThat(UuidUtils.parseUuidSafely("foo"), nullValue());
+        assertThat(UuidUtils.parseUuidSafely("8e0a9aaa-5eda-42ef-InvalidEnding"), nullValue());
+    }
+}