From 2439f68745577c7b14192b8f3b0be0b5cbb84443 Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Wed, 23 Jan 2019 16:39:02 +0100
Subject: [PATCH] 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
---
 .../cluster/routing/RoutingService.java       |  5 --
 .../cluster/routing/RoutingServiceTests.java  | 62 -------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java

diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
index 57f7a313942..89e19e02b30 100644
--- a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
@@ -77,11 +77,6 @@ public class RoutingService extends AbstractLifecycleComponent {
      * Initiates a reroute.
      */
     public final void reroute(String reason) {
-        performReroute(reason);
-    }
-
-    // visible for testing
-    protected void performReroute(String reason) {
         try {
             if (lifecycle.stopped()) {
                 return;
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java
deleted file mode 100644
index f9d3e0ab95c..00000000000
--- a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java
+++ /dev/null
@@ -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);
-        }
-    }
-}