Apply code review

Author: seongahjo

fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/arbitrary/StringCombinableArbitrary.java

@@ -19,7 +19,6 @@
 package com.navercorp.fixturemonkey.api.arbitrary;
 
 import java.util.function.Predicate;
-import java.util.regex.Pattern;
 
 public interface StringCombinableArbitrary extends CombinableArbitrary<String> {
 	int STRING_DEFAULT_MIN_LENGTH = 0;
@@ -89,18 +88,6 @@ default StringCombinableArbitrary filterCharacter(Predicate<Character> predicate
 
 	StringCombinableArbitrary filterCharacter(int tries, Predicate<Character> predicate);
 
-	/**
-	 * Generates the pattern matched arbitrary String.
-	 * Its performance differs from the generation engine you're using.
-	 *
-	 * @param stringPattern the regular expression pattern
-	 * @return the pattern matched StringCombinableArbitrary
-	 */
-	default StringCombinableArbitrary pattern(int tries, String stringPattern) {
-		Pattern pattern = Pattern.compile(stringPattern);
-		return this.filter(tries, it -> pattern.matcher(it).matches());
-	}
-
 	@Override
 	default StringCombinableArbitrary injectNull(double nullProbability) {
 		return new StringCombinableArbitraryDelegator(CombinableArbitrary.super.injectNull(nullProbability));

fixture-monkey-kotest/src/main/kotlin/com/navercorp/fixturemonkey/kotest/KotestStringCombinableArbitrary.kt

@@ -20,11 +20,12 @@ package com.navercorp.fixturemonkey.kotest
 
 import com.navercorp.fixturemonkey.api.arbitrary.StringCombinableArbitrary
 import io.kotest.property.Arb
+import io.kotest.property.arbitrary.Codepoint
+import io.kotest.property.arbitrary.ascii
 import io.kotest.property.arbitrary.codepoints
 import io.kotest.property.arbitrary.filter
 import io.kotest.property.arbitrary.single
 import io.kotest.property.arbitrary.string
-import io.kotest.property.arbitrary.stringPattern
 import java.util.function.Predicate
 
 class KotestStringCombinableArbitrary(private val arb: Arb<String> = Arb.string()) : StringCombinableArbitrary {
@@ -40,15 +41,12 @@ class KotestStringCombinableArbitrary(private val arb: Arb<String> = Arb.string(
 
     override fun alphabetic(): StringCombinableArbitrary = KotestStringCombinableArbitrary(
         Arb.string(
-            codepoints = Arb.codepoints().filter { it.value.toChar() in 'a'..'z' }
+            codepoints = Arb.codepoints().filter { it.value.toChar() in 'a'..'z' || it.value.toChar() in 'A'..'Z' }
         )
     )
 
     override fun ascii(): StringCombinableArbitrary = KotestStringCombinableArbitrary(
-        Arb.string(
-            codepoints = Arb.codepoints()
-                .filter { it.value.toChar() in Character.MIN_CODE_POINT.toChar()..MAX_ASCII_CODEPOINT.toChar() }
-        )
+        Arb.string(codepoints = Codepoint.ascii())
     )
 
     override fun numeric(): StringCombinableArbitrary = KotestStringCombinableArbitrary(
@@ -70,9 +68,6 @@ class KotestStringCombinableArbitrary(private val arb: Arb<String> = Arb.string(
             )
         )
 
-    override fun pattern(treis: Int, pattern: String): StringCombinableArbitrary =
-        KotestStringCombinableArbitrary(Arb.stringPattern(pattern))
-
     override fun clear() {
     }
 

fixture-monkey-tests/kotlin-tests/src/test/kotlin/com/navercorp/fixturemonkey/tests/kotlin/KotestInJunitTest.kt

@@ -886,7 +886,7 @@ class KotestInJunitTest {
     fun stringCombinableArbitraryAscii(){
         val actual = CombinableArbitrary.strings().ascii().combined()
 
-        then(actual).isInstanceOf(KotestStringCombinableArbitrary::class.java)
+        then(actual).isASCII()
     }
 
     companion object {