Skip to content

improve test dynamic certificate generation #41659

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
merged 2 commits into from
Sep 4, 2020
Merged

improve test dynamic certificate generation #41659

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f9962f
improve test dynamic certificate generation
wfurt Sep 1, 2020
54e5672
feedback from review
wfurt Sep 1, 2020
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: 7 additions & 10 deletions src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,16 @@ namespace System.Net.Security.Tests
{
using Configuration = System.Net.Test.Common.Configuration;

public class SslStreamNetworkStreamTest : IDisposable
public class SslStreamNetworkStreamTest
{
private readonly X509Certificate2 _serverCert;
private readonly X509Certificate2Collection _serverChain;
private static readonly X509Certificate2 _serverCert;
private static readonly X509Certificate2Collection _serverChain;

public SslStreamNetworkStreamTest()
static SslStreamNetworkStreamTest()
{
(_serverCert, _serverChain) = TestHelper.GenerateCertificates("localhost", this.GetType().Name);
}

public void Dispose()
{
TestHelper.CleanupCertificates(this.GetType().Name);
string name = System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name.ToString();
TestHelper.CleanupCertificates(name);
(_serverCert, _serverChain) = TestHelper.GenerateCertificates("localhost", name);
}

[Fact]
Expand Down
4 changes: 3 additions & 1 deletion src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates.Tests.Common;
using System.Runtime.CompilerServices;
using System.Text;

namespace System.Net.Security.Tests
Expand Down Expand Up @@ -107,7 +108,8 @@ internal static void CleanupCertificates(string testName)
}
catch { };
}
internal static (X509Certificate2 certificate, X509Certificate2Collection) GenerateCertificates(string targetName, string? testName = null)

internal static (X509Certificate2 certificate, X509Certificate2Collection) GenerateCertificates(string targetName, [CallerMemberName] string? testName = null)
{
if (PlatformDetection.IsWindows && testName != null)
{
Expand Down