This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new c88a546125 Use `apache.org` for testing SSL config (#2467)
c88a546125 is described below
commit c88a546125f80ce840e96008ae6b96050ff24a7e
Author: Volkan Yazıcı <vol...@yazi.ci>
AuthorDate: Fri Apr 12 13:25:10 2024 +0200
Use `apache.org` for testing SSL config (#2467)
---
.../log4j/core/net/ssl/SslConfigurationTest.java | 40 ++++++----------------
1 file changed, 11 insertions(+), 29 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
index 59f60af37e..d29ac431a9 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
@@ -27,21 +27,12 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import org.junit.jupiter.api.Test;
-public class SslConfigurationTest {
+class SslConfigurationTest {
- private static final String TLS_TEST_HOST = "login.yahoo.com";
+ private static final String TLS_TEST_HOST = "apache.org";
private static final int TLS_TEST_PORT = 443;
- @SuppressWarnings("deprecation")
- public static SslConfiguration
createTestSslConfigurationResourcesDeprecated() throws
StoreConfigurationException {
- final KeyStoreConfiguration ksc = new KeyStoreConfiguration(
- TestConstants.KEYSTORE_FILE_RESOURCE,
TestConstants.KEYSTORE_PWD(), TestConstants.KEYSTORE_TYPE, null);
- final TrustStoreConfiguration tsc = new TrustStoreConfiguration(
- TestConstants.TRUSTSTORE_FILE_RESOURCE,
TestConstants.TRUSTSTORE_PWD(), null, null);
- return SslConfiguration.createSSLConfiguration(null, ksc, tsc);
- }
-
- public static SslConfiguration createTestSslConfigurationResources()
throws StoreConfigurationException {
+ private static SslConfiguration createTestSslConfigurationResources()
throws StoreConfigurationException {
final KeyStoreConfiguration ksc = new KeyStoreConfiguration(
TestConstants.KEYSTORE_FILE_RESOURCE,
new MemoryPasswordProvider(TestConstants.KEYSTORE_PWD()),
@@ -55,16 +46,7 @@ public class SslConfigurationTest {
return SslConfiguration.createSSLConfiguration(null, ksc, tsc);
}
- @SuppressWarnings("deprecation")
- public static SslConfiguration createTestSslConfigurationFilesDeprecated()
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);
- }
-
- public static SslConfiguration createTestSslConfigurationFiles() throws
StoreConfigurationException {
+ private static SslConfiguration createTestSslConfigurationFiles() throws
StoreConfigurationException {
final KeyStoreConfiguration ksc = new KeyStoreConfiguration(
TestConstants.KEYSTORE_FILE,
new MemoryPasswordProvider(TestConstants.KEYSTORE_PWD()),
@@ -76,7 +58,7 @@ public class SslConfigurationTest {
}
@Test
- public void testGettersFromScratchFiles() throws
StoreConfigurationException {
+ void testGettersFromScratchFiles() throws StoreConfigurationException {
assertNotNull(createTestSslConfigurationFiles().getProtocol());
assertNotNull(createTestSslConfigurationFiles().getKeyStoreConfig());
assertNotNull(createTestSslConfigurationFiles().getSslContext());
@@ -85,7 +67,7 @@ public class SslConfigurationTest {
}
@Test
- public void testGettersFromScratchResources() throws
StoreConfigurationException {
+ void testGettersFromScratchResources() throws StoreConfigurationException {
assertNotNull(createTestSslConfigurationResources().getProtocol());
assertNotNull(createTestSslConfigurationResources().getKeyStoreConfig());
assertNotNull(createTestSslConfigurationResources().getSslContext());
@@ -94,21 +76,21 @@ public class SslConfigurationTest {
}
@Test
- public void equals() {
+ void testEquals() {
assertEquals(
SslConfiguration.createSSLConfiguration(null, null, null),
SslConfiguration.createSSLConfiguration(null, null, null));
}
@Test
- public void emptyConfigurationDoesntCauseNullSSLSocketFactory() {
+ void emptyConfigurationDoesNotCauseNullSSLSocketFactory() {
final SslConfiguration sc =
SslConfiguration.createSSLConfiguration(null, null, null);
final SSLSocketFactory factory = sc.getSslSocketFactory();
assertNotNull(factory);
}
@Test
- public void emptyConfigurationHasDefaultTrustStore() throws IOException {
+ void emptyConfigurationHasDefaultTrustStore() throws IOException {
final SslConfiguration sc =
SslConfiguration.createSSLConfiguration(null, null, null);
final SSLSocketFactory factory = sc.getSslSocketFactory();
try {
@@ -121,7 +103,7 @@ public class SslConfigurationTest {
}
@Test
- public void connectionFailsWithoutValidServerCertificate() throws
IOException, StoreConfigurationException {
+ void connectionFailsWithoutValidServerCertificate() throws IOException,
StoreConfigurationException {
final TrustStoreConfiguration tsc = new TrustStoreConfiguration(
TestConstants.TRUSTSTORE_FILE, new
MemoryPasswordProvider(TestConstants.NULL_PWD), null, null);
final SslConfiguration sc =
SslConfiguration.createSSLConfiguration(null, null, tsc);
@@ -138,7 +120,7 @@ public class SslConfigurationTest {
}
@Test
- public void loadKeyStoreWithoutPassword() throws
StoreConfigurationException {
+ void loadKeyStoreWithoutPassword() throws StoreConfigurationException {
final KeyStoreConfiguration ksc = new KeyStoreConfiguration(
TestConstants.KEYSTORE_FILE, new
MemoryPasswordProvider(TestConstants.NULL_PWD), null, null);
final SslConfiguration sslConf =
SslConfiguration.createSSLConfiguration(null, ksc, null);
