Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2273,10 +2273,12 @@ public void DotNetNewAndroidTest (string mode, AndroidRuntime runtime)
Assert.IsTrue (dotnet.Build (target: "Install", parameters: buildParameters.ToArray ()), "`dotnet build -t:Install` should succeed");

// Run based on mode
var runParameters = buildParameters.Select (p => $"/p:{p}").ToArray ();
var runParameters = buildParameters.Select (p => $"/p:{p}").ToList ();
if (mode == "test")
runParameters.Add ("--report-trx");
using var process = mode == "run"
? dotnet.StartRun (waitForExit: true, parameters: runParameters)
: dotnet.StartTest (parameters: runParameters);
? dotnet.StartRun (waitForExit: true, parameters: runParameters.ToArray ())
: dotnet.StartTest (parameters: runParameters.ToArray ());

var locker = new Lock ();
var output = new StringBuilder ();
Expand Down Expand Up @@ -2329,6 +2331,15 @@ public void DotNetNewAndroidTest (string mode, AndroidRuntime runtime)
StringAssert.Contains ("succeeded: 1", outputText, $"Output should report 1 passed test. See {logPath} for details.");
StringAssert.Contains ("failed: 1", outputText, $"Output should report 1 failed test. See {logPath} for details.");
StringAssert.Contains ("skipped: 1", outputText, $"Output should report 1 skipped test. See {logPath} for details.");

// Verify TRX report was generated via --report-trx
var testResultsDir = Path.Combine (projectDirectory, "TestResults");
Assert.IsTrue (Directory.Exists (testResultsDir), $"TestResults directory should exist at {testResultsDir}");
var trxFiles = Directory.GetFiles (testResultsDir, "*.trx", SearchOption.AllDirectories);
Assert.IsTrue (trxFiles.Length > 0, $"At least one .trx file should exist in {testResultsDir}");
var trxContent = File.ReadAllText (trxFiles [0]);
TestContext.AddTestAttachment (trxFiles [0]);
StringAssert.Contains ("UnitTestResult", trxContent, $"TRX file should contain test results. See {trxFiles [0]}");
}
}

Expand Down