You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2017/02/19 11:22:07 UTC

lucene-solr:branch_6x: SOLR-9966: Do test-ignore properly

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 8a965def6 -> ccd9733fa


SOLR-9966: Do test-ignore properly


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ccd9733f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ccd9733f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ccd9733f

Branch: refs/heads/branch_6x
Commit: ccd9733fa24d9c783b544e2cb4a0278ba064e3fc
Parents: 8a965de
Author: Uwe Schindler <us...@apache.org>
Authored: Sun Feb 19 12:20:56 2017 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Sun Feb 19 12:21:52 2017 +0100

----------------------------------------------------------------------
 .../org/apache/solr/handler/dataimport/TestJdbcDataSource.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ccd9733f/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 aed2ed4..2f6b24c 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
@@ -485,8 +485,7 @@ 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;
+    assumeFalse("In Java 9, Class.forName() does not work for mock classes", Constants.JRE_IS_MINIMUM_JAVA9);
     DriverManager.registerDriver(driver);
     try {
       when(driver.connect(notNull(),notNull())).thenReturn(connection);