Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9107: Make SolrTestCaseJ4.beforeClass() / .afterClass() public

This commit is contained in:
Alan Woodward 2016-06-03 11:54:34 +01:00
parent 7f82139369
commit ec40824bfd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -318,6 +318,9 @@ Other Changes
* SOLR-9136: Separate out the error statistics into server-side error vs client-side error * SOLR-9136: Separate out the error statistics into server-side error vs client-side error
(Jessica Cheng Mallet via Erick Erickson) (Jessica Cheng Mallet via Erick Erickson)
* SOLR-9081: Make SolrTestCaseJ4.beforeClass() / .afterClass() public so it
works with Mockito (Georg Sorst, Alan Woodward)
================== 6.0.1 ================== ================== 6.0.1 ==================
(No Changes) (No Changes)

8
solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
View File

@ -216,9 +216,8 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
public TestRule solrTestRules = public TestRule solrTestRules =
RuleChain.outerRule(new SystemPropertiesRestoreRule()); RuleChain.outerRule(new SystemPropertiesRestoreRule());
@BeforeClass @BeforeClass
@SuppressWarnings("unused") public static void setupTestCases() {
private static void beforeClass() {
initCoreDataDir = createTempDir("init-core-data").toFile(); initCoreDataDir = createTempDir("init-core-data").toFile();
System.err.println("Creating dataDir: " + initCoreDataDir.getAbsolutePath()); System.err.println("Creating dataDir: " + initCoreDataDir.getAbsolutePath());
@ -242,8 +241,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
} }
@AfterClass @AfterClass
@SuppressWarnings("unused") public static void teardownTestCases() throws Exception {
private static void afterClass() throws Exception {
try { try {
deleteCore(); deleteCore();
resetExceptionIgnores(); resetExceptionIgnores();