honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delete Redundant RoutingServiceTests (#37750) 

* This test compleletly overrode the `reroute` method and hence did nothing put test the override itself
   * Removed the test since it tests nothing and simplified `reroute` accordingly
This commit is contained in:
Armin Braun 2019-01-23 16:39:02 +01:00 committed by GitHub
parent 6a9838359c
commit 2439f68745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
View File

@ -77,11 +77,6 @@ public class RoutingService extends AbstractLifecycleComponent {
* Initiates a reroute. * Initiates a reroute.
*/ */
public final void reroute(String reason) { public final void reroute(String reason) {
performReroute(reason);
}
// visible for testing
protected void performReroute(String reason) {
try { try {
if (lifecycle.stopped()) { if (lifecycle.stopped()) {
return; return;

62
server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java
View File

@ -1,62 +0,0 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you 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
*
* http://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.elasticsearch.cluster.routing;
import org.elasticsearch.cluster.ESAllocationTestCase;
import org.junit.Before;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.hamcrest.Matchers.equalTo;
public class RoutingServiceTests extends ESAllocationTestCase {
private TestRoutingService routingService;
@Before
public void createRoutingService() {
routingService = new TestRoutingService();
}
public void testReroute() {
assertThat(routingService.hasReroutedAndClear(), equalTo(false));
routingService.reroute("test");
assertThat(routingService.hasReroutedAndClear(), equalTo(true));
}
private class TestRoutingService extends RoutingService {
private AtomicBoolean rerouted = new AtomicBoolean();
TestRoutingService() {
super(null, null);
}
public boolean hasReroutedAndClear() {
return rerouted.getAndSet(false);
}
@Override
protected void performReroute(String reason) {
logger.info("--> performing fake reroute [{}]", reason);
rerouted.set(true);
}
}
}