Skip to content

Commit

Permalink
Removing AbstractPortalConfigSource and Friends
Browse files Browse the repository at this point in the history
  • Loading branch information
@cuioss
cuioss committed Jul 31, 2024
1 parent 83bbc52 commit cadf0c9
Show file tree
Hide file tree
Showing 50 changed files with 251 additions and 1,465 deletions.
25 changes: 9 additions & 16 deletions ...mock/src/test/java/de/cuioss/portal/authentication/mock/MockAuthenticationFacadeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,22 @@
*/
package de.cuioss.portal.authentication.mock;

import static de.cuioss.test.generator.Generators.letterStrings;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import jakarta.inject.Inject;

import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.jboss.weld.junit5.auto.EnableAutoWeld;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import de.cuioss.portal.authentication.facade.PortalAuthenticationFacade;
import de.cuioss.portal.configuration.PortalConfigurationSource;
import de.cuioss.portal.core.test.junit5.EnablePortalConfiguration;
import de.cuioss.portal.core.test.mocks.configuration.PortalTestConfiguration;
import de.cuioss.test.jsf.mocks.CuiMockHttpServletRequest;
import de.cuioss.test.valueobjects.junit5.contracts.ShouldBeNotNull;
import de.cuioss.uimodel.application.LoginCredentials;
import de.cuioss.uimodel.result.ResultState;
import jakarta.inject.Inject;
import lombok.Getter;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.jboss.weld.junit5.auto.EnableAutoWeld;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import static de.cuioss.test.generator.Generators.letterStrings;
import static org.junit.jupiter.api.Assertions.*;

@EnableAutoWeld
@EnablePortalConfiguration
Expand All @@ -45,7 +39,6 @@ class MockAuthenticationFacadeTest implements ShouldBeNotNull<MockAuthentication
private MockHttpServletRequest servletRequest;

@Inject
@PortalConfigurationSource
private PortalTestConfiguration configuration;

@BeforeEach
Expand Down Expand Up @@ -105,7 +98,7 @@ void shouldLoginWithUsernameAndPassword() {
var name = letterStrings(3, 8).next();
var password = letterStrings(3, 8).next();
var result = underTest.login(servletRequest,
LoginCredentials.builder().username(name).password(password).build());
LoginCredentials.builder().username(name).password(password).build());
assertEquals(ResultState.ERROR, result.getState());
// Incomplete Credentials
result = underTest.login(servletRequest, LoginCredentials.builder().username(name).build());
Expand Down
6 changes: 0 additions & 6 deletions ...tication-oauth/src/test/java/de/cuioss/portal/authentication/oauth/DefaultConfigTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
*/
package de.cuioss.portal.authentication.oauth;

import de.cuioss.portal.configuration.FileConfigurationSource;
import de.cuioss.portal.core.test.tests.configuration.AbstractConfigurationKeyVerifierTest;
import de.cuioss.portal.core.test.tests.configuration.PropertiesDefaultConfigSource;
import lombok.Getter;
import org.eclipse.microprofile.config.spi.ConfigSource;

import java.util.List;
Expand All @@ -28,9 +25,6 @@

class DefaultConfigTest extends AbstractConfigurationKeyVerifierTest {

@Getter
private final FileConfigurationSource underTest = new PropertiesDefaultConfigSource();

@Override
public Class<?> getKeyHolder() {
return OAuthConfigKeys.class;
Expand Down
53 changes: 21 additions & 32 deletions ...t/java/de/cuioss/portal/authentication/oauth/impl/Oauth2AuthenticationFacadeImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,11 @@
*/
package de.cuioss.portal.authentication.oauth.impl;

import static de.cuioss.test.generator.Generators.letterStrings;
import static de.cuioss.tools.collect.CollectionLiterals.mutableList;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;

import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;

import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.jboss.resteasy.cdi.ResteasyCdiExtension;
import org.jboss.weld.junit5.auto.AddBeanClasses;
import org.jboss.weld.junit5.auto.AddExtensions;
import org.jboss.weld.junit5.auto.EnableAutoWeld;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import de.cuioss.portal.authentication.facade.PortalAuthenticationFacade;
import de.cuioss.portal.authentication.model.BaseAuthenticatedUserInfo;
import de.cuioss.portal.authentication.oauth.LoginPagePath;
import de.cuioss.portal.authentication.oauth.OauthAuthenticationException;
import de.cuioss.portal.authentication.oauth.Token;
import de.cuioss.portal.configuration.PortalConfigurationSource;
import de.cuioss.portal.core.test.junit5.EnablePortalConfiguration;
import de.cuioss.portal.core.test.junit5.mockwebserver.EnableMockWebServer;
import de.cuioss.portal.core.test.junit5.mockwebserver.MockWebServerHolder;
Expand All @@ -60,9 +29,30 @@
import de.cuioss.tools.collect.CollectionLiterals;
import de.cuioss.tools.net.UrlParameter;
import de.cuioss.tools.string.MoreStrings;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
import lombok.Getter;
import lombok.Setter;
import mockwebserver3.MockWebServer;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.jboss.resteasy.cdi.ResteasyCdiExtension;
import org.jboss.weld.junit5.auto.AddBeanClasses;
import org.jboss.weld.junit5.auto.AddExtensions;
import org.jboss.weld.junit5.auto.EnableAutoWeld;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;

import static de.cuioss.test.generator.Generators.letterStrings;
import static de.cuioss.tools.collect.CollectionLiterals.mutableList;
import static org.junit.jupiter.api.Assertions.*;

@EnableMockWebServer
@EnableAutoWeld
Expand All @@ -83,7 +73,6 @@ class Oauth2AuthenticationFacadeImplTest
private final String loginUrl = "login.jsf";

@Inject
@PortalConfigurationSource
private PortalTestConfiguration configuration;

@Inject
Expand Down
6 changes: 1 addition & 5 deletions .../de/cuioss/portal/authentication/oauth/impl/Oauth2DiscoveryConfigurationProducerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package de.cuioss.portal.authentication.oauth.impl;

import de.cuioss.portal.authentication.oauth.OAuthConfigKeys;
import de.cuioss.portal.configuration.PortalConfigurationSource;
import de.cuioss.portal.core.test.junit5.EnablePortalConfiguration;
import de.cuioss.portal.core.test.junit5.mockwebserver.EnableMockWebServer;
import de.cuioss.portal.core.test.junit5.mockwebserver.MockWebServerHolder;
Expand All @@ -34,9 +33,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.*;

@EnableAutoWeld
@EnablePortalConfiguration
Expand All @@ -53,7 +50,6 @@ class Oauth2DiscoveryConfigurationProducerTest
private Oauth2DiscoveryConfigurationProducer underTest;

@Inject
@PortalConfigurationSource
private PortalTestConfiguration configuration;

@Getter
Expand Down
40 changes: 16 additions & 24 deletions ...oauth/src/test/java/de/cuioss/portal/authentication/oauth/impl/Oauth2ServiceImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,8 @@
*/
package de.cuioss.portal.authentication.oauth.impl;

import static de.cuioss.test.generator.Generators.letterStrings;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.math.BigInteger;
import java.util.Random;

import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.MediaType;

import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.jboss.resteasy.cdi.ResteasyCdiExtension;
import org.jboss.weld.junit5.auto.AddBeanClasses;
import org.jboss.weld.junit5.auto.AddExtensions;
import org.jboss.weld.junit5.auto.EnableAutoWeld;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import de.cuioss.portal.authentication.oauth.OAuthConfigKeys;
import de.cuioss.portal.authentication.oauth.Oauth2AuthenticationFacade;
import de.cuioss.portal.configuration.PortalConfigurationSource;
import de.cuioss.portal.core.test.junit5.EnablePortalConfiguration;
import de.cuioss.portal.core.test.junit5.mockwebserver.EnableMockWebServer;
import de.cuioss.portal.core.test.junit5.mockwebserver.MockWebServerHolder;
Expand All @@ -48,9 +25,25 @@
import de.cuioss.test.jsf.mocks.CuiMockHttpServletRequest;
import de.cuioss.test.valueobjects.junit5.contracts.ShouldHandleObjectContracts;
import de.cuioss.tools.net.UrlParameter;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.MediaType;
import lombok.Getter;
import lombok.Setter;
import mockwebserver3.MockWebServer;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.jboss.resteasy.cdi.ResteasyCdiExtension;
import org.jboss.weld.junit5.auto.AddBeanClasses;
import org.jboss.weld.junit5.auto.AddExtensions;
import org.jboss.weld.junit5.auto.EnableAutoWeld;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.math.BigInteger;
import java.util.Random;

import static de.cuioss.test.generator.Generators.letterStrings;
import static org.junit.jupiter.api.Assertions.*;

@EnableAutoWeld
@EnablePortalConfiguration(configuration = "authentication.oidc.validation.enabled:false")
Expand All @@ -67,7 +60,6 @@ class Oauth2ServiceImplTest implements ShouldHandleObjectContracts<Oauth2Service
private Oauth2ServiceImpl underTest;

@Inject
@PortalConfigurationSource
private PortalTestConfiguration configuration;

@Produces
Expand Down
38 changes: 0 additions & 38 deletions ...l-configuration-api/src/main/java/de/cuioss/portal/configuration/ConfigurationSource.java
View file

This file was deleted.

48 changes: 0 additions & 48 deletions ...-configuration-api/src/main/java/de/cuioss/portal/configuration/ConfigurationStorage.java
View file

This file was deleted.

36 changes: 0 additions & 36 deletions ...nfiguration-api/src/main/java/de/cuioss/portal/configuration/FileConfigurationSource.java
View file

This file was deleted.

Loading

0 comments on commit cadf0c9

Please sign in to comment.