gerlowskija commented on code in PR #1053: URL: https://github.com/apache/solr/pull/1053#discussion_r1009778323
########## 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: > Maybe that's only partly related to our discussion above (how to test the API); but I want to get your reaction any way. It seems like a reasonable way to handle things. My main concern would be that the base class abstracts things well enough so that test code doesn't need to know/care how Solr is actually run. That sounds hard - my off-the-top-of-the-head impression is that we have lots of tests that fetch the JettySolrRunner for some reason or other. But if you're already doing something similar in your work context, and you feel confident in the approach, it seems solid to me. > If V1 is merely going to be calling V2 (yay!!), then I agree we can have real unit tests that only test that mechanism in isolation. Yep, that's exactly what this PR does! Of course, there's some plumbing/shim logic to convert the v1 params into the format v2 expects, etc. But with this PR, the heart of the v1 delete-replica-prop logic is "just" a [call to DeleteReplicaPropertyAPI.deleteReplicaProperty](https://github.com/apache/solr/pull/1053/files#diff-582348d44491dcb0ce1dfb169fb544e9e95620b2d0448eb1a1744f4e8dd5a349R1313). This is all, interestingly enough, inspired by a comment you yourself made [here](https://lists.apache.org/thread/43xy1drq8wswg6vpo9b11rkvdqtqomlv). So, thanks haha! > Still, there's how you test the primary API (V2). We already have tests for these in general, albeit using V1? They can be changed to use V2. They can be switched over to v2, and that is my plan, but I don't think we're there just yet. I really want people using v2, but v1 is what people are on today, so I think it makes sense to keep the coverage there, at least up until we near v1 deprecation. (And of course, the whole v1-as-a-shim-on-top plan allows v1 integration tests to cover the v2 codepath implicitly, so it's not like that's untested while we defer the switch). (I'm close to publishing a SIP that aims to paint a picture of what the path to v1-deprecation looks like. I'm sure it's awhile away, but maybe waiting will be more bearable when we have a concrete path to the destination? idk) -- 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
