Skip to content

Commit

Permalink
Finish renaming of the @DisplayName annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
ManuelMoeri committed Dec 20, 2024
1 parent 3309fec commit 613f522
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void tearDown() {
cacheManager.getCache(AUTHORIZATION_USER_CACHE).clear();
}

@DisplayName("before calling updateOrAddAuthorizationUser the User is not in the cache")
@DisplayName("Should confirm user is not in the cache before calling updateOrAddAuthorizationUser")
@Test
void shouldNotHaveCachedUserBeforeUpdateOrAddAuthorizationUser() {
Cache cache = cacheManager.getCache(AUTHORIZATION_USER_CACHE);
Expand All @@ -50,7 +50,7 @@ void shouldNotHaveCachedUserBeforeUpdateOrAddAuthorizationUser() {
assertNull(cache.get(key, AuthorizationUser.class));
}

@DisplayName("updateOrAddAuthorizationUser puts the User in the cache with key composed by Tenant and User Email")
@DisplayName("Should put user in the cache with key composed of tenant and user email when calling updateOrAddAuthorizationUser")
@Test
void shouldCacheUserGivenToUpdateOrAddAuthorizationUser() {
Cache cache = cacheManager.getCache(AUTHORIZATION_USER_CACHE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@

public class CurrentTenantIdentifierResolverImplTest {

@DisplayName("current TenantId is TenantId from TenantContext")
@DisplayName("Should return current TenantId from TenantContext")
@Test
void currentTenantIdIsTenantIdFromTenantContext() {
CurrentTenantIdentifierResolverImpl resolver = new CurrentTenantIdentifierResolverImpl();
String tenantIdentifier = resolver.resolveCurrentTenantIdentifier();
assertEquals(TenantContext.getCurrentTenant(), tenantIdentifier);
}

@DisplayName("validateExistingCurrentSessions is true")
@DisplayName("Should validate that existing current sessions are true")
@Test
void validateExistingCurrentSessionsIsTrue() {
CurrentTenantIdentifierResolverImpl resolver = new CurrentTenantIdentifierResolverImpl();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void registerProvider(String tenantIdentifier, ConnectionProvider connect
}
}

@DisplayName("getConnectionProvider() returns ConnectionProvider if TenantId is registered")
@DisplayName("Should return ConnectionProvider if tenantId is registered after calling getConnectionProvider()")
@Test
void getConnectionProviderReturnsConnectionProviderIfTenantIdIsRegistered() {
// arrange
Expand All @@ -40,7 +40,7 @@ void getConnectionProviderReturnsConnectionProviderIfTenantIdIsRegistered() {
Assertions.assertNotNull(foundConnectionProvider);
}

@DisplayName("getConnectionProvider() throws Exception when lookup TenantId is null")
@DisplayName("Should throw Exception when lookup tenantId is null after calling getConnectionProvider()")
@Test
void getConnectionProviderThrowsExceptionWhenLookupTenantIdIsNull() {
// arrange
Expand All @@ -50,7 +50,7 @@ void getConnectionProviderThrowsExceptionWhenLookupTenantIdIsNull() {
Assertions.assertThrows(ConnectionProviderException.class, () -> mockProvider.getConnectionProvider(null));
}

@DisplayName("selectConnectionProvider() return ConnectionProvider if TenantId is registered")
@DisplayName("Should return ConnectionProvider if tenantId is registered after calling selectConnectionProvider()")
@Test
void selectConnectionProviderReturnConnectionProviderIfTenantIdIsRegistered() {
// arrange
Expand All @@ -64,7 +64,7 @@ void selectConnectionProviderReturnConnectionProviderIfTenantIdIsRegistered() {
Assertions.assertNotNull(foundConnectionProvider);
}

@DisplayName("getAnyConnectionProvider() return ConnectionProvider for TenantId public")
@DisplayName("Should return ConnectionProvider for tenantId 'public' after calling getAnyConnectionProvider()")
@Test
void getAnyConnectionProviderReturnConnectionProviderForTenantIdPublic() {
// arrange
Expand All @@ -78,7 +78,7 @@ void getAnyConnectionProviderReturnConnectionProviderForTenantIdPublic() {
Assertions.assertNotNull(foundConnectionProvider);
}

@DisplayName("getConnectionProviderShouldThrowRuntimeExceptionWhenNoPropertiesAreFound")
@DisplayName("Should throw RuntimeException when no properties are found after calling getConnectionProvider()")
@Test
void getConnectionProviderShouldThrowRuntimeExceptionWhenNoPropertiesAreFound() {
ConfigurableConnectionProviderMock mockProvider = new ConfigurableConnectionProviderMock();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private String prefix(String tenantId) {
return tenantId + "_";
}

@DisplayName("getTenantConfigs returns all TenantConfigs as List")
@DisplayName("Should return all tenant-configs as a list after calling getTenantConfigs")
@Test
public void shouldGetTenantConfigs() {
TenantConfigProvider configProvider = new TenantConfigProvider(tenantIds, env);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void prepareTests() {
TenantContext.setCurrentTenant(DEFAULT_TENANT_ID);
}

@DisplayName("onSuccess() puts Token from AuthenticationSuccessEvent in TenantContext")
@DisplayName("Should put token from authentication-success-event in tenant-context after calling onSuccess()")
@Test
void onSuccessPutsTokenFromAuthenticationSuccessEventInTenantContext() {
// arrange
Expand Down
12 changes: 6 additions & 6 deletions backend/src/test/java/ch/puzzle/okr/security/JwtHelperTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class JwtHelperTest {
private static final String PITC = "pitc";

// ok
@DisplayName("getUserFromJwt() extracts User data from Token")
@DisplayName("Should extract user data from token after calling getUserFromJwt()")
@Test
void getUserFromJwtExtractsUserDataFromToken() {
// arrange
Expand All @@ -56,7 +56,7 @@ void getUserFromJwtExtractsUserDataFromToken() {
}

// ok
@DisplayName("getUserFromJwt() throws Exception if Token doesnt contain User data")
@DisplayName("Should throw Exception if token does not contain user data after calling getUserFromJwt()")
@Test
void getUserFromJwtThrowsExceptionIfTokenNotContainsUserData() {
// arrange
Expand All @@ -73,7 +73,7 @@ void getUserFromJwtThrowsExceptionIfTokenNotContainsUserData() {
assertEquals(BAD_REQUEST, okrResponseStatusException.getStatusCode());
}

@DisplayName("getTenantFromToken() returns Tenant if Tenant found in TenantConfigProvider")
@DisplayName("Should return tenant from token if tenant is found in tenant-config-provider after calling getTenantFromToken()")
@Test
void getTenantFromTokenReturnsTenantIfTenantFoundInTenantConfigProvider() {
// arrange
Expand All @@ -96,7 +96,7 @@ void getTenantFromTokenReturnsTenantIfTenantFoundInTenantConfigProvider() {
assertEquals(PITC, tenantFromToken);
}

@DisplayName("getTenantFromToken() throws Exception if Tenant not found in TenantConfigProvider")
@DisplayName("Should throw Exception if tenant is not found in tenant-config-provider after calling getTenantFromToken()")
@Test
void getTenantFromTokenThrowsExceptionIfTenantNotFoundInTenantConfigProvider() {
// arrange
Expand All @@ -111,7 +111,7 @@ void getTenantFromTokenThrowsExceptionIfTenantNotFoundInTenantConfigProvider() {
assertThrows(EntityNotFoundException.class, () -> jwtHelper.getTenantFromToken(tokenMock));
}

@DisplayName("getTenantFromJWTClaimsSet() returns Tenant if Tenant found in TenantConfigProvider")
@DisplayName("Should return tenant from JWTClaimsSet if tenant is found in tenant-config-provider after calling getTenantFromJWTClaimsSet()")
@Test
void getTenantFromJWTClaimsSetReturnsTenantIfTenantFoundInTenantConfigProvider() throws ParseException {
// arrange
Expand All @@ -134,7 +134,7 @@ void getTenantFromJWTClaimsSetReturnsTenantIfTenantFoundInTenantConfigProvider()
assertEquals(PITC, tenantFromToken);
}

@DisplayName("getTenantFromJWTClaimsSet() throws Exception if ClaimSet cannot be parsed")
@DisplayName("Should throw Exception if JWTClaimsSet cannot be parsed after calling getTenantFromJWTClaimsSet()")
@Test
void getTenantFromJWTClaimsSetThrowsExceptionIfClaimSetCanNotBeParsed() throws ParseException {
// arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class TenantJWSKeySelectorTest {
private static final String MOCK_ALGORITHM = "mock_algorithm";
private static final String UNKNOWN_TENANT = "unknown tenant";

@DisplayName("selectKeys() throws Exception if JwkSetUri not found in TenantConfigProvider")
@DisplayName("Should throw exception if the JwkSetUri was not found in the tenant-config-provider after calling selectKeys()")
@Test
void selectKeysThrowsExceptionIfTenantConfigIsNotFound() {
// arrange
Expand All @@ -45,7 +45,7 @@ void selectKeysThrowsExceptionIfTenantConfigIsNotFound() {
assertEquals(UNKNOWN_TENANT, illegalArgumentException.getLocalizedMessage());
}

@DisplayName("selectKeys() return Key with Mock Algorithm if JwkSetUri is found in TenantConfigProvider")
@DisplayName("Should return a key with the mock algorithm if the JwkSetUri is found in the tenant-config-provider after calling selectKeys()")
@Test
void selectKeysReturnKeyWithMockAlgorithmIfJwkSetUriIsFound() throws KeySourceException {
// arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class TenantJwtIssuerValidatorTest {
private static final String PITC = "pitc";
private static final String ISSUER_URL = "issuerUrl";

@DisplayName("validate() throws exception if TenantConfig is not found for Tenant PITC")
@DisplayName("Should throw exception if the tenant-config is not found for the tenant PITC after calling validate()")
@Test
void validateThrowsExceptionIfTenantConfigNotFound() {
// arrange
Expand All @@ -38,7 +38,7 @@ void validateThrowsExceptionIfTenantConfigNotFound() {
assertEquals("unknown tenant", illegalArgumentException.getLocalizedMessage());
}

@DisplayName("validate() returns OAuth2TokenValidatorResult if TenantConfig with IssuerUrl is found for Tenant PITC")
@DisplayName("Should return OAuth2TokenValidatorResult if tenant-config with the issue-url is found for tenant PITC after calling validate()")
@Test
void validateReturnsOAuth2TokenValidatorResultIfTenantConfigWithIssuerUrlIsFound() {
// arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void setup() {
helper = new ClaimHelper();
}

@DisplayName("getTenantFromClaimsSetUsingClaimTenant() returns tenant if claim tenant is found")
@DisplayName("Should return tenant if claim tenant is found after calling getTenantFromClaimsSetUsingClaimTenant()")
@Test
void getTenantFromClaimsSetUsingClaimTenantReturnsTenantIfClaimTenantFound() throws ParseException {
// arrange
Expand All @@ -42,7 +42,7 @@ void getTenantFromClaimsSetUsingClaimTenantReturnsTenantIfClaimTenantFound() thr
assertEquals(PITC, tenant.get());
}

@DisplayName("getTenantFromClaimsSetUsingClaimTenant() return empty if claim tenant is not found")
@DisplayName("Should return empty if claim tenant is not found after calling getTenantFromClaimsSetUsingClaimTenant()")
@Test
void getTenantFromClaimsSetUsingClaimTenantReturnEmptyIfClaimTenantNotFound() {
// arrange
Expand All @@ -55,7 +55,7 @@ void getTenantFromClaimsSetUsingClaimTenantReturnEmptyIfClaimTenantNotFound() {
assertTrue(tenant.isEmpty());
}

@DisplayName("getTenantFromClaimsSetUsingClaimTenant() returns empty if claim tenant is found but value is null")
@DisplayName("Should return empty if claim tenant is found but value is null after calling getTenantFromClaimsSetUsingClaimTenant()")
@Test
void getTenantFromClaimsSetUsingClaimTenantReturnsEmptyIfClaimTenantFoundButValueIsNull() throws ParseException {
// arrange
Expand All @@ -69,7 +69,7 @@ void getTenantFromClaimsSetUsingClaimTenantReturnsEmptyIfClaimTenantFoundButValu
assertTrue(tenant.isEmpty());
}

@DisplayName("getTenantFromClaimsSetUsingClaimTenant() returns empty if claim tenant is found but parsing of claim failed")
@DisplayName("Should return empty if claim tenant is found but parsing of claim failed after calling getTenantFromClaimsSetUsingClaimTenant()")
@Test
void getTenantFromClaimsSetUsingClaimTenantReturnsEmptyIfParsingOfClaimFailed() throws ParseException {
// arrange
Expand Down Expand Up @@ -98,7 +98,7 @@ void getTenantFromClaimsSetUsingClaimIssReturnsTenantIfClaimIssFound(String issU
assertEquals(PITC, tenant.get());
}

@DisplayName("getTenantFromClaimsSetUsingClaimIss() returns empty if claim iss is not found")
@DisplayName("Should return empty if claim iss is not found after calling getTenantFromClaimsSetUsingClaimIss()")
@Test
void getTenantFromClaimsSetUsingClaimIssReturnsEmptyIfClaimIssNotFound() {
// arrange
Expand All @@ -111,7 +111,7 @@ void getTenantFromClaimsSetUsingClaimIssReturnsEmptyIfClaimIssNotFound() {
assertTrue(tenant.isEmpty());
}

@DisplayName("getTenantFromClaimsSetUsingClaimIss() returns empty if claim iss is found but value is null")
@DisplayName("Should return empty if claim iss is found but value is null after calling getTenantFromClaimsSetUsingClaimIss()")
@Test
void getTenantFromClaimsSetUsingClaimIssReturnsEmptyIfClaimIssFoundButValueIsNull() throws ParseException {
// arrange
Expand All @@ -125,7 +125,7 @@ void getTenantFromClaimsSetUsingClaimIssReturnsEmptyIfClaimIssFoundButValueIsNul
assertTrue(tenant.isEmpty());
}

@DisplayName("getTenantFromClaimsSetUsingClaimIss() returns empty if parsing of claim failed")
@DisplayName("Should return empty if parsing of claim failed after calling getTenantFromClaimsSetUsingClaimIss()")
@Test
void getTenantFromClaimsSetUsingClaimIssReturnsEmptyIfParsingOfClaimFailed() throws ParseException {
// arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void setUp() {
helper = new TokenHelper();
}

@DisplayName("getTenantFromTokenUsingClaimTenant() returns tenant if claim tenant is found")
@DisplayName("Should return tenant if claim tenant is found after calling getTenantFromTokenUsingClaimTenant()")
@Test
void getTenantFromTokenUsingClaimTenantReturnsTenantIfClaimTenantFound() {
// arrange
Expand All @@ -41,7 +41,7 @@ void getTenantFromTokenUsingClaimTenantReturnsTenantIfClaimTenantFound() {
assertEquals(PITC, tenant.get());
}

@DisplayName("getTenantFromTokenUsingClaimTenant() returns empty if claim tenant not found")
@DisplayName("Should return empty if claim tenant is not found after calling getTenantFromTokenUsingClaimTenant()")
@Test
void getTenantFromTokenUsingClaimTenantReturnsEmptyIfClaimTenantNotFound() {
// arrange
Expand All @@ -54,7 +54,7 @@ void getTenantFromTokenUsingClaimTenantReturnsEmptyIfClaimTenantNotFound() {
assertTrue(tenant.isEmpty());
}

@DisplayName("getTenantFromTokenUsingClaimTenant() returns empty if claim tenant is found but value is null")
@DisplayName("Should return empty if claim tenant is found but value is null after calling getTenantFromTokenUsingClaimTenant()")
@Test
void getTenantFromTokenUsingClaimTenantReturnsEmptyIfClaimTenantFoundButValueIsNull() {
// arrange
Expand Down Expand Up @@ -83,7 +83,7 @@ void getTenantFromTokenUsingClaimIssReturnsTenantIfClaimIssFound(String issUrl)
assertEquals(PITC, tenant.get());
}

@DisplayName("getTenantFromTokenUsingClaimIss() returns empty if claim iss is not found")
@DisplayName("Should return empty if claim iss is not found after calling getTenantFromTokenUsingClaimIss()")
@Test
void getTenantFromTokenUsingClaimIssReturnsEmptyIfClaimIssNotFound() {
// arrange
Expand All @@ -96,7 +96,7 @@ void getTenantFromTokenUsingClaimIssReturnsEmptyIfClaimIssNotFound() {
assertTrue(tenant.isEmpty());
}

@DisplayName("getTenantFromTokenUsingClaimIss() returns empty if claim iss is found but value is null")
@DisplayName("Should return empty if claim iss is found but value is null after calling getTenantFromTokenUsingClaimIss()")
@Test
void getTenantFromTokenUsingClaimIssReturnsEmptyIfClaimIssFoundButValueIsNull() {
// arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void extractTenantFromIssUrlReturnsTenantIfUrlContainSlash(String issUrl) {
assertEquals(PITC, tenantFromIssUrl.get());
}

@DisplayName("extractTenantFromIssUrl() returns input url if url does not contain slash")
@DisplayName("Should return a input url if the url does not contain a slash after calling extractTenantFromIssUrl()")
@Test
void extractTenantFromIssUrlReturnsInputIfUrlNotContainSlash() {
// arrange
Expand All @@ -40,7 +40,7 @@ void extractTenantFromIssUrlReturnsInputIfUrlNotContainSlash() {
assertEquals(issUrl, tenantFromIssUrl.get());
}

@DisplayName("extractTenantFromIssUrl() returns empty if url is null")
@DisplayName("Should return empty if the url is null after calling extractTenantFromIssUrl()")
@Test
void extractTenantFromIssUrlReturnsEmptyIfUrlIsNull() {
// arrange
Expand Down

0 comments on commit 613f522

Please sign in to comment.