Multi Target Trx Issue : LogFilePrefix Parameter Added (#2140)

* MultiTarget Trx Issue LogFilePrefix Parameter Added
microsoft · Sep 11, 2019 · 32a75bd · 32a75bd
1 parent fb76594
commit 32a75bd
Show file tree

Hide file tree

Showing 24 changed files with 283 additions and 30 deletions.
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsUtilities.cs b/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsUtilities.cs
@@ -47,6 +47,23 @@ public static string GetTestResultsDirectory(RunConfiguration runConfiguration)
  return resultsDirectory;
  }
 
+ /// <summary>
+ /// Gets the target framework from the run configuration
+ /// </summary>
+ /// <param name="runConfiguration">Test run configuration</param>
+ /// <returns>Target Framework</returns>
+ public static Framework GetTargetFramework(RunConfiguration runConfiguration)
+ {
+ Framework targetFramework = null;
+ if (runConfiguration != null)
+ {
+ // It will get target framework from runsettings 
+ targetFramework = runConfiguration.TargetFramework;
+ }
+
+ return targetFramework;
+ }
+
  /// <summary>
  /// Gets the solution directory from run configuration
  /// </summary>

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestLoggerManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestLoggerManager.cs
@@ -47,6 +47,11 @@ internal class TestLoggerManager : ITestLoggerManager
  /// </summary>
  private string testRunDirectory;
 
+ /// <summary>
+ /// Target framework.
+ /// </summary>
+ private string targetFramework;
+
  /// <summary>
  /// Test Logger Events instance which will be passed to loggers when they are initialized.
  /// </summary>
@@ -139,6 +144,7 @@ public void Initialize(string runSettings)
 
  // Store test run directory. This runsettings is the final runsettings merging CLI args and runsettings.
  this.testRunDirectory = GetResultsDirectory(runSettings);
+ this.targetFramework = GetTargetFramework(runSettings)?.Name;
 
  var loggers = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettings);
 
@@ -454,6 +460,33 @@ internal string GetResultsDirectory(string runSettings)
  return resultsDirectory;
  }
 
+ /// <summary>
+ /// Gets the target framework of the test run.
+ /// </summary>
+ /// <param name="runSettings">Test run settings.</param>
+ /// <returns>Target framework</returns>
+ internal Framework GetTargetFramework(string runSettings)
+ {
+ Framework targetFramework = null;
+ if (runSettings != null)
+ {
+ try
+ {
+ RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
+ targetFramework = RunSettingsUtilities.GetTargetFramework(runConfiguration);
+ }
+ catch (SettingsException se)
+ {
+ if (EqtTrace.IsErrorEnabled)
+ {
+ EqtTrace.Error("TestLoggerManager.GetResultsDirectory: Unable to get the target framework: Error {0}", se);
+ }
+ }
+ }
+
+ return targetFramework;
+ }
+
  /// <summary>
  /// Enables sending of events to the loggers which are registered.
  /// </summary>
@@ -582,9 +615,9 @@ private bool InitializeLogger(object logger, string extensionUri, Dictionary<str
  }
  catch (Exception ex)
  {
+ var loggerUri = string.IsNullOrEmpty(extensionUri) ? logger.GetType().ToString() : extensionUri;
  EqtTrace.Error(
- "TestLoggerManager: Error while initializing logger: {0}, Exception details: {1}",
- string.IsNullOrEmpty(extensionUri) ? logger.GetType().ToString() : extensionUri, ex);
+ "TestLoggerManager: Error while initializing logger: {0}, Exception details: {1}", loggerUri, ex);
 
  this.messageLogger.SendMessage(
  TestMessageLevel.Error,
@@ -594,7 +627,8 @@ private bool InitializeLogger(object logger, string extensionUri, Dictionary<str
  string.IsNullOrEmpty(extensionUri) ? "type" : "uri",
  string.IsNullOrEmpty(extensionUri) ? logger.GetType().ToString() : extensionUri,
  ex));
- return false;
+
+ throw new InvalidLoggerException($"Error while initializing logger: {loggerUri}, Exception details: {ex.Message}");
  }
 
  return true;
@@ -613,6 +647,7 @@ private Dictionary<string, string> UpdateLoggerParameters(Dictionary<string, str
 
  // Add default logger parameters...
  loggerParams[DefaultLoggerParameterNames.TestRunDirectory] = testRunDirectory;
+ loggerParams[DefaultLoggerParameterNames.TargetFramework] = targetFramework;
  return loggerParams;
  }
 

diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.Designer.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.Designer.cs
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.resx b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.resx
@@ -211,4 +211,7 @@ Error Details: {1}:{2}</value>
  <data name="TrxLoggerResultsFileOverwriteWarning" xml:space="preserve">
  <value>WARNING: Overwriting results file: {0}</value>
  </data>
+ <data name="PrefixAndNameProvidedError" xml:space="preserve">
+ <value>The parameters LogFileName and LogFilePrefix cannot be used together. </value>
+ </data>
 </root>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.cs.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.cs.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">UPOZORNĚNÍ: Přepíše se soubor výsledků: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.de.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.de.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">WARNUNG: Ergebnisdatei wird überschrieben: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.es.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.es.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">ADVERTENCIA: Se sobrescribirá el archivo de resultados: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.fr.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.fr.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">AVERTISSEMENT : Fichier de résultats en cours de remplacement : {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.it.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.it.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">AVVISO: il file dei risultati {0} verrà sovrascritto</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ja.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ja.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">警告: 結果ファイルを上書きしています: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ko.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ko.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">경고: 결과 파일을 덮어쓰는 중: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pl.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pl.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">OSTRZEŻENIE: Plik wynikowy jest zastępowany: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pt-BR.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pt-BR.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">AVISO: sobrescrevendo o arquivo de resultados: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ru.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ru.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">Внимание! Перезапись файла с результатами: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.tr.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.tr.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">UYARI: Sonuç dosyasının üzerine yazılıyor: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf
@@ -128,6 +128,11 @@ Error Details: {1}:{2}</source>
  <target state="new">WARNING: Overwriting results file: {0}</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hans.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hans.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">警告: 正在覆盖结果文件: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hant.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hant.xlf
@@ -298,6 +298,11 @@ Fehlerdetails: {1}: {2}</target>
  <target state="translated">警告: 將要覆寫結果檔案: {0}</target>
  <note />
  </trans-unit>
+ <trans-unit id="PrefixAndNameProvidedError">
+ <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
+ <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>