Delete TestProjectFixture and associated helpers#99847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elinor-fung merged 2 commits into from
Mar 21, 2024
Merged

Delete TestProjectFixture and associated helpers #99847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d6fe20
Delete TestProjectFixture and associated helpers
elinor-fung Mar 15, 2024
52ee239
Remove complicated console logging
elinor-fung Mar 15, 2024
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
6 changes: 2 additions & 4 deletions src/installer/tests/HostActivation.Tests/NativeUnitTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,14 @@
using Microsoft.DotNet.CoreSetup.Test;
using Microsoft.DotNet.Cli.Build.Framework;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeUnitTests
namespace HostActivation.Tests
{
public class NativeUnitTests
{
[Fact]
public void Native_Test_Fx_Ver()
{
RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider();

string testPath = Path.Combine(repoDirectoriesProvider.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));
string testPath = Path.Combine(RepoDirectoriesProvider.Default.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));

Command testCommand = Command.Create(testPath);
testCommand
Expand Down
2 changes: 1 addition & 1 deletion src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public RegisteredInstallLocationOverride(string productBinaryPath)
// On Linux/macOS the install location is registered in a file which is normally
// located in /etc/dotnet/install_location
// So we need to redirect it to a different place here.
string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
string directory = Path.Combine(TestContext.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
if (Directory.Exists(directory))
Directory.Delete(directory, true);
Directory.CreateDirectory(directory);
Expand Down
2 changes: 1 addition & 1 deletion src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
{
public class NETCoreTests
{
private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
private readonly RepoDirectoriesProvider dirs = RepoDirectoriesProvider.Default;

[Fact]
public void NETCoreTargetingPackIsValid()
Expand Down
52 changes: 0 additions & 52 deletions src/installer/tests/TestUtils/AnsiColorExtensions.cs
View file
Open in desktop

This file was deleted.

145 changes: 0 additions & 145 deletions src/installer/tests/TestUtils/AnsiConsole.cs
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,19 +155,5 @@ public string GetDiagnosticsInfo()
$"StdOut:{Environment.NewLine}{Result.StdOut}{Environment.NewLine}" +
$"StdErr:{Environment.NewLine}{Result.StdErr}{Environment.NewLine}";
}

public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject, string frameworkFullName)
{
Result.StdOut.Should().Contain("Project {0} ({1}) was previously compiled. Skipping compilation.", skippedProject, frameworkFullName);

return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject, string frameworkFullName)
{
Result.StdOut.Should().Contain($"Project {0} ({1}) will be compiled", compiledProject, frameworkFullName);

return new AndConstraint<CommandResultAssertions>(this);
}
}
}
5 changes: 0 additions & 5 deletions src/installer/tests/TestUtils/Assertions/DirectoryInfoExtensions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,5 @@ public static DirectoryInfoAssertions Should(this DirectoryInfo dir)
{
return new DirectoryInfoAssertions(dir);
}

public static DirectoryInfo Sub(this DirectoryInfo dir, string name)
{
return new DirectoryInfo(Path.Combine(dir.FullName, name));
}
}
}
22 changes: 0 additions & 22 deletions src/installer/tests/TestUtils/BuildFailureException.cs
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions src/installer/tests/TestUtils/BuildReporter.cs
View file
Open in desktop

This file was deleted.

35 changes: 16 additions & 19 deletions src/installer/tests/TestUtils/Command.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;

namespace Microsoft.DotNet.Cli.Build.Framework
Expand DownExpand Up@@ -315,33 +313,32 @@ private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirec
return prefix + " " + info.Arguments;
}

private static DateTime _initialTime = DateTime.Now;

private string GetFormattedTime()
{
const string TimeSpanFormat = @"hh\:mm\:ss\.fff";
return (DateTime.Now - _initialTime).ToString(TimeSpanFormat);
}

private void ReportExecBegin()
{
BuildReporter.BeginSection("EXEC", FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false));
string message = FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false);
Console.WriteLine($"[EXEC >] [....] [{GetFormattedTime()}] {message}");
}

private void ReportExecWaitOnExit()
{
BuildReporter.SectionComment("EXEC", $"Waiting for process {Process.Id} to exit...");
string message = $"Waiting for process {Process.Id} to exit...";
Console.WriteLine($"[EXEC -] [....] [{GetFormattedTime()}] {message}");
}

private void ReportExecEnd(int exitCode, bool fExpectedToFail)
{
bool success = exitCode == 0;
string msgExpectedToFail = "";

if (fExpectedToFail)
{
success = !success;
msgExpectedToFail = "failed as expected and ";
}

var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} {msgExpectedToFail}exited with {exitCode}";

BuildReporter.EndSection(
"EXEC",
success ? message.Green() : message.Red().Bold(),
success);
bool success = fExpectedToFail ? exitCode != 0 : exitCode == 0;
var status = success ? " OK " : "FAIL";
var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}. Expected: {(fExpectedToFail ? "non-zero" : "0")}";
Console.WriteLine($"[EXEC <] [{status}] [{GetFormattedTime()}] {message}");
}

private void ThrowIfRunning([CallerMemberName] string memberName = null)
Expand Down
2 changes: 1 addition & 1 deletion src/installer/tests/TestUtils/CommandExtensions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static Command EnableHostTracing(this Command command)

public static Command EnableHostTracingToFile(this Command command, out string filePath)
{
filePath = Path.Combine(TestArtifact.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
filePath = Path.Combine(TestContext.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
if (File.Exists(filePath))
{
File.Delete(filePath);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Delete TestProjectFixture and associated helpers#99847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

elinor-fung
merged 2 commits into

from

Mar 21, 2024
 Merged


Delete TestProjectFixture and associated helpers
#99847
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7d6fe20

Delete TestProjectFixture and associated helpers


elinor-fung Mar 15, 2024
52ee239

Remove complicated console logging


elinor-fung Mar 15, 2024

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


6 changes: 2 additions & 4 deletions
src/installer/tests/HostActivation.Tests/NativeUnitTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,14 @@
using Microsoft.DotNet.CoreSetup.Test;
using Microsoft.DotNet.Cli.Build.Framework;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeUnitTests
namespace HostActivation.Tests
{
 public class NativeUnitTests
 {
 [Fact]
 public void Native_Test_Fx_Ver()
 {
 RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider();

 string testPath = Path.Combine(repoDirectoriesProvider.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));
 string testPath = Path.Combine(RepoDirectoriesProvider.Default.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));

 Command testCommand = Command.Create(testPath);
 testCommand
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public RegisteredInstallLocationOverride(string productBinaryPath)
 // On Linux/macOS the install location is registered in a file which is normally
 // located in /etc/dotnet/install_location
 // So we need to redirect it to a different place here.
 string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 string directory = Path.Combine(TestContext.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 if (Directory.Exists(directory))
 Directory.Delete(directory, true);
 Directory.CreateDirectory(directory);
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
{
 public class NETCoreTests
 {
 private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
 private readonly RepoDirectoriesProvider dirs = RepoDirectoriesProvider.Default;

 [Fact]
 public void NETCoreTargetingPackIsValid()
Expand Down

52 changes: 0 additions & 52 deletions
src/installer/tests/TestUtils/AnsiColorExtensions.cs

View file


Open in desktop


This file was deleted.


145 changes: 0 additions & 145 deletions
src/installer/tests/TestUtils/AnsiConsole.cs

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,19 +155,5 @@ public string GetDiagnosticsInfo()
 $"StdOut:{Environment.NewLine}{Result.StdOut}{Environment.NewLine}" +
 $"StdErr:{Environment.NewLine}{Result.StdErr}{Environment.NewLine}";
 }

 public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain("Project {0} ({1}) was previously compiled. Skipping compilation.", skippedProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain($"Project {0} ({1}) will be compiled", compiledProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }
 }
}

5 changes: 0 additions & 5 deletions
src/installer/tests/TestUtils/Assertions/DirectoryInfoExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,5 @@ public static DirectoryInfoAssertions Should(this DirectoryInfo dir)
 {
 return new DirectoryInfoAssertions(dir);
 }

 public static DirectoryInfo Sub(this DirectoryInfo dir, string name)
 {
 return new DirectoryInfo(Path.Combine(dir.FullName, name));
 }
 }
}

22 changes: 0 additions & 22 deletions
src/installer/tests/TestUtils/BuildFailureException.cs

View file


Open in desktop


This file was deleted.


38 changes: 0 additions & 38 deletions
src/installer/tests/TestUtils/BuildReporter.cs

View file


Open in desktop


This file was deleted.


35 changes: 16 additions & 19 deletions
src/installer/tests/TestUtils/Command.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;

namespace Microsoft.DotNet.Cli.Build.Framework
Expand DownExpand Up@@ -315,33 +313,32 @@ private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirec
 return prefix + " " + info.Arguments;
 }

 private static DateTime _initialTime = DateTime.Now;

 private string GetFormattedTime()
 {
 const string TimeSpanFormat = @"hh\:mm\:ss\.fff";
 return (DateTime.Now - _initialTime).ToString(TimeSpanFormat);
 }

 private void ReportExecBegin()
 {
 BuildReporter.BeginSection("EXEC", FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false));
 string message = FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false);
 Console.WriteLine($"[EXEC >] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecWaitOnExit()
 {
 BuildReporter.SectionComment("EXEC", $"Waiting for process {Process.Id} to exit...");
 string message = $"Waiting for process {Process.Id} to exit...";
 Console.WriteLine($"[EXEC -] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecEnd(int exitCode, bool fExpectedToFail)
 {
 bool success = exitCode == 0;
 string msgExpectedToFail = "";

 if (fExpectedToFail)
 {
 success = !success;
 msgExpectedToFail = "failed as expected and ";
 }

 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} {msgExpectedToFail}exited with {exitCode}";

 BuildReporter.EndSection(
 "EXEC",
 success ? message.Green() : message.Red().Bold(),
 success);
 bool success = fExpectedToFail ? exitCode != 0 : exitCode == 0;
 var status = success ? " OK " : "FAIL";
 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}. Expected: {(fExpectedToFail ? "non-zero" : "0")}";
 Console.WriteLine($"[EXEC <] [{status}] [{GetFormattedTime()}] {message}");
 }

 private void ThrowIfRunning([CallerMemberName] string memberName = null)
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/TestUtils/CommandExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static Command EnableHostTracing(this Command command)

 public static Command EnableHostTracingToFile(this Command command, out string filePath)
 {
 filePath = Path.Combine(TestArtifact.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 filePath = Path.Combine(TestContext.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 if (File.Exists(filePath))
 {
 File.Delete(filePath);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Delete TestProjectFixture and associated helpers#99847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

elinor-fung
merged 2 commits into

from

Mar 21, 2024
 Merged


Delete TestProjectFixture and associated helpers
#99847
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7d6fe20

Delete TestProjectFixture and associated helpers


elinor-fung Mar 15, 2024
52ee239

Remove complicated console logging


elinor-fung Mar 15, 2024

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


6 changes: 2 additions & 4 deletions
src/installer/tests/HostActivation.Tests/NativeUnitTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,14 @@
using Microsoft.DotNet.CoreSetup.Test;
using Microsoft.DotNet.Cli.Build.Framework;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeUnitTests
namespace HostActivation.Tests
{
 public class NativeUnitTests
 {
 [Fact]
 public void Native_Test_Fx_Ver()
 {
 RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider();

 string testPath = Path.Combine(repoDirectoriesProvider.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));
 string testPath = Path.Combine(RepoDirectoriesProvider.Default.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));

 Command testCommand = Command.Create(testPath);
 testCommand
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public RegisteredInstallLocationOverride(string productBinaryPath)
 // On Linux/macOS the install location is registered in a file which is normally
 // located in /etc/dotnet/install_location
 // So we need to redirect it to a different place here.
 string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 string directory = Path.Combine(TestContext.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 if (Directory.Exists(directory))
 Directory.Delete(directory, true);
 Directory.CreateDirectory(directory);
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
{
 public class NETCoreTests
 {
 private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
 private readonly RepoDirectoriesProvider dirs = RepoDirectoriesProvider.Default;

 [Fact]
 public void NETCoreTargetingPackIsValid()
Expand Down

52 changes: 0 additions & 52 deletions
src/installer/tests/TestUtils/AnsiColorExtensions.cs

View file


Open in desktop


This file was deleted.


145 changes: 0 additions & 145 deletions
src/installer/tests/TestUtils/AnsiConsole.cs

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,19 +155,5 @@ public string GetDiagnosticsInfo()
 $"StdOut:{Environment.NewLine}{Result.StdOut}{Environment.NewLine}" +
 $"StdErr:{Environment.NewLine}{Result.StdErr}{Environment.NewLine}";
 }

 public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain("Project {0} ({1}) was previously compiled. Skipping compilation.", skippedProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain($"Project {0} ({1}) will be compiled", compiledProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }
 }
}

5 changes: 0 additions & 5 deletions
src/installer/tests/TestUtils/Assertions/DirectoryInfoExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,5 @@ public static DirectoryInfoAssertions Should(this DirectoryInfo dir)
 {
 return new DirectoryInfoAssertions(dir);
 }

 public static DirectoryInfo Sub(this DirectoryInfo dir, string name)
 {
 return new DirectoryInfo(Path.Combine(dir.FullName, name));
 }
 }
}

22 changes: 0 additions & 22 deletions
src/installer/tests/TestUtils/BuildFailureException.cs

View file


Open in desktop


This file was deleted.


38 changes: 0 additions & 38 deletions
src/installer/tests/TestUtils/BuildReporter.cs

View file


Open in desktop


This file was deleted.


35 changes: 16 additions & 19 deletions
src/installer/tests/TestUtils/Command.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;

namespace Microsoft.DotNet.Cli.Build.Framework
Expand DownExpand Up@@ -315,33 +313,32 @@ private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirec
 return prefix + " " + info.Arguments;
 }

 private static DateTime _initialTime = DateTime.Now;

 private string GetFormattedTime()
 {
 const string TimeSpanFormat = @"hh\:mm\:ss\.fff";
 return (DateTime.Now - _initialTime).ToString(TimeSpanFormat);
 }

 private void ReportExecBegin()
 {
 BuildReporter.BeginSection("EXEC", FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false));
 string message = FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false);
 Console.WriteLine($"[EXEC >] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecWaitOnExit()
 {
 BuildReporter.SectionComment("EXEC", $"Waiting for process {Process.Id} to exit...");
 string message = $"Waiting for process {Process.Id} to exit...";
 Console.WriteLine($"[EXEC -] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecEnd(int exitCode, bool fExpectedToFail)
 {
 bool success = exitCode == 0;
 string msgExpectedToFail = "";

 if (fExpectedToFail)
 {
 success = !success;
 msgExpectedToFail = "failed as expected and ";
 }

 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} {msgExpectedToFail}exited with {exitCode}";

 BuildReporter.EndSection(
 "EXEC",
 success ? message.Green() : message.Red().Bold(),
 success);
 bool success = fExpectedToFail ? exitCode != 0 : exitCode == 0;
 var status = success ? " OK " : "FAIL";
 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}. Expected: {(fExpectedToFail ? "non-zero" : "0")}";
 Console.WriteLine($"[EXEC <] [{status}] [{GetFormattedTime()}] {message}");
 }

 private void ThrowIfRunning([CallerMemberName] string memberName = null)
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/TestUtils/CommandExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static Command EnableHostTracing(this Command command)

 public static Command EnableHostTracingToFile(this Command command, out string filePath)
 {
 filePath = Path.Combine(TestArtifact.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 filePath = Path.Combine(TestContext.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 if (File.Exists(filePath))
 {
 File.Delete(filePath);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Delete TestProjectFixture and associated helpers#99847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

elinor-fung
merged 2 commits into

from

Mar 21, 2024
 Merged


Delete TestProjectFixture and associated helpers
#99847
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7d6fe20

Delete TestProjectFixture and associated helpers


elinor-fung Mar 15, 2024
52ee239

Remove complicated console logging


elinor-fung Mar 15, 2024

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


6 changes: 2 additions & 4 deletions
src/installer/tests/HostActivation.Tests/NativeUnitTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,14 @@
using Microsoft.DotNet.CoreSetup.Test;
using Microsoft.DotNet.Cli.Build.Framework;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeUnitTests
namespace HostActivation.Tests
{
 public class NativeUnitTests
 {
 [Fact]
 public void Native_Test_Fx_Ver()
 {
 RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider();

 string testPath = Path.Combine(repoDirectoriesProvider.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));
 string testPath = Path.Combine(RepoDirectoriesProvider.Default.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));

 Command testCommand = Command.Create(testPath);
 testCommand
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public RegisteredInstallLocationOverride(string productBinaryPath)
 // On Linux/macOS the install location is registered in a file which is normally
 // located in /etc/dotnet/install_location
 // So we need to redirect it to a different place here.
 string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 string directory = Path.Combine(TestContext.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 if (Directory.Exists(directory))
 Directory.Delete(directory, true);
 Directory.CreateDirectory(directory);
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
{
 public class NETCoreTests
 {
 private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
 private readonly RepoDirectoriesProvider dirs = RepoDirectoriesProvider.Default;

 [Fact]
 public void NETCoreTargetingPackIsValid()
Expand Down

52 changes: 0 additions & 52 deletions
src/installer/tests/TestUtils/AnsiColorExtensions.cs

View file


Open in desktop


This file was deleted.


145 changes: 0 additions & 145 deletions
src/installer/tests/TestUtils/AnsiConsole.cs

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,19 +155,5 @@ public string GetDiagnosticsInfo()
 $"StdOut:{Environment.NewLine}{Result.StdOut}{Environment.NewLine}" +
 $"StdErr:{Environment.NewLine}{Result.StdErr}{Environment.NewLine}";
 }

 public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain("Project {0} ({1}) was previously compiled. Skipping compilation.", skippedProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain($"Project {0} ({1}) will be compiled", compiledProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }
 }
}

5 changes: 0 additions & 5 deletions
src/installer/tests/TestUtils/Assertions/DirectoryInfoExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,5 @@ public static DirectoryInfoAssertions Should(this DirectoryInfo dir)
 {
 return new DirectoryInfoAssertions(dir);
 }

 public static DirectoryInfo Sub(this DirectoryInfo dir, string name)
 {
 return new DirectoryInfo(Path.Combine(dir.FullName, name));
 }
 }
}

22 changes: 0 additions & 22 deletions
src/installer/tests/TestUtils/BuildFailureException.cs

View file


Open in desktop


This file was deleted.


38 changes: 0 additions & 38 deletions
src/installer/tests/TestUtils/BuildReporter.cs

View file


Open in desktop


This file was deleted.


35 changes: 16 additions & 19 deletions
src/installer/tests/TestUtils/Command.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;

namespace Microsoft.DotNet.Cli.Build.Framework
Expand DownExpand Up@@ -315,33 +313,32 @@ private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirec
 return prefix + " " + info.Arguments;
 }

 private static DateTime _initialTime = DateTime.Now;

 private string GetFormattedTime()
 {
 const string TimeSpanFormat = @"hh\:mm\:ss\.fff";
 return (DateTime.Now - _initialTime).ToString(TimeSpanFormat);
 }

 private void ReportExecBegin()
 {
 BuildReporter.BeginSection("EXEC", FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false));
 string message = FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false);
 Console.WriteLine($"[EXEC >] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecWaitOnExit()
 {
 BuildReporter.SectionComment("EXEC", $"Waiting for process {Process.Id} to exit...");
 string message = $"Waiting for process {Process.Id} to exit...";
 Console.WriteLine($"[EXEC -] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecEnd(int exitCode, bool fExpectedToFail)
 {
 bool success = exitCode == 0;
 string msgExpectedToFail = "";

 if (fExpectedToFail)
 {
 success = !success;
 msgExpectedToFail = "failed as expected and ";
 }

 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} {msgExpectedToFail}exited with {exitCode}";

 BuildReporter.EndSection(
 "EXEC",
 success ? message.Green() : message.Red().Bold(),
 success);
 bool success = fExpectedToFail ? exitCode != 0 : exitCode == 0;
 var status = success ? " OK " : "FAIL";
 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}. Expected: {(fExpectedToFail ? "non-zero" : "0")}";
 Console.WriteLine($"[EXEC <] [{status}] [{GetFormattedTime()}] {message}");
 }

 private void ThrowIfRunning([CallerMemberName] string memberName = null)
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/TestUtils/CommandExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static Command EnableHostTracing(this Command command)

 public static Command EnableHostTracingToFile(this Command command, out string filePath)
 {
 filePath = Path.Combine(TestArtifact.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 filePath = Path.Combine(TestContext.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 if (File.Exists(filePath))
 {
 File.Delete(filePath);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Delete TestProjectFixture and associated helpers#99847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

elinor-fung
merged 2 commits into

from

Mar 21, 2024
 Merged


Delete TestProjectFixture and associated helpers
#99847
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7d6fe20

Delete TestProjectFixture and associated helpers


elinor-fung Mar 15, 2024
52ee239

Remove complicated console logging


elinor-fung Mar 15, 2024

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


6 changes: 2 additions & 4 deletions
src/installer/tests/HostActivation.Tests/NativeUnitTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,14 @@
using Microsoft.DotNet.CoreSetup.Test;
using Microsoft.DotNet.Cli.Build.Framework;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeUnitTests
namespace HostActivation.Tests
{
 public class NativeUnitTests
 {
 [Fact]
 public void Native_Test_Fx_Ver()
 {
 RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider();

 string testPath = Path.Combine(repoDirectoriesProvider.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));
 string testPath = Path.Combine(RepoDirectoriesProvider.Default.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));

 Command testCommand = Command.Create(testPath);
 testCommand
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public RegisteredInstallLocationOverride(string productBinaryPath)
 // On Linux/macOS the install location is registered in a file which is normally
 // located in /etc/dotnet/install_location
 // So we need to redirect it to a different place here.
 string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 string directory = Path.Combine(TestContext.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 if (Directory.Exists(directory))
 Directory.Delete(directory, true);
 Directory.CreateDirectory(directory);
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
{
 public class NETCoreTests
 {
 private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
 private readonly RepoDirectoriesProvider dirs = RepoDirectoriesProvider.Default;

 [Fact]
 public void NETCoreTargetingPackIsValid()
Expand Down

52 changes: 0 additions & 52 deletions
src/installer/tests/TestUtils/AnsiColorExtensions.cs

View file


Open in desktop


This file was deleted.


145 changes: 0 additions & 145 deletions
src/installer/tests/TestUtils/AnsiConsole.cs

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,19 +155,5 @@ public string GetDiagnosticsInfo()
 $"StdOut:{Environment.NewLine}{Result.StdOut}{Environment.NewLine}" +
 $"StdErr:{Environment.NewLine}{Result.StdErr}{Environment.NewLine}";
 }

 public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain("Project {0} ({1}) was previously compiled. Skipping compilation.", skippedProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain($"Project {0} ({1}) will be compiled", compiledProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }
 }
}

5 changes: 0 additions & 5 deletions
src/installer/tests/TestUtils/Assertions/DirectoryInfoExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,5 @@ public static DirectoryInfoAssertions Should(this DirectoryInfo dir)
 {
 return new DirectoryInfoAssertions(dir);
 }

 public static DirectoryInfo Sub(this DirectoryInfo dir, string name)
 {
 return new DirectoryInfo(Path.Combine(dir.FullName, name));
 }
 }
}

22 changes: 0 additions & 22 deletions
src/installer/tests/TestUtils/BuildFailureException.cs

View file


Open in desktop


This file was deleted.


38 changes: 0 additions & 38 deletions
src/installer/tests/TestUtils/BuildReporter.cs

View file


Open in desktop


This file was deleted.


35 changes: 16 additions & 19 deletions
src/installer/tests/TestUtils/Command.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;

namespace Microsoft.DotNet.Cli.Build.Framework
Expand DownExpand Up@@ -315,33 +313,32 @@ private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirec
 return prefix + " " + info.Arguments;
 }

 private static DateTime _initialTime = DateTime.Now;

 private string GetFormattedTime()
 {
 const string TimeSpanFormat = @"hh\:mm\:ss\.fff";
 return (DateTime.Now - _initialTime).ToString(TimeSpanFormat);
 }

 private void ReportExecBegin()
 {
 BuildReporter.BeginSection("EXEC", FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false));
 string message = FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false);
 Console.WriteLine($"[EXEC >] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecWaitOnExit()
 {
 BuildReporter.SectionComment("EXEC", $"Waiting for process {Process.Id} to exit...");
 string message = $"Waiting for process {Process.Id} to exit...";
 Console.WriteLine($"[EXEC -] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecEnd(int exitCode, bool fExpectedToFail)
 {
 bool success = exitCode == 0;
 string msgExpectedToFail = "";

 if (fExpectedToFail)
 {
 success = !success;
 msgExpectedToFail = "failed as expected and ";
 }

 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} {msgExpectedToFail}exited with {exitCode}";

 BuildReporter.EndSection(
 "EXEC",
 success ? message.Green() : message.Red().Bold(),
 success);
 bool success = fExpectedToFail ? exitCode != 0 : exitCode == 0;
 var status = success ? " OK " : "FAIL";
 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}. Expected: {(fExpectedToFail ? "non-zero" : "0")}";
 Console.WriteLine($"[EXEC <] [{status}] [{GetFormattedTime()}] {message}");
 }

 private void ThrowIfRunning([CallerMemberName] string memberName = null)
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/TestUtils/CommandExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static Command EnableHostTracing(this Command command)

 public static Command EnableHostTracingToFile(this Command command, out string filePath)
 {
 filePath = Path.Combine(TestArtifact.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 filePath = Path.Combine(TestContext.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 if (File.Exists(filePath))
 {
 File.Delete(filePath);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Delete TestProjectFixture and associated helpers#99847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

elinor-fung
merged 2 commits into

from

Mar 21, 2024
 Merged


Delete TestProjectFixture and associated helpers
#99847
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7d6fe20

Delete TestProjectFixture and associated helpers


elinor-fung Mar 15, 2024
52ee239

Remove complicated console logging


elinor-fung Mar 15, 2024

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


6 changes: 2 additions & 4 deletions
src/installer/tests/HostActivation.Tests/NativeUnitTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,14 @@
using Microsoft.DotNet.CoreSetup.Test;
using Microsoft.DotNet.Cli.Build.Framework;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeUnitTests
namespace HostActivation.Tests
{
 public class NativeUnitTests
 {
 [Fact]
 public void Native_Test_Fx_Ver()
 {
 RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider();

 string testPath = Path.Combine(repoDirectoriesProvider.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));
 string testPath = Path.Combine(RepoDirectoriesProvider.Default.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));

 Command testCommand = Command.Create(testPath);
 testCommand
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public RegisteredInstallLocationOverride(string productBinaryPath)
 // On Linux/macOS the install location is registered in a file which is normally
 // located in /etc/dotnet/install_location
 // So we need to redirect it to a different place here.
 string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 string directory = Path.Combine(TestContext.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 if (Directory.Exists(directory))
 Directory.Delete(directory, true);
 Directory.CreateDirectory(directory);
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
{
 public class NETCoreTests
 {
 private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
 private readonly RepoDirectoriesProvider dirs = RepoDirectoriesProvider.Default;

 [Fact]
 public void NETCoreTargetingPackIsValid()
Expand Down

52 changes: 0 additions & 52 deletions
src/installer/tests/TestUtils/AnsiColorExtensions.cs

View file


Open in desktop


This file was deleted.


145 changes: 0 additions & 145 deletions
src/installer/tests/TestUtils/AnsiConsole.cs

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,19 +155,5 @@ public string GetDiagnosticsInfo()
 $"StdOut:{Environment.NewLine}{Result.StdOut}{Environment.NewLine}" +
 $"StdErr:{Environment.NewLine}{Result.StdErr}{Environment.NewLine}";
 }

 public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain("Project {0} ({1}) was previously compiled. Skipping compilation.", skippedProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain($"Project {0} ({1}) will be compiled", compiledProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }
 }
}

5 changes: 0 additions & 5 deletions
src/installer/tests/TestUtils/Assertions/DirectoryInfoExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,5 @@ public static DirectoryInfoAssertions Should(this DirectoryInfo dir)
 {
 return new DirectoryInfoAssertions(dir);
 }

 public static DirectoryInfo Sub(this DirectoryInfo dir, string name)
 {
 return new DirectoryInfo(Path.Combine(dir.FullName, name));
 }
 }
}

22 changes: 0 additions & 22 deletions
src/installer/tests/TestUtils/BuildFailureException.cs

View file


Open in desktop


This file was deleted.


38 changes: 0 additions & 38 deletions
src/installer/tests/TestUtils/BuildReporter.cs

View file


Open in desktop


This file was deleted.


35 changes: 16 additions & 19 deletions
src/installer/tests/TestUtils/Command.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;

namespace Microsoft.DotNet.Cli.Build.Framework
Expand DownExpand Up@@ -315,33 +313,32 @@ private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirec
 return prefix + " " + info.Arguments;
 }

 private static DateTime _initialTime = DateTime.Now;

 private string GetFormattedTime()
 {
 const string TimeSpanFormat = @"hh\:mm\:ss\.fff";
 return (DateTime.Now - _initialTime).ToString(TimeSpanFormat);
 }

 private void ReportExecBegin()
 {
 BuildReporter.BeginSection("EXEC", FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false));
 string message = FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false);
 Console.WriteLine($"[EXEC >] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecWaitOnExit()
 {
 BuildReporter.SectionComment("EXEC", $"Waiting for process {Process.Id} to exit...");
 string message = $"Waiting for process {Process.Id} to exit...";
 Console.WriteLine($"[EXEC -] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecEnd(int exitCode, bool fExpectedToFail)
 {
 bool success = exitCode == 0;
 string msgExpectedToFail = "";

 if (fExpectedToFail)
 {
 success = !success;
 msgExpectedToFail = "failed as expected and ";
 }

 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} {msgExpectedToFail}exited with {exitCode}";

 BuildReporter.EndSection(
 "EXEC",
 success ? message.Green() : message.Red().Bold(),
 success);
 bool success = fExpectedToFail ? exitCode != 0 : exitCode == 0;
 var status = success ? " OK " : "FAIL";
 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}. Expected: {(fExpectedToFail ? "non-zero" : "0")}";
 Console.WriteLine($"[EXEC <] [{status}] [{GetFormattedTime()}] {message}");
 }

 private void ThrowIfRunning([CallerMemberName] string memberName = null)
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/TestUtils/CommandExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static Command EnableHostTracing(this Command command)

 public static Command EnableHostTracingToFile(this Command command, out string filePath)
 {
 filePath = Path.Combine(TestArtifact.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 filePath = Path.Combine(TestContext.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 if (File.Exists(filePath))
 {
 File.Delete(filePath);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Delete TestProjectFixture and associated helpers#99847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

elinor-fung
merged 2 commits into

from

Mar 21, 2024
 Merged


Delete TestProjectFixture and associated helpers
#99847
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7d6fe20

Delete TestProjectFixture and associated helpers


elinor-fung Mar 15, 2024
52ee239

Remove complicated console logging


elinor-fung Mar 15, 2024

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


6 changes: 2 additions & 4 deletions
src/installer/tests/HostActivation.Tests/NativeUnitTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,14 @@
using Microsoft.DotNet.CoreSetup.Test;
using Microsoft.DotNet.Cli.Build.Framework;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeUnitTests
namespace HostActivation.Tests
{
 public class NativeUnitTests
 {
 [Fact]
 public void Native_Test_Fx_Ver()
 {
 RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider();

 string testPath = Path.Combine(repoDirectoriesProvider.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));
 string testPath = Path.Combine(RepoDirectoriesProvider.Default.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));

 Command testCommand = Command.Create(testPath);
 testCommand
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public RegisteredInstallLocationOverride(string productBinaryPath)
 // On Linux/macOS the install location is registered in a file which is normally
 // located in /etc/dotnet/install_location
 // So we need to redirect it to a different place here.
 string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 string directory = Path.Combine(TestContext.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 if (Directory.Exists(directory))
 Directory.Delete(directory, true);
 Directory.CreateDirectory(directory);
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
{
 public class NETCoreTests
 {
 private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
 private readonly RepoDirectoriesProvider dirs = RepoDirectoriesProvider.Default;

 [Fact]
 public void NETCoreTargetingPackIsValid()
Expand Down

52 changes: 0 additions & 52 deletions
src/installer/tests/TestUtils/AnsiColorExtensions.cs

View file


Open in desktop


This file was deleted.


145 changes: 0 additions & 145 deletions
src/installer/tests/TestUtils/AnsiConsole.cs

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,19 +155,5 @@ public string GetDiagnosticsInfo()
 $"StdOut:{Environment.NewLine}{Result.StdOut}{Environment.NewLine}" +
 $"StdErr:{Environment.NewLine}{Result.StdErr}{Environment.NewLine}";
 }

 public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain("Project {0} ({1}) was previously compiled. Skipping compilation.", skippedProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain($"Project {0} ({1}) will be compiled", compiledProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }
 }
}

5 changes: 0 additions & 5 deletions
src/installer/tests/TestUtils/Assertions/DirectoryInfoExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,5 @@ public static DirectoryInfoAssertions Should(this DirectoryInfo dir)
 {
 return new DirectoryInfoAssertions(dir);
 }

 public static DirectoryInfo Sub(this DirectoryInfo dir, string name)
 {
 return new DirectoryInfo(Path.Combine(dir.FullName, name));
 }
 }
}

22 changes: 0 additions & 22 deletions
src/installer/tests/TestUtils/BuildFailureException.cs

View file


Open in desktop


This file was deleted.


38 changes: 0 additions & 38 deletions
src/installer/tests/TestUtils/BuildReporter.cs

View file


Open in desktop


This file was deleted.


35 changes: 16 additions & 19 deletions
src/installer/tests/TestUtils/Command.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;

namespace Microsoft.DotNet.Cli.Build.Framework
Expand DownExpand Up@@ -315,33 +313,32 @@ private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirec
 return prefix + " " + info.Arguments;
 }

 private static DateTime _initialTime = DateTime.Now;

 private string GetFormattedTime()
 {
 const string TimeSpanFormat = @"hh\:mm\:ss\.fff";
 return (DateTime.Now - _initialTime).ToString(TimeSpanFormat);
 }

 private void ReportExecBegin()
 {
 BuildReporter.BeginSection("EXEC", FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false));
 string message = FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false);
 Console.WriteLine($"[EXEC >] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecWaitOnExit()
 {
 BuildReporter.SectionComment("EXEC", $"Waiting for process {Process.Id} to exit...");
 string message = $"Waiting for process {Process.Id} to exit...";
 Console.WriteLine($"[EXEC -] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecEnd(int exitCode, bool fExpectedToFail)
 {
 bool success = exitCode == 0;
 string msgExpectedToFail = "";

 if (fExpectedToFail)
 {
 success = !success;
 msgExpectedToFail = "failed as expected and ";
 }

 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} {msgExpectedToFail}exited with {exitCode}";

 BuildReporter.EndSection(
 "EXEC",
 success ? message.Green() : message.Red().Bold(),
 success);
 bool success = fExpectedToFail ? exitCode != 0 : exitCode == 0;
 var status = success ? " OK " : "FAIL";
 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}. Expected: {(fExpectedToFail ? "non-zero" : "0")}";
 Console.WriteLine($"[EXEC <] [{status}] [{GetFormattedTime()}] {message}");
 }

 private void ThrowIfRunning([CallerMemberName] string memberName = null)
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/TestUtils/CommandExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static Command EnableHostTracing(this Command command)

 public static Command EnableHostTracingToFile(this Command command, out string filePath)
 {
 filePath = Path.Combine(TestArtifact.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 filePath = Path.Combine(TestContext.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 if (File.Exists(filePath))
 {
 File.Delete(filePath);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Delete TestProjectFixture and associated helpers#99847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

elinor-fung
merged 2 commits into

from

Mar 21, 2024
 Merged


Delete TestProjectFixture and associated helpers
#99847
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7d6fe20

Delete TestProjectFixture and associated helpers


elinor-fung Mar 15, 2024
52ee239

Remove complicated console logging


elinor-fung Mar 15, 2024

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


6 changes: 2 additions & 4 deletions
src/installer/tests/HostActivation.Tests/NativeUnitTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,14 @@
using Microsoft.DotNet.CoreSetup.Test;
using Microsoft.DotNet.Cli.Build.Framework;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeUnitTests
namespace HostActivation.Tests
{
 public class NativeUnitTests
 {
 [Fact]
 public void Native_Test_Fx_Ver()
 {
 RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider();

 string testPath = Path.Combine(repoDirectoriesProvider.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));
 string testPath = Path.Combine(RepoDirectoriesProvider.Default.HostTestArtifacts, Binaries.GetExeFileNameForCurrentPlatform("test_fx_ver"));

 Command testCommand = Command.Create(testPath);
 testCommand
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public RegisteredInstallLocationOverride(string productBinaryPath)
 // On Linux/macOS the install location is registered in a file which is normally
 // located in /etc/dotnet/install_location
 // So we need to redirect it to a different place here.
 string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 string directory = Path.Combine(TestContext.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
 if (Directory.Exists(directory))
 Directory.Delete(directory, true);
 Directory.CreateDirectory(directory);
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
{
 public class NETCoreTests
 {
 private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
 private readonly RepoDirectoriesProvider dirs = RepoDirectoriesProvider.Default;

 [Fact]
 public void NETCoreTargetingPackIsValid()
Expand Down

52 changes: 0 additions & 52 deletions
src/installer/tests/TestUtils/AnsiColorExtensions.cs

View file


Open in desktop


This file was deleted.


145 changes: 0 additions & 145 deletions
src/installer/tests/TestUtils/AnsiConsole.cs

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,19 +155,5 @@ public string GetDiagnosticsInfo()
 $"StdOut:{Environment.NewLine}{Result.StdOut}{Environment.NewLine}" +
 $"StdErr:{Environment.NewLine}{Result.StdErr}{Environment.NewLine}";
 }

 public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain("Project {0} ({1}) was previously compiled. Skipping compilation.", skippedProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject, string frameworkFullName)
 {
 Result.StdOut.Should().Contain($"Project {0} ({1}) will be compiled", compiledProject, frameworkFullName);

 return new AndConstraint<CommandResultAssertions>(this);
 }
 }
}

5 changes: 0 additions & 5 deletions
src/installer/tests/TestUtils/Assertions/DirectoryInfoExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,5 @@ public static DirectoryInfoAssertions Should(this DirectoryInfo dir)
 {
 return new DirectoryInfoAssertions(dir);
 }

 public static DirectoryInfo Sub(this DirectoryInfo dir, string name)
 {
 return new DirectoryInfo(Path.Combine(dir.FullName, name));
 }
 }
}

22 changes: 0 additions & 22 deletions
src/installer/tests/TestUtils/BuildFailureException.cs

View file


Open in desktop


This file was deleted.


38 changes: 0 additions & 38 deletions
src/installer/tests/TestUtils/BuildReporter.cs

View file


Open in desktop


This file was deleted.


35 changes: 16 additions & 19 deletions
src/installer/tests/TestUtils/Command.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;

namespace Microsoft.DotNet.Cli.Build.Framework
Expand DownExpand Up@@ -315,33 +313,32 @@ private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirec
 return prefix + " " + info.Arguments;
 }

 private static DateTime _initialTime = DateTime.Now;

 private string GetFormattedTime()
 {
 const string TimeSpanFormat = @"hh\:mm\:ss\.fff";
 return (DateTime.Now - _initialTime).ToString(TimeSpanFormat);
 }

 private void ReportExecBegin()
 {
 BuildReporter.BeginSection("EXEC", FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false));
 string message = FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: false);
 Console.WriteLine($"[EXEC >] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecWaitOnExit()
 {
 BuildReporter.SectionComment("EXEC", $"Waiting for process {Process.Id} to exit...");
 string message = $"Waiting for process {Process.Id} to exit...";
 Console.WriteLine($"[EXEC -] [....] [{GetFormattedTime()}] {message}");
 }

 private void ReportExecEnd(int exitCode, bool fExpectedToFail)
 {
 bool success = exitCode == 0;
 string msgExpectedToFail = "";

 if (fExpectedToFail)
 {
 success = !success;
 msgExpectedToFail = "failed as expected and ";
 }

 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} {msgExpectedToFail}exited with {exitCode}";

 BuildReporter.EndSection(
 "EXEC",
 success ? message.Green() : message.Red().Bold(),
 success);
 bool success = fExpectedToFail ? exitCode != 0 : exitCode == 0;
 var status = success ? " OK " : "FAIL";
 var message = $"{FormatProcessInfo(Process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}. Expected: {(fExpectedToFail ? "non-zero" : "0")}";
 Console.WriteLine($"[EXEC <] [{status}] [{GetFormattedTime()}] {message}");
 }

 private void ThrowIfRunning([CallerMemberName] string memberName = null)
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/TestUtils/CommandExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static Command EnableHostTracing(this Command command)

 public static Command EnableHostTracingToFile(this Command command, out string filePath)
 {
 filePath = Path.Combine(TestArtifact.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 filePath = Path.Combine(TestContext.TestArtifactsPath, "trace" + Guid.NewGuid().ToString() + ".log");
 if (File.Exists(filePath))
 {
 File.Delete(filePath);
Expand Down
Loading