You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2016/06/03 13:32:04 UTC
lucene-solr:master: SOLR-9107: Make SolrTestCaseJ4.beforeClass() /
.afterClass() public
Repository: lucene-solr
Updated Branches:
refs/heads/master 1eb6c9f81 -> aed3fc11b
SOLR-9107: Make SolrTestCaseJ4.beforeClass() / .afterClass() public
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/aed3fc11
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/aed3fc11
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/aed3fc11
Branch: refs/heads/master
Commit: aed3fc11b18c75ec23416579276dc70c87103c37
Parents: 1eb6c9f
Author: Alan Woodward <ro...@apache.org>
Authored: Fri Jun 3 11:54:34 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Fri Jun 3 11:54:34 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 8 +++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/aed3fc11/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d96b1e6..fa84d56 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -351,6 +351,9 @@ Other Changes
* SOLR-9107: new @RandomizeSSL annotation for more fine grained control of SSL testing (hossman, sarowe)
+* SOLR-9081: Make SolrTestCaseJ4.beforeClass() / .afterClass() public so it
+ works with Mockito (Georg Sorst, Alan Woodward)
+
================== 6.0.1 ==================
(No Changes)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/aed3fc11/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 41554c6..db12784 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -218,9 +218,8 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
public TestRule solrTestRules =
RuleChain.outerRule(new SystemPropertiesRestoreRule());
- @BeforeClass
- @SuppressWarnings("unused")
- private static void beforeClass() {
+ @BeforeClass
+ public static void setupTestCases() {
initCoreDataDir = createTempDir("init-core-data").toFile();
System.err.println("Creating dataDir: " + initCoreDataDir.getAbsolutePath());
@@ -244,8 +243,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
}
@AfterClass
- @SuppressWarnings("unused")
- private static void afterClass() throws Exception {
+ public static void teardownTestCases() throws Exception {
try {
deleteCore();
resetExceptionIgnores();