You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2017/02/19 08:20:08 UTC
lucene-solr:master: SOLR-9966: Fix previous commit bug
Repository: lucene-solr
Updated Branches:
refs/heads/master 6358afbea -> 54303260a
SOLR-9966: Fix previous commit bug
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/54303260
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/54303260
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/54303260
Branch: refs/heads/master
Commit: 54303260aa3b1c539fadb2bcaa5db04b46bd9a9d
Parents: 6358afb
Author: Cao Manh Dat <da...@apache.org>
Authored: Sun Feb 19 15:19:57 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sun Feb 19 15:19:57 2017 +0700
----------------------------------------------------------------------
.../org/apache/solr/handler/dataimport/TestJdbcDataSource.java | 3 +++
.../src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54303260/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
index df55b43..aed2ed4 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
@@ -35,6 +35,7 @@ import java.util.Properties;
import javax.sql.DataSource;
+import org.apache.lucene.util.Constants;
import org.apache.solr.handler.dataimport.JdbcDataSource.ResultSetIterator;
import static org.mockito.Mockito.*;
import org.junit.After;
@@ -484,6 +485,8 @@ public class TestJdbcDataSource extends AbstractDataImportHandlerTestCase {
@Test
public void testRetrieveFromDriverManager() throws Exception {
+ // in JDK9, Class.forName will throw exception for mock classes
+ if (Constants.JRE_IS_MINIMUM_JAVA9) return;
DriverManager.registerDriver(driver);
try {
when(driver.connect(notNull(),notNull())).thenReturn(connection);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54303260/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
index 96d1f55..d9c9feb 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
@@ -98,7 +98,7 @@ public class TestCoreAdminApis extends SolrTestCaseJ4 {
when(mockCC.getCoreRootDirectory()).thenReturn(Paths.get("coreroot"));
when(mockCC.getContainerProperties()).thenReturn(new Properties());
- when(mockCC.getRequestHandlers()).thenReturn((PluginBag<SolrRequestHandler>) out.get("getRequestHandlers"));
+ when(mockCC.getRequestHandlers()).thenAnswer(invocationOnMock -> out.get("getRequestHandlers"));
return mockCC;
}