8000 Unify mail in old and new testsuites by stianst · Pull Request #48785 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Unify mail in old and new testsuites #48785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stianst merged 1 commit into from
May 11, 2026
Merged

Unify mail in old and new testsuites #48785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions tests/migration-util/src/main/java/org/keycloak/test/migration/MailServerRewrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.keycloak.test.migration;

public class MailServerRewrite extends TestRewrite {

@Override
public void rewrite() {
int mailServerLine = findLine(".*MailServer mail = new MailServer().*");
if (mailServerLine != -1) {
addImport("org.keycloak.testframework.mail.annotations.InjectMailServer");
replaceLine(mailServerLine - 1, "\n @InjectMailServer");
replaceLine(mailServerLine, " MailServer mail;");
}
}

}
3 changes: 2 additions & 1 deletion tests/migration-util/src/main/java/org/keycloak/test/migration/MigrateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public class MigrateTest {
PageObjectRewrite.class,
RunOnServerRewrite.class,
CommonStatementsRewrite.class,
TestRealmRewrite.class
TestRealmRewrite.class,
MailServerRewrite.class
);

Path rootPath = getRootPath();
Expand Down
3 changes: 2 additions & 1 deletion tests/migration-util/src/main/java/org/keycloak/test/migration/RenameImportsRewrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ public class RenameImportsRewrite extends TestRewrite {
"org.keycloak.testsuite.Assert", "org.keycloak.tests.utils.Assert",
"org.junit.Test", "org.junit.jupiter.api.Test",
"org.keycloak.testsuite.util.AdminEventPaths", "org.keycloak.tests.utils.admin.AdminEventPaths",
"org.keycloak.testsuite.admin.ApiUtil", "org.keycloak.testframework.util.ApiUtil"
"org.keycloak.testsuite.admin.ApiUtil", "org.keycloak.testframework.util.ApiUtil",
"org.keycloak.testsuite.util.MailServer", "org.keycloak.testframework.mail.MailServer"
);

Map<String, String> STATIC_IMPORTS = Map.of(
Expand Down
6 changes: 3 additions & 3 deletions ...eycloak/testsuite/util/GreenMailRule.java → ...g/keycloak/testsuite/util/MailServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public class GreenMailRule extends ExternalResource {
public class MailServer extends ExternalResource {

private GreenMail greenMail;

private int port = 3025;
private String host = "localhost";

public GreenMailRule() {
public MailServer() {
}

public GreenMailRule(int port, String host) {
public MailServer(int port, String host) {
this.port = port;
this.host = host;
}
Expand Down
6 changes: 3 additions & 3 deletions .../src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionDeleteCredentialTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import org.keycloak.testsuite.pages.LoginConfigTotpPage;
import org.keycloak.testsuite.pages.LoginTotpPage;
import org.keycloak.testsuite.updaters.RealmAttributeUpdater;
import org.keycloak.testsuite.util.GreenMailRule;
import org.keycloak.testsuite.util.MailServer;
import org.keycloak.testsuite.util.MailUtils;

import org.hamcrest.MatcherAssert;
Expand All @@ -60,7 +60,7 @@
public class AppInitiatedActionDeleteCredentialTest extends AbstractAppInitiatedActionTest {

@Rule
public GreenMailRule greenMail = new GreenMailRule();
public MailServer mail = new MailServer();

@Override
protected String getAiaAction() {
Expand Down Expand Up @@ -138,7 +138,7 @@ public void removeOtpSuccess() throws Exception {
.detail(Details.CUSTOM_REQUIRED_ACTION, DeleteCredentialAction.PROVIDER_ID)
.assertEvent();

MimeMessage[] receivedMessages = greenMail.getReceivedMessages();
MimeMessage[] receivedMessages = mail.getReceivedMessages();
Assertions.assertEquals(2, receivedMessages.length);

Assertions.assertEquals("Remove OTP", receivedMessages[0].getSubject());
Expand Down
6 changes: 3 additions & 3 deletions ...ase/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionResetPasswordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import org.keycloak.testsuite.pages.LoginPasswordUpdatePage;
import org.keycloak.testsuite.updaters.RealmAttributeUpdater;
import org.keycloak.testsuite.updaters.UserAttributeUpdater;
import org.keycloak.testsuite.util.GreenMailRule;
import org.keycloak.testsuite.util.MailServer;
import org.keycloak.testsuite.util.MailUtils;
import org.keycloak.testsuite.util.SecondBrowser;
import org.keycloak.testsuite.util.URLUtils;
Expand Down Expand Up @@ -89,7 +89,7 @@ public void configureTestRealm(RealmRepresentation testRealm) {
}

@Rule
public GreenMailRule greenMail = new GreenMailRule();
public MailServer mail = new MailServer();

@Page
protected LoginPasswordUpdatePage changePasswordPage;
Expand Down Expand Up @@ -165,7 +165,7 @@ public void resetPassword() throws Exception {
events.expectRequiredAction(EventType.UPDATE_PASSWORD).assertEvent();
events.expectRequiredAction(EventType.UPDATE_CREDENTIAL).detail(Details.CREDENTIAL_TYPE, PasswordCredentialModel.TYPE).assertEvent();

MimeMessage[] receivedMessages = greenMail.getReceivedMessages();
MimeMessage[] receivedMessages = mail.getReceivedMessages();
Assertions.assertEquals(2, receivedMessages.length);

Assertions.assertEquals("Update password", receivedMessages[0].getSubject());
Expand Down
4 changes: 2 additions & 2 deletions ...llian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.keycloak.testsuite.pages.LoginPage;
import org.keycloak.testsuite.pages.TermsAndConditionsPage;
import org.keycloak.testsuite.updaters.UserAttributeUpdater;
import org.keycloak.testsuite.util.GreenMailRule;
import org.keycloak.testsuite.util.MailServer;

import org.jboss.arquillian.graphene.page.Page;
import org.junit.Rule;
Expand All @@ -53,7 +53,7 @@ public void configureTestRealm(RealmRepresentation testRealm) {
public AssertEvents events = new AssertEvents(this);

@Rule
public GreenMailRule greenMail = new GreenMailRule();
public MailServer mail = new MailServer();

@Page
protected AppPage appPage;
Expand Down
6 changes: 3 additions & 3 deletions ...ava/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver;
import org.keycloak.testsuite.pages.ErrorPage;
import org.keycloak.testsuite.pages.InfoPage;
import org.keycloak.testsuite.util.GreenMailRule;
import org.keycloak.testsuite.util.MailServer;
import org.keycloak.testsuite.util.MailUtils;
import org.keycloak.testsuite.util.WaitUtils;

Expand All @@ -60,7 +60,7 @@
public class AppInitiatedActionUpdateEmailWithVerificationTest extends AbstractAppInitiatedActionUpdateEmailTest {

@Rule
public GreenMailRule greenMail = new GreenMailRule();
public MailServer mail = new MailServer();

@Page
protected InfoPage infoPage;
Expand Down Expand Up @@ -150,7 +150,7 @@ public void confirmEmailAfterDuplicateEmailSetForThirdPartyAccount() throws Mess
}

private String fetchEmailConfirmationLink(String emailRecipient) throws MessagingException, IOException {
MimeMessage[] receivedMessages = greenMail.getReceivedMessages();
MimeMessage[] receivedMessages = mail.getReceivedMessages();
Assertions.assertEquals(1, receivedMessages.length);
MimeMessage message = receivedMessages[0];
Address[] recipients = message.getRecipients(Message.RecipientType.TO);
Expand Down
Loading
Loading
0