You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by jd...@apache.org on 2023/11/22 16:11:54 UTC
(solr) branch main updated (a96eca6c1d8 -> 46b0ce0e02d)
This is an automated email from the ASF dual-hosted git repository.
jdyer pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
from a96eca6c1d8 SOLR-17082 Disable TestGlobalCircuitBreaker on windows (#2087)
new d2643145959 Fix test failure on J9: do not mock jre class
new 46b0ce0e02d BlobRepositoryMockingTest: cleanup
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/solr/core/BlobRepositoryMockingTest.java | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
(solr) 01/02: Fix test failure on J9: do not mock jre class
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdyer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
commit d2643145959659813f298a5085ebd7d9ba3d0369
Author: jdyer1 <jd...@apache.org>
AuthorDate: Tue Nov 21 11:19:30 2023 -0600
Fix test failure on J9: do not mock jre class
---
.../org/apache/solr/core/BlobRepositoryMockingTest.java | 15 ++++++---------
1 file changed, 6 insertions(+), 9 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 1e8e147af0b..ffee803287a 100644
--- a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
+++ b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
@@ -71,7 +71,8 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
super.setUp();
blobFetched = false;
blobKey = "";
- reset(mocks);
+ reset(mockContainer);
+ mapMock = new ConcurrentHashMap<>();
repository =
new BlobRepository(mockContainer) {
@Override
@@ -117,8 +118,7 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
assertNotNull(ref.blob);
assertEquals(blobData, ref.blob.get());
verify(mockContainer).isZooKeeperAware();
- verify(mapMock).get("foo!");
- verify(mapMock).put(eq("foo!"), any(BlobRepository.BlobContent.class));
+ assertTrue(mapMock.get("foo!") instanceof BlobRepository.BlobContent);
}
@Test
@@ -151,15 +151,14 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
@Test
public void testCachedAlready() {
when(mockContainer.isZooKeeperAware()).thenReturn(true);
- when(mapMock.get("foo!"))
- .thenReturn(new BlobRepository.BlobContent<BlobRepository>("foo!", blobData));
+ mapMock.put("foo!", new BlobRepository.BlobContent<BlobRepository>("foo!", blobData));
BlobRepository.BlobContentRef<ByteBuffer> ref = repository.getBlobIncRef("foo!");
assertEquals("", blobKey);
assertFalse(blobFetched);
assertNotNull(ref.blob);
assertEquals(blobData, ref.blob.get());
verify(mockContainer).isZooKeeperAware();
- verify(mapMock).get("foo!");
+ assertTrue(mapMock.get("foo!") instanceof BlobRepository.BlobContent);
}
@Test
@@ -191,8 +190,6 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
assertTrue(blobFetched);
assertNotNull(ref.blob);
assertEquals(PARSED, ref.blob.get());
- verify(mockContainer).isZooKeeperAware();
- verify(mapMock).get("foo!mocked");
- verify(mapMock).put(eq("foo!mocked"), any(BlobRepository.BlobContent.class));
+ verify(mockContainer).isZooKeeperAware();assertTrue(mapMock.get("foo!mocked") instanceof BlobRepository.BlobContent);
}
}
(solr) 02/02: BlobRepositoryMockingTest: cleanup
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdyer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 46b0ce0e02d88893722a310ff5294ea2848d8c14
Author: jdyer1 <jd...@apache.org>
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);
}
}