Skip to content

Commit 1280c45

Browse files
refactor: remove MacOSHelper and its usage from the codebase
Signed-off-by: SebastienDegodez <sebastien.degodez@gmail.com>
1 parent 839a8d6 commit 1280c45

File tree

5 files changed

+1
-109
lines changed

5 files changed

+1
-109
lines changed

src/Microcks.Testcontainers/Helpers/MacOSHelper.cs

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/Microcks.Testcontainers/MicrocksBuilder.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ private void ContainerStarted(MicrocksContainer container)
135135
protected override MicrocksBuilder Init()
136136
{
137137
return base.Init()
138-
.WithEnvironment(MacOSHelper.GetJavaOptions())
139138
.WithImage(MicrocksImage)
140139
.WithPortBinding(MicrocksHttpPort, true)
141140
.WithPortBinding(MicrocksGrpcPort, true)

src/Microcks.Testcontainers/MicrocksContainerEnsemble.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public MicrocksContainerEnsemble(INetwork network, string microcksImage)
8585
.WithNetworkAliases("microcks")
8686
.WithExposedPort(MicrocksBuilder.MicrocksHttpPort)
8787
.WithExposedPort(MicrocksBuilder.MicrocksGrpcPort)
88-
.WithEnvironment(MacOSHelper.GetJavaOptions())
88+
.WithImage(this._microcksImage)
8989
.WithEnvironment("POSTMAN_RUNNER_URL", "http://postman:3000")
9090
.WithEnvironment("TEST_CALLBACK_URL", "http://microcks:" + MicrocksBuilder.MicrocksHttpPort)
9191
.WithEnvironment("ASYNC_MINION_URL", "http://microcks-async-minion:" + MicrocksAsyncMinionBuilder.MicrocksAsyncMinionHttpPort);
@@ -216,7 +216,6 @@ public MicrocksContainerEnsemble WithAsyncFeature()
216216
}
217217

218218
this._asyncMinionBuilder = new MicrocksAsyncMinionBuilder(this._network)
219-
.WithEnvironment(MacOSHelper.GetJavaOptions())
220219
.WithImage(image);
221220

222221
if (this._debugLogLevelEnabled)

tests/Microcks.Testcontainers.Tests/Helpers/MacOSHelperTests.cs

Lines changed: 0 additions & 51 deletions
This file was deleted.

tests/Microcks.Testcontainers.Tests/MicrocksContractTestingFunctionalityWithOAuth2Tests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public MicrocksContractTestingFunctionalityWithOAuth2Tests(MicrocksContractTesti
3838
_fixture = fixture;
3939
var network = _fixture.Network;
4040
_keycloak = new KeycloakBuilder("quay.io/keycloak/keycloak:26.0.0")
41-
.WithEnvironment(MacOSHelper.GetJavaOptions("JAVA_OPTS_APPEND"))
4241
.WithNetwork(network)
4342
.WithNetworkAliases("keycloak")
4443
.WithCommand("--import-realm")

0 commit comments

Comments
 (0)