Allow eurekaServerBootstrap.contextDestroyed to run when stopping Eureka (#3907)

* Allow eurekaServerBootstrap.contextDestroyed to run when stopping Eureka  658599

* Fix formatting and add header in test file
This commit is contained in:
larosek
2020-11-03 13:33:48 -05:00
committed by GitHub
parent 48a044cc71
commit da54b740f3
2 changed files with 58 additions and 5 deletions

View File

@@ -108,11 +108,6 @@ public class EurekaServerInitializerConfiguration implements ServletContextAware
return true;
}
@Override
public void stop(Runnable callback) {
callback.run();
}
@Override
public int getOrder() {
return this.order;

View File

@@ -0,0 +1,58 @@
/*
* Copyright 2013-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.netflix.eureka.server;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
public class EurekaServerInitializerConfigurationTest {
@Mock
private EurekaServerBootstrap eurekaServerBootstrapMock;
@InjectMocks
private EurekaServerInitializerConfiguration eurekaServerInitializerConfiguration;
private boolean callbackCalled;
@Before
public void setUp() {
callbackCalled = false;
}
@Test
public void testStopWithCallbackCallsStop() {
eurekaServerInitializerConfiguration.stop(this::setCallbackCalledTrue);
assertThat(callbackCalled).isTrue();
verify(eurekaServerBootstrapMock).contextDestroyed(any());
}
private void setCallbackCalledTrue() {
callbackCalled = true;
}
}