Improvements/session logging

core/src/main/java/eu/tsystems/mms/tic/testframework/report/TesterraListener.java

@@ -51,6 +51,8 @@
 import eu.tsystems.mms.tic.testframework.report.model.steps.TestStep;
 import eu.tsystems.mms.tic.testframework.report.utils.DefaultTestNGContextGenerator;
 import eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextController;
+import java.util.Locale;
+import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.apache.logging.log4j.core.config.DefaultConfiguration;
@@ -110,6 +112,11 @@ public class TesterraListener implements
     private static DefaultTestNGContextGenerator contextGenerator;
 
     static {
+        String logLevel = PropertyManager.getProperty("log4j.level");
+        if (logLevel != null) {
+            Level desiredLogLevel = Level.valueOf(logLevel.trim().toUpperCase(Locale.ROOT));
+            Configurator.setRootLevel(desiredLogLevel);
+        }
         DefaultConfiguration defaultConfiguration = new DefaultConfiguration();
         loggerContext = Configurator.initialize(defaultConfiguration);
         buildInformation = new BuildInformation();

docs/src/docs/gettingstarted/logging.adoc

@@ -8,3 +8,9 @@ If you want to have more control over several log levels of classes, add a `log4
 ----
 include::../../res/log4j2.xml[]
 ----
+
+You can also change the root log level from the command line via.
+[source, bash]
+----
+-Dlog4j.level=DEBUG
+----

driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverSessionsManager.java

@@ -109,6 +109,8 @@ static void storeWebDriverSession(AbstractWebDriverRequest webDriverRequest, Web
     }
 
     private static void unlinkFromThread(String sessionKey, WebDriver eventFiringWebDriver) {
+        final String sessionIdentifier = createSessionIdentifier(eventFiringWebDriver, sessionKey);
+        LOGGER.trace("Unlink from thread: " + sessionIdentifier);
         String threadSessionKey = getThreadSessionKey(sessionKey);
         THREAD_SESSION_KEY_WEBDRIVER_MAP.remove(threadSessionKey, eventFiringWebDriver);
 
@@ -197,6 +199,7 @@ public static void shutdownWebDriver(WebDriver webDriver) {
 
         beforeQuitActions.forEach(webDriverConsumer -> {
             try {
+                LOGGER.trace("Call before shutdown handler");
                 webDriverConsumer.accept(webDriver);
             } catch (Exception e) {
                 LOGGER.error("Failed executing before shutdown handler", e);
@@ -207,13 +210,15 @@ public static void shutdownWebDriver(WebDriver webDriver) {
 
         afterQuitActions.forEach(webDriverConsumer -> {
             try {
+                LOGGER.trace("Call after shutdown handler");
                 webDriverConsumer.accept(webDriver);
             } catch (Exception e) {
                 LOGGER.error("Failed executing after shutdown handler", e);
             }
         });
         unlinkFromThread(sessionKey, webDriver);
         WEBDRIVER_SESSIONS_CONTEXTS_MAP.remove(WebDriverUtils.getLowestWebDriver(webDriver));
+        LOGGER.debug("Shut down: " + sessionIdentifier);
     }
 
 

report-ng/app/src/app.scss

@@ -62,7 +62,8 @@ html {
 }
 
 .code-view {
-    padding: 0.5rem;
+    padding: 0.5em;
+    font-size: 14px;
     background-color: #2b2b2b;
     //@extend .secondary;
     //border: 2px solid #495561; /*gray-300*/
@@ -73,6 +74,13 @@ html {
     line-height: 1.5em;
     font-family: monospace;
     word-break: break-all;
+
+    a {
+        color: cornflowerblue;
+    }
+    //a:visited {
+    //    color: #c0dee0;
+    //}
     //
     //.line {
     //    padding: 0.3em;

report-ng/app/src/components/log-view/log-view.html

@@ -26,7 +26,7 @@
              class.bind="(logMessage.type==1?'error':(logMessage.type==2?'warn':''))"
         >
             <let logger.bind="_statusConverter.separateNamespace(logMessage.loggerName)"></let>
-            <div class="indicator"><span if.bind="logMessage.stackTrace.length>0" click.delegate="_toggleCause(logMessage)" class="clickable" innerhtml.bind="logMessage.cause?'-':'+'"></span></div>${logMessage.timestamp|dateFormat:"HH:mm:ss.SSS"}<span if.bind="_showThreads"> [${logMessage.threadName}]</span> [${logMessage.type|logLevel}]: <span title="${logger.package}.${logger.class}">${logger.class}</span> - <span innerhtml.bind="logMessage.message|highlightText:search"></span>
+            <div class="indicator"><span if.bind="logMessage.stackTrace.length>0" click.delegate="_toggleCause(logMessage)" class="clickable" innerhtml.bind="logMessage.cause?'-':'+'"></span></div>${logMessage.timestamp|dateFormat:"HH:mm:ss.SSS"}<span if.bind="logMessage.methodContext"> [<a route-href="route: method; params.bind: {methodId: logMessage.methodContext.contextValues.id}">${logMessage.threadName}</a>]</span> [${logMessage.type|logLevel}]: <span title="${logger.package}.${logger.class}">${logger.class}</span> - <span innerhtml.bind="logMessage.message|highlightText:search"></span>
             <div if.bind="logMessage.cause" innerhtml.bind="logMessage.cause|highlightText:search"></div>
         </div>
         <div if.bind="_filteredLogMessages.length == 0" class="line">(No log messages matching this criteria)</div>

report-ng/app/src/components/log-view/log-view.ts

@@ -22,14 +22,8 @@
 import {autoinject} from "aurelia-framework";
 import {bindable} from "aurelia-templating";
 import {bindingMode} from "aurelia-binding";
-import {data} from "../../services/report-model";
-import ILogMessage = data.ILogMessage;
 import {StatusConverter} from "../../services/status-converter";
-
-interface LogMessage extends ILogMessage {
-    index:number,
-    cause:string;
-}
+import {ILogEntry} from "../../services/statistics-generator";
 
 @autoinject()
 export class LogView {
@@ -40,27 +34,27 @@ export class LogView {
     }
 
     @bindable({bindingMode: bindingMode.toView})
-    logMessages:LogMessage[];
+    logMessages:ILogEntry[];
 
-    private _filteredLogMessages:LogMessage[];
+    private _filteredLogMessages:ILogEntry[];
 
-    @bindable({bindingMode: bindingMode.toView})
-    showThreads;
+    // @bindable({bindingMode: bindingMode.toView})
+    // showThreads;
 
-    private _showThreads = false;
+    // private _showThreads = false;
 
     @bindable({bindingMode: bindingMode.toView})
     search:RegExp;
 
-    private _toggleCause(logMessage:LogMessage) {
+    private _toggleCause(logMessage:ILogEntry) {
         if (logMessage.cause) {
             logMessage.cause = null;
         } else {
             this._open(logMessage);
         }
     }
 
-    private _open(logMessage:LogMessage) {
+    private _open(logMessage:ILogEntry) {
         let msg = "";
         logMessage.stackTrace.forEach(cause => {
             if (msg.length > 0) {
@@ -100,7 +94,7 @@ export class LogView {
         this._filter();
     }
 
-    showThreadsChanged() {
-        this._showThreads = this.showThreads.toLowerCase() === "true";
-    }
+    // showThreadsChanged() {
+    //     this._showThreads = this.showThreads.toLowerCase() === "true";
+    // }
 }

report-ng/app/src/components/logs/logs.ts

@@ -22,16 +22,15 @@
 import {autoinject} from 'aurelia-framework';
 import {NavigationInstruction, RouteConfig} from "aurelia-router";
 import {AbstractViewModel} from "../abstract-view-model";
-import {StatisticsGenerator} from "../../services/statistics-generator";
-import {StatusConverter} from "../../services/status-converter";
-import {data} from "../../services/report-model";
-import ILogMessage = data.ILogMessage;
+import {ILogEntry, StatisticsGenerator} from "services/statistics-generator";
+import {StatusConverter} from "services/status-converter";
+import {data} from "services/report-model";
 
 @autoinject()
 export class Logs extends AbstractViewModel {
     private _searchRegexp: RegExp;
     private _loading = false;
-    private _logMessages:ILogMessage[];
+    private _logMessages:ILogEntry[];
     private _availableLogLevels;
     private _selectedLogLevel;
 
@@ -57,33 +56,39 @@ export class Logs extends AbstractViewModel {
 
         this._loading = true;
         this._statistics.getExecutionStatistics().then(executionStatistics => {
-            const logMessages:ILogMessage[] = [];
+            const logMessages:ILogEntry[] = [];
             const logLevels = {};
 
-            const filterPredicate = (this._selectedLogLevel?(logMessage:ILogMessage) => this._selectedLogLevel == logMessage.type:(logMessage:ILogMessage) => logMessage);
+            const filterPredicate = (this._selectedLogLevel?(logMessage:data.ILogMessage) => this._selectedLogLevel == logMessage.type:(logMessage:data.ILogMessage) => logMessage);
 
-            const addLevel = (value:ILogMessage) => {
-                logLevels[value.type] = 1;
-                return value;
+            const collectLogLevel = (logMessage:data.ILogMessage) => {
+                logLevels[logMessage.type] = 1;
+                return logMessage;
+            }
+
+            const add = (logEntry:ILogEntry) => {
+                logMessages.push(logEntry)
             }
 
             executionStatistics.executionAggregate.executionContext.logMessages
-                .map(addLevel)
+                .map(collectLogLevel)
                 .filter(filterPredicate)
-                .forEach(value => {
-                    logMessages.push(value);
-                });
+                .forEach(add)
 
             Object.values(executionStatistics.executionAggregate.methodContexts)
-                .flatMap(value => value.testSteps)
-                .flatMap(value => value.actions)
-                .flatMap(value => value.entries)
-                .filter(value => value.logMessage)
-                .map(value => value.logMessage)
-                .map(addLevel)
-                .filter(filterPredicate)
-                .forEach(value => {
-                    logMessages.push(value)
+                .forEach(methodContext => {
+                    methodContext.testSteps
+                        .flatMap(value => value.actions)
+                        .flatMap(value => value.entries)
+                        .filter(value => value.logMessage)
+                        .map(value => {
+                            const logEntry: ILogEntry = value.logMessage;
+                            logEntry.methodContext = methodContext;
+                            return logEntry;
+                        })
+                        .map(collectLogLevel)
+                        .filter(filterPredicate)
+                        .forEach(add)
                 });
 
             this._logMessages = logMessages.sort((a, b) => a.timestamp-b.timestamp);

report-ng/app/src/services/statistics-generator.ts

@@ -25,12 +25,7 @@ import {ClassStatistics, ExecutionStatistics, FailureAspectStatistics} from "./s
 import {CacheService} from "t-systems-aurelia-components/src/services/cache-service";
 import {Config} from "./config-dev";
 import {data} from "./report-model";
-import IFile = data.IFile;
-import IMethodContext = data.IMethodContext;
 import {StatusConverter} from "./status-converter";
-import ITestContext = data.ITestContext;
-import ISuiteContext = data.ISuiteContext;
-import ISessionContext = data.ISessionContext;
 
 export class FailsAnnotation {
     constructor(
@@ -42,20 +37,26 @@ export class FailsAnnotation {
     }
 }
 
+export interface ILogEntry extends data.ILogMessage {
+    methodContext?: data.IMethodContext;
+    index?:number,
+    cause?:string;
+}
+
 export class MethodDetails {
     executionStatistics: ExecutionStatistics;
-    testContext: ITestContext;
-    suiteContext: ISuiteContext;
+    testContext: data.ITestContext;
+    suiteContext: data.ISuiteContext;
     failureAspectStatistics:FailureAspectStatistics;
-    sessionContexts:ISessionContext[];
+    sessionContexts:data.ISessionContext[];
     private _identifier:string = null;
     static readonly FAIL_ANNOTATION_NAME="eu.tsystems.mms.tic.testframework.annotations.Fails";
     private _decodedAnnotations = {};
     private _decodedCustomContexts = {};
     private _failsAnnotation:FailsAnnotation;
 
     constructor(
-        readonly methodContext:IMethodContext,
+        readonly methodContext:data.IMethodContext,
         readonly classStatistics:ClassStatistics,
     ) {
     }
@@ -185,7 +186,7 @@ export class StatisticsGenerator {
         });
     }
 
-    getScreenshotIdsFromMethodContext(methodContext:IMethodContext):string[] {
+    getScreenshotIdsFromMethodContext(methodContext:data.IMethodContext):string[] {
         return methodContext.testSteps
             .flatMap(value => value.actions)
             .flatMap(value => value.entries)
@@ -194,7 +195,7 @@ export class StatisticsGenerator {
     }
 
     getFilesForIds(fileIds:string[]) {
-        const files:IFile[] = [];
+        const files:data.IFile[] = [];
         const allFilePromises = [];
         fileIds.forEach(fileId => {
             const loadingPromise = this._getFileForId(fileId).then(file => {