Merge pull request #445 from telekom/feature/split-execution-file

Feature/ Split execution file to reduce initial load

Author: martingrossmann

core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/LogMessage.java

@@ -20,6 +20,8 @@
  */
  package eu.tsystems.mms.tic.testframework.report.model.context;
 
+import eu.tsystems.mms.tic.testframework.common.Testerra;
+import eu.tsystems.mms.tic.testframework.internal.IdGenerator;
 import eu.tsystems.mms.tic.testframework.logging.Loggable;
 import eu.tsystems.mms.tic.testframework.logging.Prompt;
 import java.util.Arrays;
@@ -42,6 +44,7 @@ public class LogMessage implements Serializable, Loggable {
     private final String message;
     private final Level level;
     private final boolean prompt;
+    private String id;
 
     /**
      * Creates a log message based on a Log4J log event
@@ -88,4 +91,11 @@ public Optional<Throwable> getThrown() {
     public boolean isPrompt() {
         return prompt;
     }
+
+    public String getId() {
+        if (this.id == null) {
+            this.id = Testerra.getInjector().getInstance(IdGenerator.class).generate().toString();
+        }
+        return this.id;
+    }
 }

report-model/src/main/java/eu/tsystems/mms/tic/testframework/adapters/ContextExporter.java

@@ -299,9 +299,8 @@ public TestStepAction.Builder buildTestStepAction(eu.tsystems.mms.tic.testframew
                 Optional<File.Builder> optional = Optional.ofNullable(builders[0]);
                 optional.ifPresent(file -> entryBuilder.setScreenshotId(file.getId()));
             } else if (entry instanceof eu.tsystems.mms.tic.testframework.report.model.context.LogMessage) {
-                eu.tsystems.mms.tic.testframework.report.model.context.LogMessage logEvent = (eu.tsystems.mms.tic.testframework.report.model.context.LogMessage) entry;
-                Optional<LogMessage.Builder> optional = Optional.ofNullable(buildLogMessage(logEvent));
-                optional.ifPresent(entryBuilder::setLogMessage);
+                String logMessageId = ((eu.tsystems.mms.tic.testframework.report.model.context.LogMessage) entry).getId();
+                entryBuilder.setLogMessageId(logMessageId);
             } else if (entry instanceof eu.tsystems.mms.tic.testframework.report.model.context.ErrorContext) {
                 eu.tsystems.mms.tic.testframework.report.model.context.ErrorContext errorContext = (eu.tsystems.mms.tic.testframework.report.model.context.ErrorContext) entry;
                 Optional<ErrorContext.Builder> optional = Optional.ofNullable(buildErrorContext(errorContext));
@@ -310,7 +309,7 @@ public TestStepAction.Builder buildTestStepAction(eu.tsystems.mms.tic.testframew
 
             if (
                     entryBuilder.hasErrorContext()
-                            || entryBuilder.hasLogMessage()
+                            || StringUtils.isNotBlank(entryBuilder.getLogMessageId())
                             || entryBuilder.hasClickPathEvent()
                             || StringUtils.isNotBlank(entryBuilder.getScreenshotId())
             ) {
@@ -435,6 +434,7 @@ public LogMessage.Builder buildLogMessage(eu.tsystems.mms.tic.testframework.repo
         builder.setTimestamp(logMessage.getTimestamp());
         builder.setThreadName(logMessage.getThreadName());
         builder.setPrompt(logMessage.isPrompt());
+        builder.setId(logMessage.getId());
 
         logMessage.getThrown().ifPresent(t -> {
             traceThrowable(t, throwable -> {
@@ -478,10 +478,7 @@ public ExecutionContext.Builder buildExecutionContext(eu.tsystems.mms.tic.testfr
         map(executionContext.getRunConfig(), this::buildRunConfig, builder::setRunConfig);
         executionContext.readExclusiveSessionContexts().forEach(sessionContext -> builder.addExclusiveSessionContextIds(sessionContext.getId()));
         apply(executionContext.getEstimatedTestMethodCount(), builder::setEstimatedTestsCount);
-        executionContext.readMethodContextLessLogs().forEach(logEvent -> {
-            Optional<LogMessage.Builder> optional = Optional.ofNullable(buildLogMessage(logEvent));
-            optional.ifPresent(builder::addLogMessages);
-        });
+        executionContext.readMethodContextLessLogs().forEach(logMessage -> builder.addLogMessageIds(logMessage.getId()));
         builder.putFailureCorridorLimits(FailureCorridorValue.FCV_HIGH_VALUE, FailureCorridor.getAllowedTestFailuresHIGH());
         builder.putFailureCorridorLimits(FailureCorridorValue.FCV_MID_VALUE, FailureCorridor.getAllowedTestFailuresMID());
         builder.putFailureCorridorLimits(FailureCorridorValue.FCV_LOW_VALUE, FailureCorridor.getAllowedTestFailuresLOW());