You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/02/15 19:00:25 UTC
[21/52] [abbrv] lucene-solr:jira/solr-9858: SOLR-8029: disabled
easymock for java9
SOLR-8029: disabled easymock for java9
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/563f5226
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/563f5226
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/563f5226
Branch: refs/heads/jira/solr-9858
Commit: 563f522643b5460e5b3bde1815f3f0b08c248eef
Parents: df02aa6
Author: Noble Paul <no...@gmail.com>
Authored: Mon Feb 13 07:28:16 2017 -0800
Committer: Noble Paul <no...@gmail.com>
Committed: Mon Feb 13 07:28:16 2017 -0800
----------------------------------------------------------------------
.../test/org/apache/solr/handler/admin/TestCoreAdminApis.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/563f5226/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 f263f5e..2df88dc 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
@@ -24,12 +24,14 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.apache.lucene.util.Constants;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag;
import org.easymock.EasyMock;
+import org.junit.BeforeClass;
import static org.apache.solr.common.util.Utils.fromJSONString;
import static org.easymock.EasyMock.anyBoolean;
@@ -38,6 +40,11 @@ import static org.easymock.EasyMock.getCurrentArguments;
public class TestCoreAdminApis extends SolrTestCaseJ4 {
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ assumeFalse("SOLR-9893: EasyMock does not work with Java 9", Constants.JRE_IS_MINIMUM_JAVA9);
+ }
+
public void testCalls() throws Exception {
Map<String, Object[]> calls = new HashMap<>();
CoreContainer mockCC = getCoreContainerMock(calls, new HashMap<>());