This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/shiro.git
commit b3825530db35d67e9ef183a19407ef63af8d4888 Merge: bb0078ff5 b95f118c5 Author: Lenny Primak <[email protected]> AuthorDate: Thu May 2 23:30:55 2024 -0500 Merge pull request #1453 from apache/revert-1452-assert-j-best-practices Revert "Refactor: AssertJ best practices by @timtebeek" .../org/apache/shiro/SecurityUtilsUnwrapTest.java | 27 +- .../apache/shiro/aop/AnnotationResolverTest.java | 9 +- .../shiro/authc/AbstractAuthenticatorTest.java | 22 +- .../shiro/authc/SimpleAuthenticationInfoTest.java | 6 +- .../AbstractHashedCredentialsMatcherTest.java | 6 +- .../credential/AllowAllCredentialsMatcherTest.java | 4 +- .../credential/HashedCredentialsMatcherTest.java | 8 +- .../shiro/authc/pam/AllSuccessfulStrategyTest.java | 8 +- .../authc/pam/FirstSuccessfulStrategyTest.java | 23 +- .../shiro/authz/ModularRealmAuthorizerTest.java | 13 +- .../authz/aop/DenyAllAnnotationHandlerTest.java | 6 +- .../authz/aop/PermissionAnnotationHandlerTest.java | 8 +- .../shiro/authz/aop/RoleAnnotationHandlerTest.java | 8 +- .../aop/RolesAllowedAnnotationHandlerTest.java | 10 +- .../shiro/authz/permission/AllPermissionTest.java | 6 +- .../authz/permission/DomainPermissionTest.java | 136 +++--- .../permission/WildcardPermissionResolverTest.java | 22 +- .../authz/permission/WildcardPermissionTest.java | 202 ++++----- .../shiro/concurrent/SubjectAwareExecutorTest.java | 4 +- .../apache/shiro/jndi/JndiObjectFactoryTest.java | 18 +- .../shiro/mgt/AbstractRememberMeManagerTest.java | 6 +- .../shiro/mgt/DefaultSecurityManagerTest.java | 61 +-- .../mgt/VMSingletonDefaultSecurityManagerTest.java | 9 +- .../apache/shiro/realm/AuthorizingRealmTest.java | 67 +-- .../activedirectory/ActiveDirectoryRealmTest.java | 23 +- .../org/apache/shiro/realm/jdbc/JDBCRealmTest.java | 13 +- .../shiro/realm/ldap/DefaultLdapRealmTest.java | 27 +- .../realm/ldap/JndiLdapContextFactoryTest.java | 68 +-- .../apache/shiro/realm/ldap/JndiLdapRealmTest.java | 4 +- .../org/apache/shiro/realm/text/IniRealmTest.java | 15 +- .../realm/text/TextConfigurationRealmTest.java | 13 +- .../mgt/AbstractValidatingSessionManagerTest.java | 8 +- .../session/mgt/DefaultSessionManagerTest.java | 26 +- .../shiro/session/mgt/DelegatingSessionTest.java | 8 +- ...cutorServiceSessionValidationSchedulerTest.java | 21 +- .../shiro/session/mgt/SimpleSessionTest.java | 13 +- .../shiro/subject/DelegatingSubjectTest.java | 121 +++--- .../org/apache/shiro/util/AntPathMatcherTests.java | 478 ++++++++++----------- .../apache/shiro/util/RegExPatternMatcherTest.java | 7 +- .../org/apache/shiro/util/StringUtilsTest.java | 94 ++-- integration-tests/jakarta-ee/pom.xml | 2 +- .../shiro/testing/cdi/ComponentInjectionIT.java | 35 +- .../shiro/testing/jakarta/ee/FacesTagsIT.java | 39 +- .../shiro/testing/jakarta/ee/ShiroAuthFormsIT.java | 59 +-- .../shiro/testing/jakarta/ee/ShiroBeansIT.java | 44 +- .../shiro/testing/jakarta/ee/ShiroSSLFilterIT.java | 10 +- .../apache/shiro/testing/jaxrs/NoIniJaxRsIT.java | 2 +- integration-tests/jaxrs/tests/pom.xml | 5 - .../testing/jaxrs/tests/AbstractShiroJaxRsIT.java | 8 +- integration-tests/support/pom.xml | 7 - .../shiro/testing/web/AbstractContainerIT.java | 9 +- .../org/apache/shiro/lang/util/ClassUtilsTest.java | 86 ++-- pom.xml | 7 +- .../aspectj/bank/SecureBankServiceTest.java | 28 +- .../web/jakarta/JakartaAbstractContainerIT.java | 6 +- .../shiro/test/web/jakarta/WebContainerIT.java | 15 +- .../org/apache/shiro/aspectj/DummyServiceTest.java | 18 +- .../apache/shiro/cdi/AnnotatedTypeWrapperTest.java | 65 +-- .../java/org/apache/shiro/cdi/AopHelperTest.java | 13 +- .../shiro/cache/ehcache/EhCacheManagerTest.java | 123 +++--- support/guice/pom.xml | 5 - .../apache/shiro/guice/BeanTypeListenerTest.java | 23 +- .../apache/shiro/guice/GuiceEnvironmentTest.java | 6 +- .../org/apache/shiro/guice/ShiroMatchersTest.java | 7 +- .../org/apache/shiro/guice/ShiroModuleTest.java | 26 +- .../apache/shiro/guice/ShiroSessionScopeTest.java | 10 +- .../AopAllianceMethodInterceptorAdapterTest.java | 4 +- .../AopAllianceMethodInvocationAdapterTest.java | 10 +- .../apache/shiro/guice/aop/ShiroAopModuleTest.java | 23 +- .../guice/web/AbstractInjectionProviderTest.java | 21 +- .../apache/shiro/guice/web/DefaultFiltersTest.java | 2 +- .../guice/web/FilterChainResolverProviderTest.java | 20 +- .../apache/shiro/guice/web/FilterConfigTest.java | 6 +- .../shiro/guice/web/GuiceShiroFilterTest.java | 15 +- .../apache/shiro/guice/web/ShiroWebModuleTest.java | 126 +++--- .../guice/web/SimpleFilterChainResolverTest.java | 6 +- .../shiro/guice/web/WebGuiceEnvironmentTest.java | 14 +- .../apache/shiro/ee/cdi/ShiroScopeContextTest.java | 19 +- .../apache/shiro/ee/filters/FormSupportTest.java | 119 ++--- .../SecureRemoteInvocationFactoryTest.java | 7 +- .../AbstractAuthorizationAnnotationTest.java | 8 +- .../AuthorizationAttributeSourceAdvisorTest.java | 55 ++- .../DapcAuthorizationAnnotationTest.java | 8 +- .../spring/web/ShiroFilterFactoryBeanTest.java | 18 +- .../ShiroWebConfigurationTestSameSiteStrict.java | 10 +- .../org/apache/shiro/tools/hasher/HasherTest.java | 11 +- .../config/WebIniSecurityManagerFactoryTest.java | 11 +- .../web/env/EnvironmentLoaderServiceTest.java | 21 +- .../PathMatchingFilterParameterizedTest.java | 7 +- .../shiro/web/filter/PathMatchingFilterTest.java | 15 +- .../web/filter/authc/AnonymousFilterTest.java | 4 +- .../shiro/web/filter/authz/HostFilterTest.java | 6 +- .../authz/HttpMethodPermissionFilterTest.java | 24 +- .../web/filter/authz/IpAddressMatcherTests.java | 31 +- .../shiro/web/filter/authz/IpFilterTest.java | 12 +- .../shiro/web/filter/authz/PortFilterTest.java | 6 +- .../shiro/web/filter/authz/SslFilterTest.java | 9 +- .../mgt/PathMatchingFilterChainResolverTest.java | 57 +-- .../web/filter/mgt/SimpleNamedFilterListTest.java | 84 ++-- .../shiro/web/mgt/CookieRememberMeManagerTest.java | 33 +- .../web/mgt/DefaultWebSecurityManagerTest.java | 42 +- .../web/servlet/OncePerRequestFilterTest.java | 8 +- .../web/servlet/ShiroHttpServletRequestTest.java | 11 +- .../shiro/web/session/HttpServletSessionTest.java | 6 +- 104 files changed, 1624 insertions(+), 1551 deletions(-)
