Skip to content
Merged
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 integration-tests/jakarta-ee/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>com.flowlogix</groupId>
<artifactId>flowlogix-jee</artifactId>
<version>11.7.3</version>
<version>11.7.6</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.junit.jupiter.api.parallel.ExecutionMode;

import java.util.Optional;
import java.util.UUID;

/**
* Tests @Injecting Subject, Session, Principal and SecurityManager with CDI
Expand Down Expand Up @@ -111,11 +112,11 @@ void principalInjection() {

@Deployment(name = TESTABLE_MODE)
public static WebArchive createDeployment() {
return createDeployment("security-manager-injection.war");
return createDeployment("security-manager-injection");
}

public static WebArchive createDeployment(String archive) {
var webArchive = ShrinkWrap.create(WebArchive.class, archive)
var webArchive = ShrinkWrap.create(WebArchive.class, "s%s-%s.war".formatted(UUID.randomUUID(), archive))
.addAsResource("META-INF/beans.xml")
.addAsResource(new StringAsset("org.apache.shiro.cdi.ShiroSecurityExtension"),
"META-INF/services/jakarta.enterprise.inject.spi.Extension")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ static boolean isShiroNativeSessionsIntegrationTest() {

@Deployment(testable = false, name = DEPLOYMENT_DEV_MODE)
public static WebArchive createDeployment() {
return ShiroAuthFormsIT.createDeploymentDev("ShiroSuiteTest-ui.war");
return ShiroAuthFormsIT.createDeploymentDev("ShiroSuiteTest-ui");
}

@Deployment(testable = false, name = DEPLOYMENT_PROD_MODE)
Expand All @@ -61,7 +61,7 @@ public static WebArchive createDeploymentProd() {

@Deployment(name = TESTABLE_MODE)
public static WebArchive createNonUIDeployment() {
return ComponentInjectionIT.createDeployment("ShiroSuiteTest.war");
return ComponentInjectionIT.createDeployment("ShiroSuiteTest");
}

private static List<Action> initializeStandardActions() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,90 +13,37 @@
*/
package org.apache.shiro.testing.jakarta.ee;

import java.net.URL;

import static org.apache.shiro.testing.jakarta.ee.ShiroAuthFormsIT.DEPLOYMENT_DEV_MODE;
import static org.apache.shiro.testing.jakarta.ee.ShiroAuthFormsIT.createDeploymentDev;
import static org.assertj.core.api.Assertions.assertThat;

import org.apache.shiro.testing.jakarta.ee.pages.LoginPage;
import org.apache.shiro.testing.jakarta.ee.pages.TagsPage;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.drone.api.annotation.Drone;

import static org.jboss.arquillian.graphene.Graphene.guardHttp;

import org.jboss.arquillian.graphene.page.Page;
import org.jboss.arquillian.junit5.ArquillianExtension;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.spec.WebArchive;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;

@ExtendWith(ArquillianExtension.class)
@Tag("UserInterface")
public class FacesTagsIT {
@Drone
private WebDriver webDriver;

@SuppressWarnings("DeclarationOrder")
@ArquillianResource
protected URL baseURL;

@FindBy(id = "username")
private WebElement username;

@FindBy(id = "password")
private WebElement password;

@FindBy(id = "login")
private WebElement login;

@FindBy(id = "guestTag")
private WebElement guest;

@FindBy(id = "userTag")
private WebElement user;

@FindBy(id = "authenticatedTag")
private WebElement authenticated;

@FindBy(id = "notAuthenticatedTag")
private WebElement notAuthenticated;

@FindBy(id = "principalTag")
private WebElement principal;

@FindBy(id = "principalTagByType")
private WebElement principalByType;

@FindBy(id = "principalTagByProperty")
private WebElement principalByProperty;

@FindBy(id = "hasRegularRoleTag")
private WebElement regularRole;

@FindBy(id = "lacksAdminRoleTag")
private WebElement lacksAdminRole;

@FindBy(id = "hasAnyRoleTag")
private WebElement hasAnyRole;

@FindBy(id = "hasPermissionTag")
private WebElement hasPermission;

@FindBy(id = "lacksPermissionTag")
private WebElement lacksPermission;

@FindBy(id = "hasAnyPermissionTag")
private WebElement hasAnyPermission;
@Page
private LoginPage loginPage;

@FindBy(id = "rememberedTag")
private WebElement remembered;
@Page
private TagsPage tagsPage;

@BeforeEach
void deleteAllCookies() {
Expand All @@ -106,133 +53,131 @@ void deleteAllCookies() {
@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void guestTag() {
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(guest.getText()).isEqualTo("Guest Content");
tagsPage.goTo();
assertThat(tagsPage.guest()).isEqualTo("Guest Content");
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(guest.getText()).isEqualTo("");
tagsPage.goTo();
assertThat(tagsPage.guest()).isEqualTo("");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void userTag() {
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(user.getText()).isEqualTo("");
tagsPage.goTo();
assertThat(tagsPage.user()).isEqualTo("");
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(user.getText()).isEqualTo("User Content");
tagsPage.goTo();
assertThat(tagsPage.user()).isEqualTo("User Content");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void authenticated() {
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(authenticated.getText()).isEqualTo("");
tagsPage.goTo();
assertThat(tagsPage.authenticated()).isEqualTo("");
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(authenticated.getText()).isEqualTo("Authenticated Content");
tagsPage.goTo();
assertThat(tagsPage.authenticated()).isEqualTo("Authenticated Content");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void notAuthenticated() {
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(notAuthenticated.getText()).isEqualTo("Not Authenticated Content");
tagsPage.goTo();
assertThat(tagsPage.notAuthenticated()).isEqualTo("Not Authenticated Content");
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(notAuthenticated.getText()).isEqualTo("");
tagsPage.goTo();
assertThat(tagsPage.notAuthenticated()).isEqualTo("");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void principal() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(principal.getText()).isEqualTo("webuser");
tagsPage.goTo();
assertThat(tagsPage.principal()).isEqualTo("webuser");
}

@Test
@SuppressWarnings("MagicNumber")
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void principalByType() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(principalByType.getText()).isEqualTo("5");
tagsPage.goTo();
assertThat(tagsPage.principalByType()).isEqualTo("5");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void principalByProperty() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(principalByProperty.getText()).isEqualTo("webuser");
tagsPage.goTo();
assertThat(tagsPage.principalByProperty()).isEqualTo("webuser");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void hasRegularRole() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(regularRole.getText()).isEqualTo("Regular Role");
tagsPage.goTo();
assertThat(tagsPage.regularRole()).isEqualTo("Regular Role");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void lacksAdminRole() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(lacksAdminRole.getText()).isEqualTo("Lacks Admin Role");
tagsPage.goTo();
assertThat(tagsPage.lacksAdminRole()).isEqualTo("Lacks Admin Role");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void hasAnyRole() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(hasAnyRole.getText()).isEqualTo("Has Some Role");
tagsPage.goTo();
assertThat(tagsPage.hasAnyRole()).isEqualTo("Has Some Role");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void hasAnyPermission() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(hasAnyPermission.getText()).isEqualTo("Has Some Permission");
tagsPage.goTo();
assertThat(tagsPage.hasAnyPermission()).isEqualTo("Has Some Permission");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void hasPermission() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(hasPermission.getText()).isEqualTo("Has Permission");
tagsPage.goTo();
assertThat(tagsPage.hasPermission()).isEqualTo("Has Permission");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void lacksPermissio() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(lacksPermission.getText()).isEqualTo("Lacks Permission");
tagsPage.goTo();
assertThat(tagsPage.lacksPermission()).isEqualTo("Lacks Permission");
}

@Test
@OperateOnDeployment(DEPLOYMENT_DEV_MODE)
void remembered() {
login();
webDriver.get(baseURL + "shiro/unprotected/tags");
assertThat(remembered.getText()).isEqualTo("");
tagsPage.goTo();
assertThat(tagsPage.remembered()).isEqualTo("");
}

private void login() {
webDriver.get(baseURL + "shiro/auth/loginform");
username.sendKeys("webuser");
password.sendKeys("webpwd");
guardHttp(login).click();
loginPage.goTo();
loginPage.login();
}

@Deployment(testable = false, name = DEPLOYMENT_DEV_MODE)
public static WebArchive createDeployment() {
return createDeploymentDev("shiro-facelet-tags.war");
return createDeploymentDev("shiro-facelet-tags");
}
}
Loading
Loading