@@ -2338,7 +2338,7 @@ public void getState_loadBalancerSupportsChannelState() {
2338
2338
channelBuilder .nameResolverFactory (
2339
2339
new FakeNameResolverFactory .Builder (expectedUri ).setResolvedAtStart (false ).build ());
2340
2340
createChannel ();
2341
- assertEquals (IDLE , channel .getState (false ));
2341
+ assertEquals (CONNECTING , channel .getState (false ));
2342
2342
2343
2343
updateBalancingStateSafely (helper , TRANSIENT_FAILURE , mockPicker );
2344
2344
assertEquals (TRANSIENT_FAILURE , channel .getState (false ));
@@ -2395,21 +2395,21 @@ public void run() {
2395
2395
channelBuilder .nameResolverFactory (
2396
2396
new FakeNameResolverFactory .Builder (expectedUri ).setResolvedAtStart (false ).build ());
2397
2397
createChannel ();
2398
- assertEquals (IDLE , channel .getState (false ));
2398
+ assertEquals (CONNECTING , channel .getState (false ));
2399
2399
2400
- channel .notifyWhenStateChanged (IDLE , onStateChanged );
2400
+ channel .notifyWhenStateChanged (CONNECTING , onStateChanged );
2401
2401
executor .runDueTasks ();
2402
2402
assertFalse (stateChanged .get ());
2403
2403
2404
- // state change from IDLE to CONNECTING
2405
- updateBalancingStateSafely (helper , CONNECTING , mockPicker );
2404
+ // state change from CONNECTING to IDLE
2405
+ updateBalancingStateSafely (helper , IDLE , mockPicker );
2406
2406
// onStateChanged callback should run
2407
2407
executor .runDueTasks ();
2408
2408
assertTrue (stateChanged .get ());
2409
2409
2410
- // clear and test form CONNECTING
2410
+ // clear and test form IDLE
2411
2411
stateChanged .set (false );
2412
- channel .notifyWhenStateChanged (IDLE , onStateChanged );
2412
+ channel .notifyWhenStateChanged (CONNECTING , onStateChanged );
2413
2413
// onStateChanged callback should run immediately
2414
2414
executor .runDueTasks ();
2415
2415
assertTrue (stateChanged .get ());
@@ -2428,8 +2428,8 @@ public void run() {
2428
2428
channelBuilder .nameResolverFactory (
2429
2429
new FakeNameResolverFactory .Builder (expectedUri ).setResolvedAtStart (false ).build ());
2430
2430
createChannel ();
2431
- assertEquals (IDLE , channel .getState (false ));
2432
- channel .notifyWhenStateChanged (IDLE , onStateChanged );
2431
+ assertEquals (CONNECTING , channel .getState (false ));
2432
+ channel .notifyWhenStateChanged (CONNECTING , onStateChanged );
2433
2433
executor .runDueTasks ();
2434
2434
assertFalse (stateChanged .get ());
2435
2435
@@ -2452,9 +2452,6 @@ public void stateIsIdleOnIdleTimeout() {
2452
2452
long idleTimeoutMillis = 2000L ;
2453
2453
channelBuilder .idleTimeout (idleTimeoutMillis , TimeUnit .MILLISECONDS );
2454
2454
createChannel ();
2455
- assertEquals (IDLE , channel .getState (false ));
2456
-
2457
- updateBalancingStateSafely (helper , CONNECTING , mockPicker );
2458
2455
assertEquals (CONNECTING , channel .getState (false ));
2459
2456
2460
2457
timer .forwardNanos (TimeUnit .MILLISECONDS .toNanos (idleTimeoutMillis ));
@@ -2677,11 +2674,11 @@ public void idleTimeoutAndReconnect() {
2677
2674
2678
2675
// Updating on the old helper (whose balancer has been shutdown) does not change the channel
2679
2676
// state.
2680
- updateBalancingStateSafely (helper , CONNECTING , mockPicker );
2681
- assertEquals (IDLE , channel .getState (false ));
2682
-
2683
- updateBalancingStateSafely (helper2 , CONNECTING , mockPicker );
2677
+ updateBalancingStateSafely (helper , IDLE , mockPicker );
2684
2678
assertEquals (CONNECTING , channel .getState (false ));
2679
+
2680
+ updateBalancingStateSafely (helper2 , IDLE , mockPicker );
2681
+ assertEquals (IDLE , channel .getState (false ));
2685
2682
}
2686
2683
2687
2684
@ Test
@@ -2695,7 +2692,7 @@ public void idleMode_resetsDelayedTransportPicker() {
2695
2692
.setServers (Collections .singletonList (new EquivalentAddressGroup (socketAddress )))
2696
2693
.build ());
2697
2694
createChannel ();
2698
- assertEquals (IDLE , channel .getState (false ));
2695
+ assertEquals (CONNECTING , channel .getState (false ));
2699
2696
2700
2697
// This call will be buffered in delayedTransport
2701
2698
ClientCall <String , Integer > call = channel .newCall (method , CallOptions .DEFAULT );
@@ -2790,7 +2787,7 @@ public void enterIdle_exitsIdleIfDelayedStreamPending() {
2790
2787
// enterIdle() will shut down the name resolver and lb policy used to get a pick for the delayed
2791
2788
// call
2792
2789
channel .enterIdle ();
2793
- assertEquals (IDLE , channel .getState (false ));
2790
+ assertEquals (CONNECTING , channel .getState (false ));
2794
2791
2795
2792
// enterIdle() will restart the delayed call by exiting idle. This creates a new helper.
2796
2793
ArgumentCaptor <Helper > helperCaptor = ArgumentCaptor .forClass (Helper .class );
@@ -2912,14 +2909,14 @@ public void updateBalancingStateWithShutdownShouldBeIgnored() {
2912
2909
channelBuilder .nameResolverFactory (
2913
2910
new FakeNameResolverFactory .Builder (expectedUri ).setResolvedAtStart (false ).build ());
2914
2911
createChannel ();
2915
- assertEquals (IDLE , channel .getState (false ));
2912
+ assertEquals (CONNECTING , channel .getState (false ));
2916
2913
2917
2914
Runnable onStateChanged = mock (Runnable .class );
2918
- channel .notifyWhenStateChanged (IDLE , onStateChanged );
2915
+ channel .notifyWhenStateChanged (CONNECTING , onStateChanged );
2919
2916
2920
2917
updateBalancingStateSafely (helper , SHUTDOWN , mockPicker );
2921
2918
2922
- assertEquals (IDLE , channel .getState (false ));
2919
+ assertEquals (CONNECTING , channel .getState (false ));
2923
2920
executor .runDueTasks ();
2924
2921
verify (onStateChanged , never ()).run ();
2925
2922
}
@@ -3222,8 +3219,6 @@ public void channelsAndSubchannels_instrumented_state() throws Exception {
3222
3219
verify (mockLoadBalancerProvider ).newLoadBalancer (helperCaptor .capture ());
3223
3220
helper = helperCaptor .getValue ();
3224
3221
3225
- assertEquals (IDLE , getStats (channel ).state );
3226
- updateBalancingStateSafely (helper , CONNECTING , mockPicker );
3227
3222
assertEquals (CONNECTING , getStats (channel ).state );
3228
3223
3229
3224
AbstractSubchannel subchannel =
@@ -3434,7 +3429,7 @@ public void channelsAndSubchannels_oob_instrumented_state() throws Exception {
3434
3429
assertEquals (READY , getStats (oobChannel ).state );
3435
3430
3436
3431
// oobchannel state is separate from the ManagedChannel
3437
- assertEquals (IDLE , getStats (channel ).state );
3432
+ assertEquals (CONNECTING , getStats (channel ).state );
3438
3433
channel .shutdownNow ();
3439
3434
assertEquals (SHUTDOWN , getStats (channel ).state );
3440
3435
assertEquals (SHUTDOWN , getStats (oobChannel ).state );
@@ -4536,4 +4531,4 @@ private static ManagedChannelServiceConfig createManagedChannelServiceConfig(
4536
4531
return ManagedChannelServiceConfig
4537
4532
.fromServiceConfig (rawServiceConfig , true , 3 , 4 , policySelection );
4538
4533
}
4539
- }
4534
+ }
0 commit comments