Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/github/javafaker/Internet.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ protected Internet(Faker faker) {
}

public String emailAddress() {
return emailAddress(faker.name().username());
return emailAddress(faker.name().localPart());
}

public String emailAddress(String localPart) {
Expand Down
26 changes: 26 additions & 0 deletions src/main/java/com/github/javafaker/Name.java
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,32 @@ public String username() {

return StringUtils.deleteWhitespace(username);
}

/**
* <p>
* A lowercase local part of an email address composed of the first_name and last_name joined with a '.'. Some
* examples are:
* <ul>
* <li>(template) {@link #firstName()}.{@link #lastName()}</li>
* <li>jim.o'brian</li>
* <li>jason.leigh</li>
* <li>tracy.jordan</li>
* </ul>
* </p>
* @return a random two part local part of an email address.
* @see Name#firstName()
* @see Name#lastName()
*/
public String localPart() {

String username = StringUtils.join(
firstName().toLowerCase(),
".",
lastName().toLowerCase()
);

return StringUtils.deleteWhitespace(username);
}

/**
* <p>Returns a blood group such as O−, O+, A-, A+, B-, B+, AB-, AB+</p>
Expand Down
15 changes: 14 additions & 1 deletion src/test/java/com/github/javafaker/NameTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,20 @@ public void testUsernameWithSpaces() {
doReturn(name).when(faker).name();
assertThat(faker.name().username(), matchesRegularExpression("^(\\w+)\\.(\\w+)$"));
}


@Test
public void testLocalPart() {
assertThat(faker.name().localPart(), matchesRegularExpression("^([\\w']+)\\.([\\w']+)$"));
}

@Test
public void testLocalPartWithSpaces() {
final Name name = spy(new Name(faker));
doReturn("Compound Name").when(name).firstName();
doReturn(name).when(faker).name();
assertThat(faker.name().localPart(), matchesRegularExpression("^([\\w']+)\\.([\\w']+)$"));
}

@Test
public void testBloodGroup() {
assertThat(faker.name().bloodGroup(), matchesRegularExpression("(A|B|AB|O)[+-]"));
Expand Down