Remove unneeded clearing of system properties (#4010)

Author: epugh

solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java

@@ -32,7 +32,6 @@
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.core.SolrCore;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
 public class AnalysisAfterCoreReloadTest extends SolrTestCaseJ4 {
@@ -46,9 +45,6 @@ public static void beforeClass() throws Exception {
     initCore("solrconfig.xml", "schema.xml", tmpSolrHome);
   }
 
-  @AfterClass
-  public static void AfterClass() {}
-
   public void testStopwordsAfterCoreReload() throws Exception {
     SolrInputDocument doc = new SolrInputDocument();
     doc.setField("id", "42");

solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java

@@ -20,7 +20,6 @@
 import java.nio.file.Path;
 import org.apache.commons.io.file.PathUtils;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -50,9 +49,6 @@ public static void beforeClass() throws Exception {
     initCore("solrconfig-minimal.xml", "schema-tiny.xml", tmpSolrHome, "core1");
   }
 
-  @AfterClass
-  public static void AfterClass() {}
-
   @Test
   public void testCorrectCore() {
     assertEquals("should be core1", "core1", h.getCore().getName());

solr/core/src/test/org/apache/solr/TestGroupingSearch.java

@@ -42,7 +42,6 @@
 import org.apache.solr.response.ResultContext;
 import org.apache.solr.response.SolrQueryResponse;
 import org.apache.solr.schema.IndexSchema;
-import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -74,11 +73,6 @@ public static void beforeTests() throws Exception {
     initCore("solrconfig.xml", "schema12.xml");
   }
 
-  @AfterClass
-  public static void afterTests() {
-    systemClearPropertySolrTestsMergePolicyFactory();
-  }
-
   @Before
   public void cleanIndex() {
     assertU(delQ("*:*"));

solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java

@@ -21,7 +21,6 @@
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrInputDocument;
-import org.junit.AfterClass;
 import org.junit.Test;
 
 /**
@@ -34,9 +33,6 @@ public class TestHighlightDedupGrouping extends BaseDistributedSearchTestCase {
   private static final String group_ti1 = "group_ti1";
   private static final String shard_i1 = "shard_i1";
 
-  @AfterClass
-  public static void afterClass() throws Exception {}
-
   @Test
   @ShardsFixed(num = 2)
   public void test() throws Exception {
@@ -79,7 +75,7 @@ private void basicTest() throws Exception {
                 id_s1));
 
     // The number of highlighted documents should be the same as the de-duplicated docs
-    assertEquals(1, rsp.getHighlighting().values().size());
+    assertEquals(1, rsp.getHighlighting().size());
   }
 
   private void randomizedTest() throws Exception {
@@ -142,7 +138,7 @@ private void randomizedTest() throws Exception {
                   "true"));
       // The number of highlighted documents should be the same as the de-duplicated docs for this
       // group
-      assertEquals(docsInGroup[group], rsp.getHighlighting().values().size());
+      assertEquals(docsInGroup[group], rsp.getHighlighting().size());
     }
   }
 

solr/core/src/test/org/apache/solr/cli/PackageToolTest.java

@@ -78,12 +78,9 @@ public static void setupClusterWithSecurityEnabled() throws Exception {
 
   @AfterClass
   public static void teardown() throws Exception {
-    try {
-      if (repositoryServer != null) {
-        repositoryServer.stop();
-      }
-    } finally {
-      System.clearProperty("solr.packages.enabled");
+
+    if (repositoryServer != null) {
+      repositoryServer.stop();
     }
   }
 

solr/core/src/test/org/apache/solr/cli/SolrProcessManagerTest.java

@@ -71,8 +71,6 @@ public static void afterClass() throws Exception {
     processHttp.getValue().destroyForcibly();
     processHttps.getValue().destroyForcibly();
     SolrProcessManager.enableTestingMode = false;
-    System.clearProperty("solr.port.listen");
-    System.clearProperty("solr.pid.dir");
   }
 
   private static int findAvailablePort() throws IOException {

solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java

@@ -47,7 +47,6 @@
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.util.ExternalPaths;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -68,14 +67,6 @@ public static void beforeClass() {
     System.setProperty("solr.directoryFactory", "solr.NRTCachingDirectoryFactory");
   }
 
-  @AfterClass
-  public static void cleanup() {
-    System.clearProperty("solr.directoryFactory");
-    System.clearProperty("solr.host.advertise");
-    System.clearProperty("solr.port.listen");
-    System.clearProperty("solr.log.dir");
-  }
-
   /**
    * Overrides the call to exec bin/solr to start Solr nodes to start them using the Solr
    * test-framework instead of the script, since the script depends on a full build.

solr/core/src/test/org/apache/solr/cli/ZkSubcommandsTest.java

@@ -44,7 +44,6 @@
 import org.apache.solr.util.ExternalPaths;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -72,11 +71,6 @@ public static void beforeClass() {
     System.setProperty("solrcloud.skip.autorecovery", "true");
   }
 
-  @AfterClass
-  public static void afterClass() {
-    System.clearProperty("solrcloud.skip.autorecovery");
-  }
-
   @Override
   public void setUp() throws Exception {
     super.setUp();
@@ -568,34 +562,25 @@ public void testSetClusterProperty() throws Exception {
 
   @Test
   public void testUpdateAcls() throws Exception {
-    try {
-      System.setProperty(
-          SolrZkClient.ZK_ACL_PROVIDER_CLASS_NAME_VM_PARAM_NAME,
-          DigestZkACLProvider.class.getName());
-      System.setProperty(
-          VMParamsZkCredentialsInjector.DEFAULT_DIGEST_READONLY_USERNAME_VM_PARAM_NAME, "user");
-      System.setProperty(
-          VMParamsZkCredentialsInjector.DEFAULT_DIGEST_READONLY_PASSWORD_VM_PARAM_NAME, "pass");
-      System.setProperty(
-          SolrZkClient.ZK_ACL_PROVIDER_CLASS_NAME_VM_PARAM_NAME,
-          VMParamsAllAndReadonlyDigestZkACLProvider.class.getName());
-      System.setProperty(
-          VMParamsAllAndReadonlyDigestZkACLProvider.DEFAULT_DIGEST_READONLY_USERNAME_VM_PARAM_NAME,
-          "user");
-      System.setProperty(
-          VMParamsAllAndReadonlyDigestZkACLProvider.DEFAULT_DIGEST_READONLY_PASSWORD_VM_PARAM_NAME,
-          "pass");
-
-      String[] args = new String[] {"updateacls", "/", "-z", zkServer.getZkAddress()};
-      assertEquals(0, CLITestHelper.runTool(args, UpdateACLTool.class));
-    } finally {
-      // Need to clear these before we open the next SolrZkClient
-      System.clearProperty(SolrZkClient.ZK_ACL_PROVIDER_CLASS_NAME_VM_PARAM_NAME);
-      System.clearProperty(
-          VMParamsAllAndReadonlyDigestZkACLProvider.DEFAULT_DIGEST_READONLY_USERNAME_VM_PARAM_NAME);
-      System.clearProperty(
-          VMParamsAllAndReadonlyDigestZkACLProvider.DEFAULT_DIGEST_READONLY_PASSWORD_VM_PARAM_NAME);
-    }
+
+    System.setProperty(
+        SolrZkClient.ZK_ACL_PROVIDER_CLASS_NAME_VM_PARAM_NAME, DigestZkACLProvider.class.getName());
+    System.setProperty(
+        VMParamsZkCredentialsInjector.DEFAULT_DIGEST_READONLY_USERNAME_VM_PARAM_NAME, "user");
+    System.setProperty(
+        VMParamsZkCredentialsInjector.DEFAULT_DIGEST_READONLY_PASSWORD_VM_PARAM_NAME, "pass");
+    System.setProperty(
+        SolrZkClient.ZK_ACL_PROVIDER_CLASS_NAME_VM_PARAM_NAME,
+        VMParamsAllAndReadonlyDigestZkACLProvider.class.getName());
+    System.setProperty(
+        VMParamsAllAndReadonlyDigestZkACLProvider.DEFAULT_DIGEST_READONLY_USERNAME_VM_PARAM_NAME,
+        "user");
+    System.setProperty(
+        VMParamsAllAndReadonlyDigestZkACLProvider.DEFAULT_DIGEST_READONLY_PASSWORD_VM_PARAM_NAME,
+        "pass");
+
+    String[] args = new String[] {"updateacls", "/", "-z", zkServer.getZkAddress()};
+    assertEquals(0, CLITestHelper.runTool(args, UpdateACLTool.class));
 
     boolean excepted = false;
     try (SolrZkClient zkClient =
@@ -619,8 +604,6 @@ public void tearDown() throws Exception {
     if (zkServer != null) {
       zkServer.shutdown();
     }
-    System.clearProperty("solr.home");
-    System.clearProperty("minStateByteLenForCompression");
     System.setOut(originalSystemOut);
     super.tearDown();
   }

solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerSchemaAPI.java

@@ -64,7 +64,6 @@ public static void destroyClass() throws IOException {
       server.close();
       server = null;
     }
-    System.clearProperty("managed.schema.mutable");
   }
 
   @Before

solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java

@@ -54,7 +54,6 @@ public static void beforeSuperClass() {
 
   @AfterClass
   public static void afterSuperClass() {
-    System.clearProperty("solr.autoCommit.maxTime");
     clearErrorHook();
   }