This is an automated email from the ASF dual-hosted git repository. jdyer pushed a commit to branch branch_9x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 870ccef8aec98d7f0b355e2bfb46ff93a36d28c3 Author: jdyer1 <[email protected]> AuthorDate: Wed Nov 22 09:59:04 2023 -0600 BlobRepositoryMockingTest: cleanup --- .../test/org/apache/solr/core/BlobRepositoryMockingTest.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java index ffee803287a..96496ad8975 100644 --- a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java +++ b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java @@ -17,8 +17,6 @@ package org.apache.solr.core; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; @@ -33,6 +31,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; + import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; import org.junit.Before; @@ -51,8 +50,6 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 { private ConcurrentHashMap<String, BlobRepository.BlobContent> mapMock = mock(ConcurrentHashMap.class); - private Object[] mocks = new Object[] {mockContainer, mapMock}; - BlobRepository repository; ByteBuffer blobData = ByteBuffer.wrap(BLOBSTR.getBytes(UTF8)); boolean blobFetched = false; @@ -102,7 +99,7 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 { public void testCloudOnly() { when(mockContainer.isZooKeeperAware()).thenReturn(false); try { - BlobRepository.BlobContentRef<ByteBuffer> ref = repository.getBlobIncRef("foo!"); + repository.getBlobIncRef("foo!"); } catch (SolrException e) { verify(mockContainer).isZooKeeperAware(); throw e; @@ -158,7 +155,7 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 { assertNotNull(ref.blob); assertEquals(blobData, ref.blob.get()); verify(mockContainer).isZooKeeperAware(); - assertTrue(mapMock.get("foo!") instanceof BlobRepository.BlobContent); + assertTrue("Key was not mapped to a BlobContent instance.", mapMock.get("foo!") instanceof BlobRepository.BlobContent); } @Test @@ -190,6 +187,7 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 { assertTrue(blobFetched); assertNotNull(ref.blob); assertEquals(PARSED, ref.blob.get()); - verify(mockContainer).isZooKeeperAware();assertTrue(mapMock.get("foo!mocked") instanceof BlobRepository.BlobContent); + verify(mockContainer).isZooKeeperAware(); + assertTrue(mapMock.get("foo!mocked") instanceof BlobRepository.BlobContent); } }
