Close #312 - Add unicode encoding for the error message from NonBlank…

…String.from
kevin-lee · Apr 21, 2024 · 27c1c33 · 27c1c33
1 parent 916fdc1
commit 27c1c33
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/modules/refined4s-core/shared/src/main/scala/refined4s/types/strings.scala b/modules/refined4s-core/shared/src/main/scala/refined4s/types/strings.scala
@@ -66,6 +66,13 @@ object strings {
     override def invalidReason(a: String): String =
       expectedMessage("not all whitespace non-empty String")
 
+    @SuppressWarnings(Array("org.wartremover.warts.ToString"))
+    override def from(a: String): Either[String, Type] =
+      super
+        .from(a)
+        .left
+        .map(_ => "Invalid value: [" + a + s"], unicode=[${a.map(c => "\\u%04x".format(c.toInt)).mkString}]. " + invalidReason(a))
+
     override def predicate(a: String): Boolean = a != "" && !a.forall(c => WhitespaceCharRange.exists((min, max) => c >= min && c <= max))
 
     extension (inline thisNbs: Type) {

diff --git a/modules/refined4s-core/shared/src/test/scala/refined4s/types/stringsSpec.scala b/modules/refined4s-core/shared/src/test/scala/refined4s/types/stringsSpec.scala
@@ -245,7 +245,8 @@ object stringsSpec extends Properties {
                   ) =>
             })
             .log(
-              s"Compilation should have been failed but it didn't for NonBlankString(s) (non-literal String). Errors: ${shouldFail5.map(_.toString).mkString("[", ", ", "]")}"
+              "Compilation should have been failed but it didn't for NonBlankString(s) (non-literal String). " +
+                s"Errors: ${shouldFail5.map(_.toString).mkString("[", ", ", "]")}"
             ),
         )
       )
@@ -269,12 +270,14 @@ object stringsSpec extends Properties {
         s <-
           Gen
             .frequency1(
-              5  -> Gen.constant(""),
               95 -> Gen.string(hedgehog.extra.Gens.genCharByRange(strings.WhitespaceCharRange), Range.linear(1, 10)),
+              5  -> Gen.constant(""),
             )
             .log("s")
       } yield {
-        val expected = s"Invalid value: [$s]. It must be not all whitespace non-empty String"
+        val expected =
+          s"Invalid value: [$s], unicode=[${s.map(c => "\\u%04x".format(c.toInt)).mkString}]. " +
+            s"It must be not all whitespace non-empty String"
         val actual   = NonBlankString.from(s)
         actual ==== Left(expected)
       }
@@ -302,7 +305,9 @@ object stringsSpec extends Properties {
             )
             .log("s")
       } yield {
-        val expected = s"Invalid value: [$s]. It must be not all whitespace non-empty String"
+        val expected =
+          s"Invalid value: [$s], unicode=[${s.map(c => "\\u%04x".format(c.toInt)).mkString}]. " +
+            s"It must be not all whitespace non-empty String"
         try {
           NonBlankString.unsafeFrom(s)
           Result