(solr) branch main updated: SOLR-17079: Fix OverseerCollectionConfigSetProcessorTest (#2085)

[ds...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 9463f666f40 SOLR-17079: Fix OverseerCollectionConfigSetProcessorTest (#2085)
9463f666f40 is described below

commit 9463f666f40f1d72a0ac7b3c46c7f8048ef8eaa9
Author: Vincent P <vi...@gmail.com>
AuthorDate: Mon Nov 20 15:09:27 2023 +0100

    SOLR-17079: Fix OverseerCollectionConfigSetProcessorTest (#2085)
    
    Co-authored-by: Vincent Primault <vp...@salesforce.com>
---
 .../solr/cloud/OverseerCollectionConfigSetProcessorTest.java  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
index 24140b5c3c0..5e179e0d0f5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
@@ -56,6 +56,7 @@ import org.apache.solr.cloud.Overseer.LeaderStatus;
 import org.apache.solr.cloud.OverseerTaskQueue.QueueEvent;
 import org.apache.solr.cloud.api.collections.CollectionHandlingUtils;
 import org.apache.solr.cluster.placement.PlacementPluginFactory;
+import org.apache.solr.cluster.placement.plugins.SimplePlacementFactory;
 import org.apache.solr.common.cloud.Aliases;
 import org.apache.solr.common.cloud.ClusterState;
 import org.apache.solr.common.cloud.DocCollection;
@@ -88,7 +89,6 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
@@ -97,7 +97,6 @@ import org.mockito.stubbing.Answer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Ignore("VERY temporary, SOLR-17079")
 public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -131,7 +130,7 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
   private static HttpClient httpClientMock;
 
   @SuppressWarnings("rawtypes")
-  private static PlacementPluginFactory placementPluginFactoryMock;
+  private final PlacementPluginFactory placementPluginFactory = new SimplePlacementFactory();
 
   private static SolrMetricsContext solrMetricsContextMock;
 
@@ -208,7 +207,6 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
     coreContainerMock = mock(CoreContainer.class);
     updateShardHandlerMock = mock(UpdateShardHandler.class);
     httpClientMock = mock(HttpClient.class);
-    placementPluginFactoryMock = mock(PlacementPluginFactory.class);
     solrMetricsContextMock = mock(SolrMetricsContext.class);
   }
 
@@ -231,13 +229,11 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
     cloudDataProviderMock = null;
     clusterStateProviderMock = null;
     stateManagerMock = null;
-    ;
     cloudManagerMock = null;
     distribStateManagerMock = null;
     coreContainerMock = null;
     updateShardHandlerMock = null;
     httpClientMock = null;
-    placementPluginFactoryMock = null;
     solrMetricsContextMock = null;
   }
 
@@ -271,7 +267,6 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
     reset(coreContainerMock);
     reset(updateShardHandlerMock);
     reset(httpClientMock);
-    reset(placementPluginFactoryMock);
     reset(solrMetricsContextMock);
 
     zkClientData.clear();
@@ -448,7 +443,7 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
     when(distributedClusterStateUpdater.createStateChangeRecorder(any(), anyBoolean()))
         .thenReturn(stateChangeRecorder);
     when(coreContainerMock.getUpdateShardHandler()).thenReturn(updateShardHandlerMock);
-    when(coreContainerMock.getPlacementPluginFactory()).thenReturn(placementPluginFactoryMock);
+    when(coreContainerMock.getPlacementPluginFactory()).thenReturn(placementPluginFactory);
     when(coreContainerMock.getConfigSetService())
         .thenReturn(new ZkConfigSetService(solrZkClientMock));
     when(updateShardHandlerMock.getDefaultHttpClient()).thenReturn(httpClientMock);