Random minor test fixes

Author: HoustonPutman

solr/core/src/test/org/apache/solr/cluster/events/impl/CollectionsRepairEventListenerTest.java

@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import org.apache.commons.io.IOUtils;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.V2Request;
 import org.apache.solr.client.solrj.request.beans.PluginMeta;
@@ -36,6 +37,7 @@
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.util.LogLevel;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -127,6 +129,17 @@ public void setUp() throws Exception {
     cluster.deleteAllCollections();
   }
 
+  @AfterClass
+  public static void teardownCluster() throws Exception {
+    CoreContainer cc = cluster.getOpenOverseer().getCoreContainer();
+    cc.getClusterEventProducer().unregisterListener(eventsListener);
+    IOUtils.close(eventsListener);
+    if (repairListener != null) {
+      cc.getClusterEventProducer().unregisterListener(repairListener);
+      IOUtils.close(repairListener);
+    }
+  }
+
   @Test
   public void testCollectionRepair() throws Exception {
     eventsListener.setExpectedType(ClusterEvent.EventType.COLLECTIONS_ADDED);

solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/BadClusterTest.java

@@ -79,28 +79,21 @@ public void testBadCluster() throws Exception {
   }
 
   private void testEmptyCollection() throws Exception {
-    CloudSolrStream stream = new CloudSolrStream(buildSearchExpression(), streamFactory);
-    assertEquals(0, getTuples(stream).size());
+    try (CloudSolrStream stream = new CloudSolrStream(buildSearchExpression(), streamFactory)) {
+      assertEquals(0, getTuples(stream).size());
+    }
   }
 
   private void testAllNodesDown() throws Exception {
-
-    CloudSolrStream stream = new CloudSolrStream(buildSearchExpression(), streamFactory);
-    cluster.expireZkSession(cluster.getReplicaJetty(getReplicas().get(0)));
-
-    try {
-      getTuples(stream);
-      fail("Expected IOException");
-    } catch (IOException ioe) {
+    try (CloudSolrStream stream = new CloudSolrStream(buildSearchExpression(), streamFactory)) {
+      cluster.expireZkSession(cluster.getReplicaJetty(getReplicas().get(0)));
+      expectThrows(IOException.class, () -> getTuples(stream));
     }
   }
 
   private void testClusterShutdown() throws Exception {
-
-    CloudSolrStream stream = new CloudSolrStream(buildSearchExpression(), streamFactory);
-    cluster.shutdown();
-
-    try {
+    try (CloudSolrStream stream = new CloudSolrStream(buildSearchExpression(), streamFactory)) {
+      cluster.shutdown();
       getTuples(stream);
       fail("Expected IOException: SolrException: TimeoutException");
     } catch (IOException ioe) {

solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java

@@ -845,8 +845,7 @@ private void moveAliveToDead(EndpointWrapper wrapper) {
   public void close() {
     synchronized (this) {
       if (aliveCheckExecutor != null) {
-        aliveCheckExecutor.shutdownNow();
-        ExecutorUtil.shutdownAndAwaitTermination(aliveCheckExecutor);
+        ExecutorUtil.shutdownNowAndAwaitTermination(aliveCheckExecutor);
       }
     }
     ObjectReleaseTracker.release(this);