Skip to content

Fix: Remove redundant test setup condition #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
newtork merged 1 commit into from
Apr 24, 2026
Merged

Fix: Remove redundant test setup condition #1157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 0 additions & 37 deletions ...uth/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2IntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,17 @@
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.util.List;

import javax.annotation.Nullable;

import org.apache.http.HttpHeaders;
import org.apache.http.impl.client.HttpClientBuilder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import com.sap.cloud.environment.servicebinding.api.ServiceBinding;
import com.sap.cloud.environment.servicebinding.api.ServiceIdentifier;
import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
import com.sap.cloud.sdk.cloudplatform.connectivity.exception.HttpClientInstantiationException;
import com.sap.cloud.sdk.cloudplatform.tenant.DefaultTenant;
import com.sap.cloud.sdk.cloudplatform.tenant.TenantAccessor;
import com.sap.cloud.security.client.HttpClientFactory;
import com.sap.cloud.security.config.ClientIdentity;
import com.sap.cloud.security.xsuaa.client.OAuth2ServiceException;

Expand All @@ -59,35 +51,6 @@ class OAuth2IntegrationTest
}
""";

private List<HttpClientFactory> oldFactories = List.of();

@BeforeEach
void mockClientFactory()
{
oldFactories = HttpClientFactory.services;
HttpClientFactory.services.clear();

// `useSystemProperties` is needed for the WireMock proxying
HttpClientFactory.services.add(identity -> HttpClientBuilder.create().useSystemProperties().build());
HttpClientAccessor.setHttpClientFactory(new DefaultHttpClientFactory()
{
@Override
protected HttpClientBuilder getHttpClientBuilder( @Nullable HttpDestinationProperties destination )
throws HttpClientInstantiationException
{
return super.getHttpClientBuilder(destination).useSystemProperties();
}
});
}

@AfterEach
void restoreClientFactories()
{
HttpClientFactory.services.clear();
HttpClientFactory.services.addAll(oldFactories);
HttpClientAccessor.setHttpClientFactory(null);
}

@Test
void testIasTokenFlow()
{
Expand Down
Loading