scalfmt, add a test

2 files changed, 14 insertions, 4 deletions

diff --git a/src/main/scala/xyz/driver/core/database/Converters.scala b/src/main/scala/xyz/driver/core/database/Converters.scala
index 1a40c45..f2f8c69 100644
--- a/src/main/scala/xyz/driver/core/database/Converters.scala
+++ b/src/main/scala/xyz/driver/core/database/Converters.scala
@@ -14,13 +14,13 @@ trait Converters {
   def expectValid[ADT](mapper: String => Option[ADT], query: String)(implicit ct: ClassTag[ADT]): ADT =
     fromStringOrThrow[ADT](query, mapper, ct.toString())
 
-  def expectExistsAndValid[ADT](mapper: String => Option[ADT], query: Option[String], contextMsg: String = "")
-                               (implicit ct: ClassTag[ADT]): ADT = {
+  def expectExistsAndValid[ADT](mapper: String => Option[ADT], query: Option[String], contextMsg: String = "")(
+      implicit ct: ClassTag[ADT]): ADT = {
     expectValid[ADT](mapper, query.getOrElse(throw DatabaseException(contextMsg)))
   }
 
-  def expectValidOrEmpty[ADT](mapper: String => Option[ADT], query: Option[String], contextMsg: String = "")
-                             (implicit ct: ClassTag[ADT]): Option[ADT] = {
+  def expectValidOrEmpty[ADT](mapper: String => Option[ADT], query: Option[String], contextMsg: String = "")(
+      implicit ct: ClassTag[ADT]): Option[ADT] = {
     if (query.isDefined) Some(expectValid[ADT](mapper, query.get)) else None
   }
 }
diff --git a/src/test/scala/xyz/driver/core/database/DatabaseTest.scala b/src/test/scala/xyz/driver/core/database/DatabaseTest.scala
index bd72b68..f85dcad 100644
--- a/src/test/scala/xyz/driver/core/database/DatabaseTest.scala
+++ b/src/test/scala/xyz/driver/core/database/DatabaseTest.scala
@@ -23,11 +23,21 @@ class DatabaseTest extends FlatSpec with Matchers with Checkers {
     def mapper(s: String): Option[String] = if (s.length == validLength) Some(s) else None
 
     TestConverter.fromStringOrThrow(valid, mapper, valid) should be(valid)
+
     TestConverter.expectValid(mapper, valid) should be(valid)
+
     TestConverter.expectExistsAndValid(mapper, validOp) should be(valid)
 
+    TestConverter.expectValidOrEmpty(mapper, validOp) should be(Some(valid))
+    TestConverter.expectValidOrEmpty(mapper, None) should be(None)
+
     an[DatabaseException] should be thrownBy TestConverter.fromStringOrThrow(invalid, mapper, invalid)
+
+    an[DatabaseException] should be thrownBy TestConverter.expectValid(mapper, invalid)
+
     an[DatabaseException] should be thrownBy TestConverter.expectExistsAndValid(mapper, invalidOp)
+
+    an[DatabaseException] should be thrownBy TestConverter.expectValidOrEmpty(mapper, invalidOp)
   }
 
 }