Fix possible issue with tr locale in testUsernameWithSpaces

Author: snuyanzin

src/main/java/net/datafaker/providers/base/Internet.java

@@ -44,18 +44,7 @@ protected Internet(BaseProviders faker) {
      */
     @Deprecated(since = "2.5.0", forRemoval = true)
     public String username() {
-        StringBuilder result = new StringBuilder();
-        final Name name = faker.name();
-        final String firstName = name.firstName().toLowerCase(faker.getContext().getLocale())
-            + "." + name.lastName().toLowerCase(faker.getContext().getLocale());
-        for (int i = 0; i < firstName.length(); i++) {
-            final char c = firstName.charAt(i);
-            if (c == '\'' || Character.isWhitespace(c)) {
-                continue;
-            }
-            result.append(c);
-        }
-        return result.toString();
+        return faker.credentials().username();
     }
 
     public String emailAddress() {

src/test/java/net/datafaker/providers/base/CredentialsTest.java

@@ -2,11 +2,16 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
@@ -20,22 +25,31 @@ void testUsername() {
         assertThat(faker.credentials().username()).matches("^(\\w+)\\.(\\w+)$");
     }
 
-    @Test
-    void testUsernameWithSpaces() {
+    @ParameterizedTest
+    @MethodSource("userNameWithSpacesProvider")
+    @SuppressWarnings("removal")
+    void testUsernameWithSpaces(String firstName, String lastName, String expected) {
+        Locale locale = new Locale("TR");
         Name name = mock();
-        doReturn("Jin Quan").when(name).firstName();
-        doReturn("D'Artagnan").when(name).lastName();
+        doReturn(firstName).when(name).firstName();
+        doReturn(lastName).when(name).lastName();
 
-        BaseFaker mockedFaker = new BaseFaker() {
+        BaseFaker mockedFaker = new BaseFaker(locale) {
             @Override
             public Name name() {
                 return name;
             }
         };
-        assertThat(mockedFaker.credentials().username())
-            .doesNotContain(" ", "'")
-            .matches("^(\\w+)\\.(\\w+)$")
-            .matches("^\\p{javaLowerCase}+\\.\\p{javaLowerCase}+$");
+
+        assertThat(mockedFaker.internet().username())
+            .isEqualTo(expected);
+    }
+
+    private static Stream<Arguments> userNameWithSpacesProvider() {
+        return Stream.of(
+            Arguments.of("Jin Quan", "D'Artagnan", "jinquan.dartagnan"),
+            Arguments.of("Ivan Ivanov", "Другой Язык", "ıvanıvanov.другойязык")
+        );
     }
 
     @RepeatedTest(100)

src/test/java/net/datafaker/providers/base/InternetTest.java

@@ -7,6 +7,9 @@
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -16,6 +19,7 @@
 import java.util.Random;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static java.lang.Integer.parseInt;
 import static net.datafaker.providers.base.Internet.PortRange.RegisteredPorts;
@@ -45,23 +49,31 @@ void emailSubject() {
         assertThat(faker.internet().emailSubject()).isNotBlank();
     }
 
-    @Test
+    @ParameterizedTest
+    @MethodSource("userNameWithSpacesProvider")
     @SuppressWarnings("removal")
-    void testUsernameWithSpaces() {
+    void testUsernameWithSpaces(String firstName, String lastName, String expected) {
+        Locale locale = new Locale("TR");
         Name name = mock();
-        doReturn("Jin Quan").when(name).firstName();
-        doReturn("D'Artagnan").when(name).lastName();
+        doReturn(firstName).when(name).firstName();
+        doReturn(lastName).when(name).lastName();
 
-        BaseFaker mockedFaker = new BaseFaker() {
+        BaseFaker mockedFaker = new BaseFaker(locale) {
             @Override
             public Name name() {
                 return name;
             }
         };
+
         assertThat(mockedFaker.internet().username())
-            .doesNotContain(" ", "'")
-            .matches("^(\\w+)\\.(\\w+)$")
-            .matches("^\\p{javaLowerCase}+\\.\\p{javaLowerCase}+$");
+            .isEqualTo(expected);
+    }
+
+    private static Stream<Arguments> userNameWithSpacesProvider() {
+        return Stream.of(
+            Arguments.of("Jin Quan", "D'Artagnan", "jinquan.dartagnan"),
+            Arguments.of("Ivan Ivanov", "Другой Язык", "ıvanıvanov.другойязык")
+        );
     }
 
     @Test