Fix issue 390. Fix sessionlog test

Author: smccarthy-godaddy

SeleniumGridExtras/pom.xml

@@ -19,7 +19,7 @@
     </repositories>
 
     <properties>
-        <version.selenium>3.7.1</version.selenium>
+        <version.selenium>3.8.1</version.selenium>
     </properties>
 
     <dependencies>

SeleniumGridExtras/src/main/java/com/groupon/seleniumgridextras/grid/proxies/SetupTeardownProxy.java

@@ -58,6 +58,7 @@
 import org.openqa.grid.internal.listeners.TestSessionListener;
 import org.openqa.grid.selenium.proxy.DefaultRemoteProxy;
 import org.openqa.selenium.remote.CapabilityType;
+import org.openqa.selenium.remote.server.jmx.ManagedService;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -69,7 +70,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-
+@ManagedService(description = "Selenium-Grid-Extras SetupTeardownProxy")
 public class SetupTeardownProxy extends DefaultRemoteProxy implements TestSessionListener {
 
     private boolean available = true;
@@ -107,7 +108,7 @@ public TestSession getNewSession(Map<String, Object> requestedCapability) {
 
             String host = session.getSlot().getRemoteURL().getHost();
             int port = getNodeExtrasPort(session);
-         
+
             logNewSessionHistoryAsync(session);
 
             CommonThreadPool.startCallable(
@@ -304,10 +305,10 @@ public static Future<String> logNewSessionHistoryAsync(TestSession session) {
         }
         return null;
     }
-    
+
     public static int getNodeExtrasPort(TestSession session){
         try {
-            
+
             String port = session.getSlot().getProxy().getConfig().custom.get(Config.GRID_EXTRAS_PORT);
             if(port!= null || ! port.equals("")) {
                 return Integer.parseInt(port);

SeleniumGridExtras/src/test/java/com/groupon/seleniumgridextras/grid/proxies/sessions/threads/SetupTeardownProxyTest.java

@@ -7,6 +7,8 @@
 import com.groupon.seleniumgridextras.config.RuntimeConfig;
 import com.groupon.seleniumgridextras.config.capabilities.BrowserType;
 import com.groupon.seleniumgridextras.grid.proxies.SetupTeardownProxy;
+import com.groupon.seleniumgridextras.loggers.SessionHistoryLog;
+
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Assert;
@@ -19,6 +21,8 @@
 
 import java.io.File;
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Future;
 
@@ -85,6 +89,12 @@ public void testLogSessionWithSessionHistoryEnabled() throws Exception {
         Assert.assertTrue(!Strings.isNullOrEmpty(result));
 
         File sessionLogDir = DefaultConfig.SESSION_LOG_DIRECTORY;
+        SessionHistoryLog.setOutputDir(sessionLogDir);
+        Map sessionInfo = new HashMap();
+        sessionInfo.put("id", "123456");
+        sessionInfo.put("stuff", "stuff");
+        SessionHistoryLog.newSession("node", sessionInfo);
+
         Assert.assertTrue("Expect the session log directory to exist!", sessionLogDir.exists());
         Assert.assertTrue("Expect the session log directory to be a directory!", sessionLogDir.isDirectory());
         Assert.assertTrue("Expect the session log directory to have a file!", sessionLogDir.list().length > 0);