Skip to content

Commit eef96fb

Browse files
committed
Add back muted test
1 parent 53a1601 commit eef96fb

File tree

1 file changed

+32
-20
lines changed

1 file changed

+32
-20
lines changed

driver/src/test/java/org/neo4j/driver/v1/integration/TLSSocketChannelIT.java

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,11 @@
5151
import static org.junit.Assert.assertEquals;
5252
import static org.junit.Assert.assertFalse;
5353
import static org.junit.Assert.assertTrue;
54+
import static org.mockito.Matchers.anyString;
5455
import static org.mockito.Mockito.atLeastOnce;
5556
import static org.mockito.Mockito.mock;
5657
import static org.mockito.Mockito.verify;
58+
import static org.mockito.Mockito.when;
5759
import static org.neo4j.driver.internal.security.TrustOnFirstUseTrustManager.fingerprint;
5860

5961
public class TLSSocketChannelIT
@@ -290,26 +292,36 @@ public void shouldEstablishTLSConnection() throws Throwable
290292
}
291293
}
292294

293-
// @Test
294-
// public void shouldWarnIfUsingDeprecatedTLSOption() throws Throwable
295-
// {
296-
//
297-
// Logger logger = mock( Logger.class );
298-
// SocketChannel channel = SocketChannel.open();
299-
// channel.connect( new InetSocketAddress( "localhost", 7687 ) );
300-
//
301-
// // When
302-
// TLSSocketChannel sslChannel = new TLSSocketChannel( "localhost", 7687, channel, logger,
303-
// Config.TrustStrategy.trustSignedBy(
304-
// Neo4jSettings.DEFAULT_TLS_CERT_FILE ) );
305-
// sslChannel.close();
306-
//
307-
// // Then
308-
// verify( logger, atLeastOnce() )
309-
// .warn( "Option `TRUST_SIGNED_CERTIFICATE` has been deprecated and will be removed " +
310-
// "in a future version of the driver. Please switch to use " +
311-
// "`TRUST_CUSTOM_CA_SIGNED_CERTIFICATES` instead." );
312-
// }
295+
@Test
296+
public void shouldWarnIfUsingDeprecatedTLSOption() throws Throwable
297+
{
298+
299+
Logger logger = mock( Logger.class );
300+
Logging logging = mock( Logging.class );
301+
when(logging.getLog( anyString() )).thenReturn( logger );
302+
303+
SocketChannel channel = SocketChannel.open();
304+
channel.connect( new InetSocketAddress( "localhost", 7687 ) );
305+
306+
Config config = Config.build()
307+
.withEncryptionLevel( Config.EncryptionLevel.REQUIRED )
308+
.withTrustStrategy( Config.TrustStrategy.trustSignedBy( Neo4jSettings.DEFAULT_TLS_CERT_FILE ) )
309+
.withLogging( logging )
310+
.toConfig();
311+
312+
// When
313+
try ( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, config );
314+
Session session = driver.session() )
315+
{
316+
session.run( "RETURN 1" ).consume();
317+
}
318+
319+
// Then
320+
verify( logger, atLeastOnce() )
321+
.warn( "Option `TRUST_SIGNED_CERTIFICATE` has been deprecated and will be removed " +
322+
"in a future version of the driver. Please switch to use " +
323+
"`TRUST_CUSTOM_CA_SIGNED_CERTIFICATES` instead." );
324+
}
313325

314326
private void performTLSHandshakeUsingKnownCerts( File knownCerts ) throws Throwable
315327
{

0 commit comments

Comments
 (0)