Skip to content
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

extend TestClientUtil with parameter #219

Merged
merged 5 commits into from
Nov 18, 2024
Merged

extend TestClientUtil with parameter #219

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9862fe3
extend TestClientUtil
jannast Nov 12, 2024
27c81d7
fix integration tests
jannast Nov 13, 2024
40ce46c
implement review findings - renaming
jannast Nov 13, 2024
e1343c2
implement review findings
jannast Nov 14, 2024
e71a31d
Merge branch 'main' into extend_test_client
maximilianpilz Nov 15, 2024
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
1 change: 1 addition & 0 deletions sdccc/src/main/java/com/draeger/medical/sdccc/configuration/TestSuiteConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public final class TestSuiteConfig {
public static final String TEST_EXECUTION_LOGGING = SDCCC + "TestExecutionLogging";
public static final String SUMMARIZE_MESSAGE_ENCODING_ERRORS = SDCCC + "SummarizeMessageEncodingErrors";
public static final String ENABLE_MESSAGE_ENCODING_CHECK = SDCCC + "EnableMessageEncodingCheck";
public static final String OVER_RIDE = "Override";
maximilianpilz marked this conversation as resolved.
Show resolved Hide resolved

/*
* TLS configuration
Expand Down
7 changes: 5 additions & 2 deletions sdccc/src/main/java/com/draeger/medical/sdccc/sdcri/testclient/TestClientUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class TestClientUtil {
* Values from 1 to 255 are valid.
* @param enabledTlsProtocols TLS protocol versions to be enabled
* @param enabledCiphers ciphers to be enabled
* @param override overrides for AbstractConfigurationModule
*/
@Inject
public TestClientUtil(
Expand All @@ -70,7 +71,8 @@ public TestClientUtil(
final LocalAddressResolver localAddressResolver,
@Named(TestSuiteConfig.NETWORK_MULTICAST_TTL) final Long multicastTTL,
@Named(TestSuiteConfig.TLS_ENABLED_PROTOCOLS) final String[] enabledTlsProtocols,
@Named(TestSuiteConfig.TLS_ENABLED_CIPHERS) final String[] enabledCiphers) {
@Named(TestSuiteConfig.TLS_ENABLED_CIPHERS) final String[] enabledCiphers,
@Named(TestSuiteConfig.OVER_RIDE) final AbstractConfigurationModule override) {
maximilianpilz marked this conversation as resolved.
Show resolved Hide resolved

injector = createClientInjector(List.of(
new AbstractConfigurationModule() {
Expand Down Expand Up @@ -98,7 +100,8 @@ protected void configure() {
bind(TestRunObserver.class).toInstance(testRunObserver);
bind(LocalAddressResolver.class).toInstance(localAddressResolver);
}
}));
},
override));
}

/**
Expand Down
4 changes: 4 additions & 0 deletions sdccc/src/test/java/it/com/draeger/medical/sdccc/TestSuiteIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,10 @@ protected void defaultConfigure() {

bind(Identifiers.DIRECT_TEST_IDENTIFIER_FAILING, Boolean.class, failingTests);
bind(Identifiers.INVARIANT_TEST_IDENTIFIER_FAILING, Boolean.class, failingTests);
bind(TestSuiteConfig.OVER_RIDE, AbstractConfigurationModule.class, new AbstractConfigurationModule() {
@Override
protected void defaultConfigure() {}
});
}
}
}
Loading