Move test name rule out of test base

Author: shs96c

java/client/test/org/openqa/selenium/TakesScreenshotTest.java

@@ -20,7 +20,9 @@
 import com.google.common.collect.Sets;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestName;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.NotYetImplemented;
@@ -74,6 +76,9 @@
 
 public class TakesScreenshotTest extends JUnit4TestBase {
 
+  @Rule
+  public final TestName testName = new TestName();
+
   private TakesScreenshot screenshooter;
   private File tempFile = null;
 

java/client/test/org/openqa/selenium/firefox/TakesFullPageScreenshotTest.java

@@ -17,20 +17,17 @@
 
 package org.openqa.selenium.firefox;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
-
 import com.google.common.collect.Sets;
-
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestName;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.awt.image.Raster;
 import java.io.ByteArrayInputStream;
@@ -39,7 +36,10 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.imageio.ImageIO;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
 
 /**
  * Test screenshot feature.
@@ -68,6 +68,9 @@
 @Ignore(FIREFOX) // Not supported in legacy Firefox driver
 public class TakesFullPageScreenshotTest extends JUnit4TestBase {
 
+  @Rule
+  public final TestName testName = new TestName();
+
   private FirefoxDriver screenshooter;
   private File tempFile = null;
 

java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java

@@ -17,14 +17,10 @@
 
 package org.openqa.selenium.testing;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assumptions.assumeThat;
-
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.rules.RuleChain;
-import org.junit.rules.TestName;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
@@ -46,6 +42,9 @@
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
+
 @RunWith(SeleniumTestRunner.class)
 public abstract class JUnit4TestBase {
 
@@ -77,10 +76,7 @@ public void prepareEnvironment() {
 
     assertThat(hostName).isNotEqualTo(alternateHostName);
   }
-
-  @Rule
-  public TestName testName = new TestName();
-
+  
   @Rule
   public TestRule chain = RuleChain
     .outerRule(new TraceMethodNameRule())
@@ -200,9 +196,9 @@ public void evaluate() throws Throwable {
   }
 
   private void createDriver() {
-    System.out.println("CREATING DRIVER");
+    logger.info("CREATING DRIVER");
     driver = actuallyCreateDriver();
-    System.out.println("CREATED " + driver);
+    logger.info("CREATED " + driver);
     wait = new WebDriverWait(driver, Duration.ofSeconds(10));
     shortWait = new WebDriverWait(driver, Duration.ofSeconds(5));
   }