gerlowskija commented on code in PR #1053: URL: https://github.com/apache/solr/pull/1053#discussion_r1016747436
########## solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPITest.java: ########## @@ -0,0 +1,116 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.apache.solr.handler.admin.api; + +import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.SHARD_UNIQUE; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import io.opentracing.noop.NoopSpan; +import java.util.Map; +import java.util.Optional; +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.cloud.OverseerSolrResponse; +import org.apache.solr.cloud.api.collections.DistributedCollectionConfigSetCommandRunner; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.cloud.ZkNodeProps; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.core.CoreContainer; +import org.apache.solr.request.SolrQueryRequest; +import org.apache.solr.response.SolrQueryResponse; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + +/** Unit tests for {@link DeleteReplicaPropertyAPI} */ +public class DeleteReplicaPropertyAPITest extends SolrTestCaseJ4 { + + private CoreContainer mockCoreContainer; + private DistributedCollectionConfigSetCommandRunner mockCommandRunner; + private SolrQueryRequest mockQueryRequest; + private SolrQueryResponse queryResponse; + private ArgumentCaptor<ZkNodeProps> messageCapturer; + + private DeleteReplicaPropertyAPI deleteReplicaPropApi; + + @BeforeClass + public static void ensureWorkingMockito() { + assumeWorkingMockito(); + } + + @Before + public void setUp() throws Exception { + super.setUp(); + + mockCoreContainer = mock(CoreContainer.class); + mockCommandRunner = mock(DistributedCollectionConfigSetCommandRunner.class); + when(mockCoreContainer.getDistributedCollectionCommandRunner()) + .thenReturn(Optional.of(mockCommandRunner)); + when(mockCommandRunner.runCollectionCommand(any(), any(), anyLong())) + .thenReturn(new OverseerSolrResponse(new NamedList<>())); + mockQueryRequest = mock(SolrQueryRequest.class); + when(mockQueryRequest.getSpan()).thenReturn(NoopSpan.INSTANCE); + queryResponse = new SolrQueryResponse(); + messageCapturer = ArgumentCaptor.forClass(ZkNodeProps.class); + + deleteReplicaPropApi = + new DeleteReplicaPropertyAPI(mockCoreContainer, mockQueryRequest, queryResponse); + } + + @Test + public void testReportsErrorWhenCalledInStandaloneMode() { + when(mockCoreContainer.isZooKeeperAware()).thenReturn(false); + + final SolrException e = + expectThrows( + SolrException.class, + () -> { + deleteReplicaPropApi.deleteReplicaProperty( + "someColl", "someShard", "someReplica", "somePropName"); + }); + assertEquals(400, e.code()); + assertTrue( + "Exception message differed from expected: " + e.getMessage(), + e.getMessage().contains("not running in SolrCloud mode")); + } + + @Test + public void testCreatesValidOverseerMessage() throws Exception { Review Comment: OK, I'm not sure if I agree, but I definitely see the distinction you're pointing to there. I appreciate you taking the time to explain where you're coming from on this. I know it's a lot of back and forth for a small thing, but I'm hoping being thorough here will save time on reviews going forward. I'll try this as a compromise: - I still feel like the message-construction code is important to unit test for now, because it's where the bulk of the "API" logic is as the code stands today. But it doesn't have to mention the overseer or even live in the API class itself. I'll refactor the message-creation code out, and that'll let us unit test it without mocks **and** it'll separate the tests from the API class itself so that they can just be nuked if we move away from the overseer (rather than playing some "cementing" role). - We can refactor the v1 code that calls into v2 in such a way that it's testable (maybe using mocks, but hopefully not?) to ensure that the v1 codepath uses the v2 API class properly. Is that something you could live with? @dsmiley -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
