From ab59a11bff27717c6cd84c3300928a34260c1340 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Tue, 12 Sep 2023 12:48:17 -0400 Subject: [PATCH] Fix tests for checkPeerName --- .../solr/client/solrj/impl/Http2SolrClientTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java index 263f9aa93e1..3657906ec41 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java @@ -769,25 +769,25 @@ public void testGetDefaultSslContextFactory() { System.clearProperty("javax.net.ssl.keyStoreType"); System.clearProperty("javax.net.ssl.trustStoreType"); - System.setProperty("solr.jetty.ssl.verifyClientHostName", "true"); + System.setProperty("solr.ssl.checkPeerName", "true"); System.setProperty("javax.net.ssl.keyStoreType", "foo"); System.setProperty("javax.net.ssl.trustStoreType", "bar"); SslContextFactory.Client sslContextFactory2 = Http2SolrClient.getDefaultSslContextFactory(); assertEquals("HTTPS", sslContextFactory2.getEndpointIdentificationAlgorithm()); assertEquals("foo", sslContextFactory2.getKeyStoreType()); assertEquals("bar", sslContextFactory2.getTrustStoreType()); - System.clearProperty("solr.jetty.ssl.verifyClientHostName"); + System.clearProperty("solr.ssl.checkPeerName"); System.clearProperty("javax.net.ssl.keyStoreType"); System.clearProperty("javax.net.ssl.trustStoreType"); - System.setProperty("solr.jetty.ssl.verifyClientHostName", "false"); + System.setProperty("solr.ssl.checkPeerName", "false"); System.setProperty("javax.net.ssl.keyStoreType", "foo"); System.setProperty("javax.net.ssl.trustStoreType", "bar"); SslContextFactory.Client sslContextFactory3 = Http2SolrClient.getDefaultSslContextFactory(); assertNull(sslContextFactory3.getEndpointIdentificationAlgorithm()); assertEquals("foo", sslContextFactory3.getKeyStoreType()); assertEquals("bar", sslContextFactory3.getTrustStoreType()); - System.clearProperty("solr.jetty.ssl.verifyClientHostName"); + System.clearProperty("solr.ssl.checkPeerName"); System.clearProperty("javax.net.ssl.keyStoreType"); System.clearProperty("javax.net.ssl.trustStoreType"); }