lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romseyg...@apache.org
Subject lucene-solr:branch_6x: SOLR-9107: Make SolrTestCaseJ4.beforeClass() / .afterClass() public
Date Fri, 03 Jun 2016 13:33:10 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 7f8213936 -> ec40824bf


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/ec40824b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ec40824b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ec40824b

Branch: refs/heads/branch_6x
Commit: ec40824bfd8dcc0c15e41f4f2e9693527ff5d296
Parents: 7f82139
Author: Alan Woodward <romseygeek@apache.org>
Authored: Fri Jun 3 11:54:34 2016 +0100
Committer: Alan Woodward <romseygeek@apache.org>
Committed: Fri Jun 3 14:32:58 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/ec40824b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e7a8382..e13879e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -318,6 +318,9 @@ Other Changes
 * SOLR-9136: Separate out the error statistics into server-side error vs client-side error
   (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 ==================
 (No Changes)
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ec40824b/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 18c9d2e..2974a86 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -216,9 +216,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());
@@ -242,8 +241,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();


Mime
View raw message