Merge pull request #37497 from JinseongHwang

* pr/37497:
  Use consistent capitalization in MySQL and MariaDB test names

Closes gh-37497
3.1.x
Scott Frederick 1 year ago
commit 6c16ff104e

@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
* @author Moritz Halbritter
* @author Andy Wilkinson
* @author Phillip Webb
* @author Jinseong Hwang
*/
class MariaDbEnvironmentTests {
@ -74,21 +75,21 @@ class MariaDbEnvironmentTests {
}
@Test
void getUsernameWhenHasMySqlUser() {
void getUsernameWhenHasMysqlUser() {
MariaDbEnvironment environment = new MariaDbEnvironment(
Map.of("MYSQL_USER", "myself", "MARIADB_PASSWORD", "secret", "MARIADB_DATABASE", "db"));
assertThat(environment.getUsername()).isEqualTo("myself");
}
@Test
void getUsernameWhenHasMariadbUserAndMySqlUser() {
void getUsernameWhenHasMariadbUserAndMysqlUser() {
MariaDbEnvironment environment = new MariaDbEnvironment(Map.of("MARIADB_USER", "myself", "MYSQL_USER", "me",
"MARIADB_PASSWORD", "secret", "MARIADB_DATABASE", "db"));
assertThat(environment.getUsername()).isEqualTo("myself");
}
@Test
void getUsernameWhenHasNoMariadbUserOrMySqlUser() {
void getUsernameWhenHasNoMariadbUserOrMysqlUser() {
MariaDbEnvironment environment = new MariaDbEnvironment(
Map.of("MARIADB_PASSWORD", "secret", "MARIADB_DATABASE", "db"));
assertThat(environment.getUsername()).isEqualTo("root");

@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
* @author Moritz Halbritter
* @author Andy Wilkinson
* @author Phillip Webb
* @author Jinseong Hwang
*/
class MySqlEnvironmentTests {
@ -53,14 +54,14 @@ class MySqlEnvironmentTests {
}
@Test
void getUsernameWhenHasMySqlUser() {
void getUsernameWhenHasMysqlUser() {
MySqlEnvironment environment = new MySqlEnvironment(
Map.of("MYSQL_USER", "myself", "MYSQL_PASSWORD", "secret", "MYSQL_DATABASE", "db"));
assertThat(environment.getUsername()).isEqualTo("myself");
}
@Test
void getUsernameWhenHasNoMySqlUser() {
void getUsernameWhenHasNoMysqlUser() {
MySqlEnvironment environment = new MySqlEnvironment(Map.of("MYSQL_PASSWORD", "secret", "MYSQL_DATABASE", "db"));
assertThat(environment.getUsername()).isEqualTo("root");
}

@ -114,7 +114,7 @@ public final class DockerImageNames {
/**
* Return a {@link DockerImageName} suitable for running MariaDB.
* @return a docker image name for running Mariadb
* @return a docker image name for running MariaDB
*/
public static DockerImageName mariadb() {
return DockerImageName.parse("mariadb").withTag(MARIADB_VERSION);

Loading…
Cancel
Save