Refactor IndexName tests (#256)

lambdaworks · Jun 24, 2023 · ce5ba61 · ce5ba61
1 parent e39a715
commit ce5ba61
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 43 deletions.
diff --git a/modules/library/src/main/scala-2/zio/elasticsearch/IndexNameValidation.scala b/modules/library/src/main/scala-2/zio/elasticsearch/IndexNameValidation.scala
@@ -26,6 +26,7 @@ object IndexNameValidation {
       params.exists(StringUtils.contains(string, _))
 
     name.toLowerCase == name &&
+    name.nonEmpty &&
     !startsWithAny(name, "+", "-", "_") &&
     !containsAny(string = name, params = Chunk("*", "?", "\"", "<", ">", "|", " ", ",", "#", ":")) &&
     !equalsAny(name, ".", "..") &&

diff --git a/modules/library/src/main/scala-3/zio/elasticsearch/IndexNameValidator.scala b/modules/library/src/main/scala-3/zio/elasticsearch/IndexNameValidator.scala
@@ -29,6 +29,7 @@ object IndexNameValidator
       def isValid(name: String): Boolean =
         name.toLowerCase == name &&
           !startsWithAny(name, "+", "-", "_") &&
+          name.nonEmpty &&
           !containsAny(string = name, params = Chunk("*", "?", "\"", "<", ">", "|", " ", ",", "#", ":")) &&
           !equalsAny(name, ".", "..") &&
           name.getBytes().length <= 255

diff --git a/modules/library/src/test/scala/zio/elasticsearch/IndexNameSpec.scala b/modules/library/src/test/scala/zio/elasticsearch/IndexNameSpec.scala
@@ -23,51 +23,59 @@ import zio.test._
 
 object IndexNameSpec extends ZIOSpecDefault {
   def spec: Spec[TestEnvironment, Any] =
-    suite("IndexName validation")(
-      test("succeed for valid string") {
-        check(genString(1, 255)) { name =>
-          assert(IndexName.make(name))(equalTo(Validation.succeed(unsafeWrap(name)(IndexName))))
-        }
-      },
-      test("fail for string containing upper letter") {
-        check(genString(0, 127), genString(0, 128)) { (part1, part2) =>
-          val invalidName = s"${part1}A$part2"
-          assert(IndexName.make(invalidName))(equalTo(Validation.fail(indexNameFailureMessage(invalidName))))
-        }
-      },
-      test("fail for string containing character '*'") {
-        check(genString(0, 127), genString(0, 128)) { (part1, part2) =>
-          val invalidName = s"$part1*$part2"
-          assert(IndexName.make(invalidName))(equalTo(Validation.fail(indexNameFailureMessage(invalidName))))
-        }
-      },
-      test("fail for string containing character ':'") {
-        check(genString(0, 127), genString(0, 128)) { (part1, part2) =>
-          val invalidName = s"$part1:$part2"
-          assert(IndexName.make(invalidName))(equalTo(Validation.fail(indexNameFailureMessage(invalidName))))
-        }
-      },
-      test("fail for empty string") {
-        val name = ""
-        assert(IndexName.make(name))(equalTo(Validation.succeed(unsafeWrap(name)(IndexName))))
-      },
-      test("fail for string starting with character '-'") {
-        check(genString(1, 255)) { name =>
-          val invalidName = s"-$name"
+    suite("IndexName")(
+      suite("constructing")(
+        test("fail for empty string") {
+          val name = ""
+
+          assert(IndexName.make(name))(equalTo(Validation.fail(indexNameFailureMessage(name))))
+        },
+        test("fail for string '.'") {
+          val invalidName = "."
+
           assert(IndexName.make(invalidName))(equalTo(Validation.fail(indexNameFailureMessage(invalidName))))
+        },
+        test("fail for string containing character '*'") {
+          check(genString(0, 127), genString(0, 128)) { (part1, part2) =>
+            val invalidName = s"$part1*$part2"
+
+            assert(IndexName.make(invalidName))(equalTo(Validation.fail(indexNameFailureMessage(invalidName))))
+          }
+        },
+        test("fail for string containing character ':'") {
+          check(genString(0, 127), genString(0, 128)) { (part1, part2) =>
+            val invalidName = s"$part1:$part2"
+
+            assert(IndexName.make(invalidName))(equalTo(Validation.fail(indexNameFailureMessage(invalidName))))
+          }
+        },
+        test("fail for string containing upper letter") {
+          check(genString(0, 127), genString(0, 128)) { (part1, part2) =>
+            val invalidName = s"${part1}A$part2"
+
+            assert(IndexName.make(invalidName))(equalTo(Validation.fail(indexNameFailureMessage(invalidName))))
+          }
+        },
+        test("fail for string longer than 255 bytes") {
+          check(genString(256, 300)) { invalidName =>
+            assert(IndexName.make(invalidName))(
+              equalTo(Validation.fail(indexNameFailureMessage(invalidName)))
+            )
+          }
+        },
+        test("fail for string starting with character '-'") {
+          check(genString(1, 255)) { name =>
+            val invalidName = s"-$name"
+
+            assert(IndexName.make(invalidName))(equalTo(Validation.fail(indexNameFailureMessage(invalidName))))
+          }
+        },
+        test("succeed for valid string") {
+          check(genString(1, 255)) { name =>
+            assert(IndexName.make(name))(equalTo(Validation.succeed(unsafeWrap(name)(IndexName))))
+          }
         }
-      },
-      test("fail for string '.'") {
-        val name = "."
-        assert(IndexName.make(name))(equalTo(Validation.fail(indexNameFailureMessage(name))))
-      },
-      test("fail for string longer than 255 bytes") {
-        check(genString(256, 300)) { name =>
-          assert(IndexName.make(name))(
-            equalTo(Validation.fail(indexNameFailureMessage(name)))
-          )
-        }
-      }
+      )
     )
 
   private def indexNameFailureMessage(name: String): String =