Skip to content

Commit c300833

Browse files
injectivesinjectives
committed
wip
1 parent e7c18b4 commit c300833

File tree

5 files changed

+22
-23
lines changed

5 files changed

+22
-23
lines changed

‎driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void logShouldRecordDebugAndTraceInfo()
5050
Logging logging = mock( Logging.class );
5151
Logger logger = mock( Logger.class );
5252

53-
when( logging.getLog( anyString() ) ).thenReturn( logger );
53+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
5454
when( logger.isDebugEnabled() ).thenReturn( true );
5555
when( logger.isTraceEnabled() ).thenReturn( true );
5656

‎driver/src/test/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSessionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void logsNothingDuringFinalizationIfClosed() throws Exception
5555
{
5656
Logging logging = mock( Logging.class );
5757
Logger log = mock( Logger.class );
58-
when( logging.getLog( anyString() ) ).thenReturn( log );
58+
when( logging.getLog( any( Class.class ) ) ).thenReturn( log );
5959
LeakLoggingNetworkSession session = newSession( logging, false );
6060

6161
finalize( session );
@@ -68,7 +68,7 @@ void logsMessageWithStacktraceDuringFinalizationIfLeaked( TestInfo testInfo ) th
6868
{
6969
Logging logging = mock( Logging.class );
7070
Logger log = mock( Logger.class );
71-
when( logging.getLog( anyString() ) ).thenReturn( log );
71+
when( logging.getLog( any( Class.class ) ) ).thenReturn( log );
7272
LeakLoggingNetworkSession session = newSession( logging, true );
7373
// begin transaction to make session obtain a connection
7474
session.beginTransactionAsync( TransactionConfig.empty() );

‎driver/src/test/java/org/neo4j/driver/internal/cluster/RediscoveryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ void shouldResolveToIP() throws UnknownHostException
435435
DomainNameResolver domainNameResolver = mock( DomainNameResolver.class );
436436
InetAddress localhost = InetAddress.getLocalHost();
437437
when( domainNameResolver.resolve( A.host() ) ).thenReturn( new InetAddress[]{localhost} );
438-
Rediscovery rediscovery = new RediscoveryImpl( A, null, null, null, resolver, null, domainNameResolver );
438+
Rediscovery rediscovery = new RediscoveryImpl( A, null, null, null, resolver, DEV_NULL_LOGGING, domainNameResolver );
439439

440440
List<BoltServerAddress> addresses = rediscovery.resolve();
441441

‎driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LeastConnectedLoadBalancingStrategyTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,22 @@
2222
import org.junit.jupiter.api.Test;
2323
import org.mockito.Mock;
2424

25-
import org.neo4j.driver.internal.BoltServerAddress;
26-
import org.neo4j.driver.internal.spi.ConnectionPool;
2725
import org.neo4j.driver.Logger;
2826
import org.neo4j.driver.Logging;
27+
import org.neo4j.driver.internal.BoltServerAddress;
28+
import org.neo4j.driver.internal.spi.ConnectionPool;
2929

3030
import static org.junit.jupiter.api.Assertions.assertEquals;
3131
import static org.junit.jupiter.api.Assertions.assertNull;
3232
import static org.mockito.ArgumentMatchers.any;
33-
import static org.mockito.ArgumentMatchers.anyString;
3433
import static org.mockito.ArgumentMatchers.eq;
3534
import static org.mockito.ArgumentMatchers.startsWith;
3635
import static org.mockito.Mockito.mock;
3736
import static org.mockito.Mockito.verify;
3837
import static org.mockito.Mockito.when;
3938
import static org.mockito.MockitoAnnotations.initMocks;
40-
import static org.neo4j.driver.internal.util.ClusterCompositionUtil.A;
4139
import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
40+
import static org.neo4j.driver.internal.util.ClusterCompositionUtil.A;
4241

4342
class LeastConnectedLoadBalancingStrategyTest
4443
{
@@ -164,7 +163,7 @@ void shouldTraceLogWhenNoAddressSelected()
164163
{
165164
Logging logging = mock( Logging.class );
166165
Logger logger = mock( Logger.class );
167-
when( logging.getLog( anyString() ) ).thenReturn( logger );
166+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
168167

169168
LoadBalancingStrategy strategy = new LeastConnectedLoadBalancingStrategy( connectionPool, logging );
170169

@@ -180,7 +179,7 @@ void shouldTraceLogSelectedAddress()
180179
{
181180
Logging logging = mock( Logging.class );
182181
Logger logger = mock( Logger.class );
183-
when( logging.getLog( anyString() ) ).thenReturn( logger );
182+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
184183

185184
when( connectionPool.inUseConnections( any( BoltServerAddress.class ) ) ).thenReturn( 42 );
186185

‎driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ void doesRetryOnClientExceptionWithRetryableCause()
773773
Clock clock = mock( Clock.class );
774774
Logging logging = mock( Logging.class );
775775
Logger logger = mock( Logger.class );
776-
when( logging.getLog( anyString() ) ).thenReturn( logger );
776+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
777777
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor, clock, logging );
778778

779779
AtomicBoolean exceptionThrown = new AtomicBoolean( false );
@@ -795,7 +795,7 @@ void doesRetryOnAuthorizationExpiredException()
795795
Clock clock = mock( Clock.class );
796796
Logging logging = mock( Logging.class );
797797
Logger logger = mock( Logger.class );
798-
when( logging.getLog( anyString() ) ).thenReturn( logger );
798+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
799799
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor, clock, logging );
800800

801801
AtomicBoolean exceptionThrown = new AtomicBoolean( false );
@@ -817,7 +817,7 @@ void doesRetryOnConnectionReadTimeoutException()
817817
Clock clock = mock( Clock.class );
818818
Logging logging = mock( Logging.class );
819819
Logger logger = mock( Logger.class );
820-
when( logging.getLog( anyString() ) ).thenReturn( logger );
820+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
821821
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor, clock, logging );
822822

823823
AtomicBoolean exceptionThrown = new AtomicBoolean( false );
@@ -862,7 +862,7 @@ void eachRetryIsLogged()
862862
Clock clock = mock( Clock.class );
863863
Logging logging = mock( Logging.class );
864864
Logger logger = mock( Logger.class );
865-
when( logging.getLog( anyString() ) ).thenReturn( logger );
865+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
866866
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor,
867867
clock, logging );
868868

@@ -880,7 +880,7 @@ void doesRetryOnClientExceptionWithRetryableCauseAsync()
880880
Clock clock = mock( Clock.class );
881881
Logging logging = mock( Logging.class );
882882
Logger logger = mock( Logger.class );
883-
when( logging.getLog( anyString() ) ).thenReturn( logger );
883+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
884884

885885
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor, clock, logging );
886886

@@ -903,7 +903,7 @@ void doesRetryOnAuthorizationExpiredExceptionAsync()
903903
Clock clock = mock( Clock.class );
904904
Logging logging = mock( Logging.class );
905905
Logger logger = mock( Logger.class );
906-
when( logging.getLog( anyString() ) ).thenReturn( logger );
906+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
907907
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor, clock, logging );
908908

909909
AtomicBoolean exceptionThrown = new AtomicBoolean( false );
@@ -950,7 +950,7 @@ void eachRetryIsLoggedAsync()
950950
Clock clock = mock( Clock.class );
951951
Logging logging = mock( Logging.class );
952952
Logger logger = mock( Logger.class );
953-
when( logging.getLog( anyString() ) ).thenReturn( logger );
953+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
954954

955955
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor,
956956
clock, logging );
@@ -969,7 +969,7 @@ void doesRetryOnClientExceptionWithRetryableCauseRx()
969969
Clock clock = mock( Clock.class );
970970
Logging logging = mock( Logging.class );
971971
Logger logger = mock( Logger.class );
972-
when( logging.getLog( anyString() ) ).thenReturn( logger );
972+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
973973

974974
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor, clock, logging );
975975

@@ -992,7 +992,7 @@ void doesRetryOnAuthorizationExpiredExceptionRx()
992992
Clock clock = mock( Clock.class );
993993
Logging logging = mock( Logging.class );
994994
Logger logger = mock( Logger.class );
995-
when( logging.getLog( anyString() ) ).thenReturn( logger );
995+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
996996
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor, clock, logging );
997997

998998
AtomicBoolean exceptionThrown = new AtomicBoolean( false );
@@ -1039,7 +1039,7 @@ void eachRetryIsLoggedRx()
10391039
Clock clock = mock( Clock.class );
10401040
Logging logging = mock( Logging.class );
10411041
Logger logger = mock( Logger.class );
1042-
when( logging.getLog( anyString() ) ).thenReturn( logger );
1042+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
10431043

10441044
ExponentialBackoffRetryLogic logic = new ExponentialBackoffRetryLogic( RetrySettings.DEFAULT, eventExecutor,
10451045
clock, logging );
@@ -1108,7 +1108,7 @@ void correctNumberOfRetiesAreLoggedOnFailure()
11081108
Clock clock = mock( Clock.class );
11091109
Logging logging = mock( Logging.class );
11101110
Logger logger = mock( Logger.class );
1111-
when( logging.getLog( anyString() ) ).thenReturn( logger );
1111+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
11121112
RetrySettings settings = RetrySettings.DEFAULT;
11131113
RetryLogic logic = new ExponentialBackoffRetryLogic( settings, eventExecutor, clock, logging );
11141114

@@ -1146,7 +1146,7 @@ void correctNumberOfRetiesAreLoggedOnFailureAsync()
11461146
Clock clock = mock( Clock.class );
11471147
Logging logging = mock( Logging.class );
11481148
Logger logger = mock( Logger.class );
1149-
when( logging.getLog( anyString() ) ).thenReturn( logger );
1149+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
11501150
RetrySettings settings = RetrySettings.DEFAULT;
11511151
RetryLogic logic = new ExponentialBackoffRetryLogic( settings, eventExecutor, clock, logging );
11521152

@@ -1184,7 +1184,7 @@ void correctNumberOfRetiesAreLoggedOnFailureRx()
11841184
Clock clock = mock( Clock.class );
11851185
Logging logging = mock( Logging.class );
11861186
Logger logger = mock( Logger.class );
1187-
when( logging.getLog( anyString() ) ).thenReturn( logger );
1187+
when( logging.getLog( any( Class.class ) ) ).thenReturn( logger );
11881188
RetrySettings settings = RetrySettings.DEFAULT;
11891189
RetryLogic logic = new ExponentialBackoffRetryLogic( settings, eventExecutor, clock, logging );
11901190

0 commit comments

Comments
 (0)