You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/08/15 20:25:55 UTC
[2/2] logging-log4j2 git commit: Add sanity check and util method for
reuse in other tests.
Add sanity check and util method for reuse in other tests.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1e3debc0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1e3debc0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1e3debc0
Branch: refs/heads/master
Commit: 1e3debc08db0377580db2b09cd97f3885b3cd82a
Parents: 26cdf1c
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Aug 15 14:25:51 2017 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Aug 15 14:25:51 2017 -0600
----------------------------------------------------------------------
.../log4j/core/net/ssl/SslConfigurationTest.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1e3debc0/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
index b4e10c4..f2c4619 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
@@ -24,6 +24,7 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
public class SslConfigurationTest {
@@ -31,6 +32,23 @@ public class SslConfigurationTest {
private static final String TLS_TEST_HOST = "login.yahoo.com";
private static final int TLS_TEST_PORT = 443;
+ public static SslConfiguration createTestSslConfiguration() throws StoreConfigurationException {
+ final KeyStoreConfiguration ksc = new KeyStoreConfiguration(TestConstants.KEYSTORE_FILE,
+ TestConstants.KEYSTORE_PWD, TestConstants.KEYSTORE_TYPE, null);
+ final TrustStoreConfiguration tsc = new TrustStoreConfiguration(TestConstants.TRUSTSTORE_FILE,
+ TestConstants.TRUSTSTORE_PWD, null, null);
+ return SslConfiguration.createSSLConfiguration(null, ksc, tsc);
+ }
+
+ @Test
+ public void testGettersFromScratch() throws StoreConfigurationException {
+ Assert.assertNotNull(createTestSslConfiguration().getProtocol());
+ Assert.assertNotNull(createTestSslConfiguration().getKeyStoreConfig());
+ Assert.assertNotNull(createTestSslConfiguration().getSslContext());
+ Assert.assertNotNull(createTestSslConfiguration().getSslSocketFactory());
+ Assert.assertNotNull(createTestSslConfiguration().getTrustStoreConfig());
+ }
+
@Test
public void equals() {
Assert.assertEquals(SslConfiguration.createSSLConfiguration(null, null, null), SslConfiguration.createSSLConfiguration(null, null, null));