Compare commits

...

1 Commits

Author SHA1 Message Date
Roman Acevedo
c3e49125f4 test: cleaner logs to debug why BasicAuthServiceTest.isBasicAuthInitialized is flaky 2025-11-07 11:34:19 +01:00

View File

@@ -18,6 +18,7 @@ import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
@@ -54,15 +55,20 @@ class BasicAuthServiceTest {
@Inject @Inject
private InstanceService instanceService; private InstanceService instanceService;
@BeforeEach
void setUp() {
stubFor(any(urlMatching(".*"))
.willReturn(aResponse()
.withStatus(404)
.withBody("No stub matched")));
}
@AfterEach @AfterEach
void stopApp() { void afterEach() {
stubFor(
post(urlEqualTo("/v1/reports/events"))
.willReturn(aResponse().withStatus(200))
);
deleteSetting(); deleteSetting();
} }
@Test @Test
void isBasicAuthInitialized(){ void isBasicAuthInitialized(){
deleteSetting(); deleteSetting();
@@ -70,22 +76,22 @@ class BasicAuthServiceTest {
new BasicAuthConfiguration(USER_NAME, PASSWORD, null, null) new BasicAuthConfiguration(USER_NAME, PASSWORD, null, null)
).config; ).config;
basicAuthService.init(); basicAuthService.init();
assertTrue(basicAuthService.isBasicAuthInitialized()); assertThat(basicAuthService.isBasicAuthInitialized()).as("isBasicAuthInitialized after init with basic auth configured with user and password").isTrue();
deleteSetting(); deleteSetting();
assertFalse(basicAuthService.isBasicAuthInitialized()); assertThat(basicAuthService.isBasicAuthInitialized()).as("not isBasicAuthInitialized when there is no settings").isFalse();
basicAuthService.basicAuthConfiguration = new ConfigWrapper( basicAuthService.basicAuthConfiguration = new ConfigWrapper(
new BasicAuthConfiguration(USER_NAME, null, null, null) new BasicAuthConfiguration(USER_NAME, null, null, null)
).config; ).config;
basicAuthService.init(); basicAuthService.init();
assertFalse(basicAuthService.isBasicAuthInitialized()); assertThat(basicAuthService.isBasicAuthInitialized()).as("not isBasicAuthInitialized when there is settings but only user name").isFalse();
basicAuthService.basicAuthConfiguration = new ConfigWrapper( basicAuthService.basicAuthConfiguration = new ConfigWrapper(
new BasicAuthConfiguration(null, null, null, null) new BasicAuthConfiguration(null, null, null, null)
).config; ).config;
basicAuthService.init(); basicAuthService.init();
assertFalse(basicAuthService.isBasicAuthInitialized()); assertThat(basicAuthService.isBasicAuthInitialized()).as("not isBasicAuthInitialized when there is settings but no user and password").isFalse();
} }
@Test @Test
@@ -208,6 +214,11 @@ class BasicAuthServiceTest {
@Test @Test
void initFromYamlConfig() throws TimeoutException { void initFromYamlConfig() throws TimeoutException {
stubFor(
post(urlEqualTo("/v1/reports/events"))
.willReturn(aResponse().withStatus(200))
);
basicAuthService.basicAuthConfiguration = basicAuthConfiguration; basicAuthService.basicAuthConfiguration = basicAuthConfiguration;
basicAuthService.init(); basicAuthService.init();
assertConfigurationMatchesApplicationYaml(); assertConfigurationMatchesApplicationYaml();
@@ -237,6 +248,11 @@ class BasicAuthServiceTest {
@Test @Test
void saveValidAuthConfig() throws TimeoutException { void saveValidAuthConfig() throws TimeoutException {
stubFor(
post(urlEqualTo("/v1/reports/events"))
.willReturn(aResponse().withStatus(200))
);
basicAuthService.save(new BasicAuthCredentials(null, USER_NAME, PASSWORD)); basicAuthService.save(new BasicAuthCredentials(null, USER_NAME, PASSWORD));
awaitOssAuthEventApiCall(USER_NAME); awaitOssAuthEventApiCall(USER_NAME);
} }