diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-05-29 14:41:19 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-05-29 14:41:19 +0200 |
| commit | 7126ed717d01abad07e86150665f00154db27770 (patch) | |
| tree | 2b083164bdbea2a4bae61174bae17d9892e687a5 /eaaf_core_utils/src/test | |
| parent | 9b6167a5f1fd3385b344b3a8c3b5d27d033d99d4 (diff) | |
| download | EAAF-Components-7126ed717d01abad07e86150665f00154db27770.tar.gz EAAF-Components-7126ed717d01abad07e86150665f00154db27770.tar.bz2 EAAF-Components-7126ed717d01abad07e86150665f00154db27770.zip | |
update HttpClientBuilder factory to add 'ServiceUnavailableRetryStrategy' injection
fix broken jUnit test
Diffstat (limited to 'eaaf_core_utils/src/test')
| -rw-r--r-- | eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java | 5 | ||||
| -rw-r--r-- | eaaf_core_utils/src/test/resources/data/config1.properties | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java index 63ac38a3..c35ef604 100644 --- a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java +++ b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java @@ -553,13 +553,16 @@ public class HttpClientFactoryTest { keyStoreFactory.buildNewKeyStore(clientConfig.getKeyStoreConfig()); X509Certificate clientRootCert = (X509Certificate) sslClientKeyStore.getFirst() .getCertificateChain(clientConfig.getSslKeyAlias())[1]; - + X509Certificate clientEeCert = (X509Certificate) sslClientKeyStore.getFirst() + .getCertificateChain(clientConfig.getSslKeyAlias())[0]; + final String localhost = InetAddress.getByName("localhost").getCanonicalHostName(); final HeldCertificate localhostCertificate = new HeldCertificate.Builder() .addSubjectAlternativeName(localhost) .build(); final HandshakeCertificates serverCertificates = new HandshakeCertificates.Builder() .addTrustedCertificate(clientRootCert) + .addTrustedCertificate(clientEeCert) .heldCertificate(localhostCertificate) .build(); mockWebServer = new MockWebServer(); diff --git a/eaaf_core_utils/src/test/resources/data/config1.properties b/eaaf_core_utils/src/test/resources/data/config1.properties index 93729b15..6192002e 100644 --- a/eaaf_core_utils/src/test/resources/data/config1.properties +++ b/eaaf_core_utils/src/test/resources/data/config1.properties @@ -4,6 +4,6 @@ security.hsmfacade.trustedsslcert=src/test/resources/data/hsm_facade_trust_root. security.hsmfacade.username=authhandler-junit security.hsmfacade.password=supersecret123 -client.http.connection.timeout.socket=1 -client.http.connection.timeout.connection=1 -client.http.connection.timeout.request=1
\ No newline at end of file +client.http.connection.timeout.socket=2 +client.http.connection.timeout.connection=2 +client.http.connection.timeout.request=2
\ No newline at end of file |