Add before and after logging for unit tests

Currently we have these logs for integration tests only.

This adds the following log at the start:
```
logger.info("[{}]: before test", getTestName());
```

and this is logged at the end, but before any clean up done in sub classes

```
 logger.info("[{}]: after test", getTestName());
```

Author: bleskes

core/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java

@@ -62,7 +62,7 @@ public class ParentChildFieldDataTests extends AbstractFieldDataTestCase {
     private final String grandChildType = "grand-child";
 
     @Before
-    public void before() throws Exception {
+    public void setupData() throws Exception {
         mapperService.merge(
                 childType, new CompressedXContent(PutMappingRequest.buildFromSimplifiedDef(childType, "_parent", "type=" + parentType).string()), MapperService.MergeReason.MAPPING_UPDATE, false
         );

core/src/test/java/org/elasticsearch/index/mapper/AbstractNumericFieldMapperTestCase.java

@@ -43,7 +43,7 @@ public abstract class AbstractNumericFieldMapperTestCase extends ESSingleNodeTes
     protected DocumentMapperParser parser;
 
     @Before
-    public void before() {
+    public void setup() {
         indexService = createIndex("test");
         parser = indexService.mapperService().documentMapperParser();
         setTypeList();

core/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java

@@ -38,11 +38,6 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.DocumentMapper;
-import org.elasticsearch.index.mapper.DocumentMapperParser;
-import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.index.mapper.ParseContext.Document;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
@@ -62,7 +57,7 @@ public class BooleanFieldMapperTests extends ESSingleNodeTestCase {
     DocumentMapperParser parser;
 
     @Before
-    public void before() {
+    public void setup() {
         indexService = createIndex("test");
         parser = indexService.mapperService().documentMapperParser();
     }

core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java

@@ -48,7 +48,7 @@ public class DateFieldMapperTests extends ESSingleNodeTestCase {
     DocumentMapperParser parser;
 
     @Before
-    public void before() {
+    public void setup() {
         indexService = createIndex("test");
         parser = indexService.mapperService().documentMapperParser();
     }

core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java

@@ -32,31 +32,26 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.DocumentMapper;
-import org.elasticsearch.index.mapper.DocumentMapperParser;
-import org.elasticsearch.index.mapper.IpFieldMapper;
-import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 import org.elasticsearch.test.InternalSettingsPlugin;
 import org.elasticsearch.test.VersionUtils;
 import org.junit.Before;
 
-import static com.carrotsearch.randomizedtesting.RandomizedTest.getRandom;
-import static org.hamcrest.Matchers.containsString;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.Collection;
 
+import static com.carrotsearch.randomizedtesting.RandomizedTest.getRandom;
+import static org.hamcrest.Matchers.containsString;
+
 public class IpFieldMapperTests extends ESSingleNodeTestCase {
 
     IndexService indexService;
     DocumentMapperParser parser;
 
     @Before
-    public void before() {
+    public void setup() {
         indexService = createIndex("test");
         parser = indexService.mapperService().documentMapperParser();
     }

core/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java

@@ -55,7 +55,7 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
     DocumentMapperParser parser;
 
     @Before
-    public void before() {
+    public void setup() {
         indexService = createIndex("test");
         parser = indexService.mapperService().documentMapperParser();
     }

core/src/test/java/org/elasticsearch/index/mapper/LegacyStringMappingTests.java

@@ -73,7 +73,7 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
     DocumentMapperParser parser;
 
     @Before
-    public void before() {
+    public void setup() {
         indexService = createIndex("test",
                 // we need 2.x since string is deprecated in 5.0
                 Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_2_3_0).build());

core/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java

@@ -25,15 +25,8 @@
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.DocumentMapper;
-import org.elasticsearch.index.mapper.DocumentMapperParser;
-import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 import org.elasticsearch.test.InternalSettingsPlugin;
@@ -52,7 +45,7 @@ public class ScaledFloatFieldMapperTests extends ESSingleNodeTestCase {
     DocumentMapperParser parser;
 
     @Before
-    public void before() {
+    public void setup() {
         indexService = createIndex("test");
         parser = indexService.mapperService().documentMapperParser();
     }

core/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java

@@ -63,7 +63,7 @@ public class TextFieldMapperTests extends ESSingleNodeTestCase {
     DocumentMapperParser parser;
 
     @Before
-    public void before() {
+    public void setup() {
         indexService = createIndex("test");
         parser = indexService.mapperService().documentMapperParser();
     }

core/src/test/java/org/elasticsearch/search/SearchCancellationTests.java

@@ -44,7 +44,7 @@ public class SearchCancellationTests extends ESTestCase {
     static IndexReader reader;
 
     @BeforeClass
-    public static void before() throws IOException {
+    public static void setup() throws IOException {
         dir = newDirectory();
         RandomIndexWriter w = new RandomIndexWriter(random(), dir);
         // we need at least 2 segments - so no merges should be allowed
@@ -66,7 +66,7 @@ private static void indexRandomDocuments(RandomIndexWriter w, int numDocs) throw
     }
 
     @AfterClass
-    public static void after() throws IOException {
+    public static void cleanup() throws IOException {
         IOUtils.close(reader, dir);
         dir = null;
         reader = null;

core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java

@@ -56,7 +56,7 @@ public class QueryProfilerTests extends ESTestCase {
     static ContextIndexSearcher searcher;
 
     @BeforeClass
-    public static void before() throws IOException {
+    public static void setup() throws IOException {
         dir = newDirectory();
         RandomIndexWriter w = new RandomIndexWriter(random(), dir);
         final int numDocs = TestUtil.nextInt(random(), 1, 20);
@@ -76,7 +76,7 @@ public static void before() throws IOException {
     }
 
     @AfterClass
-    public static void after() throws IOException {
+    public static void cleanup() throws IOException {
         IOUtils.close(reader, dir);
         dir = null;
         reader = null;

modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/TemplateQueryBuilderTests.java

@@ -104,7 +104,7 @@ protected Map<String, Function<Map<String, Object>, Object>> pluginScripts() {
     }
 
     @Before
-    public void before() {
+    public void setup() {
         templateBase = new MatchQueryBuilder("field", "some values");
     }
 

plugins/mapper-murmur3/src/test/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapperTests.java

@@ -55,7 +55,7 @@ public class Murmur3FieldMapperTests extends ESSingleNodeTestCase {
     DocumentMapperParser parser;
 
     @Before
-    public void before() {
+    public void setup() {
         indexService = createIndex("test");
         mapperRegistry = new MapperRegistry(
                 Collections.singletonMap(Murmur3FieldMapper.CONTENT_TYPE, new Murmur3FieldMapper.TypeParser()),

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

@@ -1982,19 +1982,17 @@ private static boolean runTestScopeLifecycle() {
 
 
     @Before
-    public final void before() throws Exception {
-
+    public final void setupTestCluster() throws Exception {
         if (runTestScopeLifecycle()) {
-            printTestMessage("setup");
+            printTestMessage("setting up");
             beforeInternal();
+            printTestMessage("all set up");
         }
-        printTestMessage("starting");
     }
 
 
     @After
-    public final void after() throws Exception {
-        printTestMessage("finished");
+    public final void cleanUpCluster() throws Exception {
         // Deleting indices is going to clear search contexts implicitly so we
         // need to check that there are no more in-flight search contexts before
         // we remove indices

test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java

@@ -229,9 +229,17 @@ public static void restoreContentType() {
         Requests.INDEX_CONTENT_TYPE = XContentType.JSON;
     }
 
+    @Before
+    public final void before()  {
+        logger.info("[{}]: before test", getTestName());
+    }
+
     @After
-    public final void ensureCleanedUp() throws Exception {
+    public final void after() throws Exception {
         checkStaticState();
+        ensureAllSearchContextsReleased();
+        ensureCheckIndexPassed();
+        logger.info("[{}]: after test", getTestName());
     }
 
     private static final List<StatusData> statusData = new ArrayList<>();
@@ -277,7 +285,6 @@ protected static void checkStaticState() throws Exception {
     }
 
     // this must be a separate method from other ensure checks above so suite scoped integ tests can call...TODO: fix that
-    @After
     public final void ensureAllSearchContextsReleased() throws Exception {
         assertBusy(() -> MockSearchService.assertNoInFlightContext());
     }
@@ -293,7 +300,6 @@ public final void resetCheckIndexStatus() throws Exception {
         checkIndexFailed = false;
     }
 
-    @After
     public final void ensureCheckIndexPassed() throws Exception {
         assertFalse("at least one shard failed CheckIndex", checkIndexFailed);
     }

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -123,7 +123,7 @@ public void initClient() throws IOException {
      * Clean up after the test case.
      */
     @After
-    public final void after() throws Exception {
+    public final void cleanUpCluster() throws Exception {
         wipeCluster();
         logIfThereAreRunningTasks();
     }

test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java

@@ -34,7 +34,6 @@
 import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.NodeConfigurationSource;
 import org.elasticsearch.test.discovery.TestZenDiscovery;
-import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.elasticsearch.transport.MockTcpTransportPlugin;
 import org.elasticsearch.transport.TransportSettings;
 import org.hamcrest.Matcher;
@@ -409,9 +408,7 @@ public Settings transportClientSettings() {
         }
     }
 
-    @TestLogging("_root:DEBUG")
     public void testTwoNodeCluster() throws Exception {
-        final boolean autoManageMinMasterNodes = randomBoolean();
         NodeConfigurationSource nodeConfigurationSource = new NodeConfigurationSource() {
             @Override
             public Settings nodeSettings(int nodeOrdinal) {
@@ -430,7 +427,7 @@ public Settings transportClientSettings() {
         boolean enableHttpPipelining = randomBoolean();
         String nodePrefix = "test";
         Path baseDir = createTempDir();
-        InternalTestCluster cluster = new InternalTestCluster(randomLong(), baseDir, false, autoManageMinMasterNodes, 2, 2,
+        InternalTestCluster cluster = new InternalTestCluster(randomLong(), baseDir, false, true, 2, 2,
             "test", nodeConfigurationSource, 0, enableHttpPipelining, nodePrefix,
             Arrays.asList(MockTcpTransportPlugin.class, TestZenDiscovery.TestPlugin.class), Function.identity());
         try {