Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Engine/Internal/GenHTTP.Engine.Internal.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<ProjectReference Include="..\..\Modules\IO\GenHTTP.Modules.IO.csproj" />

<PackageReference Include="System.IO.Pipelines" Version="9.0.9" />
<PackageReference Include="System.IO.Pipelines" Version="9.0.10" />

</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Modules/Basics/GenHTTP.Modules.Basics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ProjectReference Include="..\..\API\GenHTTP.Api.csproj" />

<PackageReference Include="System.Text.Json" Version="9.0.9" />
<PackageReference Include="System.Text.Json" Version="9.0.10" />

</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Modules/Caching/GenHTTP.Modules.Caching.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ProjectReference Include="..\Basics\GenHTTP.Modules.Basics.csproj" />

<PackageReference Include="System.Text.Json" Version="9.0.9" />
<PackageReference Include="System.Text.Json" Version="9.0.10" />

</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
</ItemGroup>

</Project>
8 changes: 3 additions & 5 deletions Testing/Acceptance/Adapters/AspNetCore/IntegrationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

using Microsoft.Extensions.Logging;

using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Adapters.AspNetCore;

[TestClass]
Expand Down Expand Up @@ -131,10 +129,10 @@ private static async ValueTask<WebApplication> RunApplicationAsync(int port, Act

builder.Logging.ClearProviders();

builder.WebHost.ConfigureKestrel(options =>
builder.WebHost.ConfigureKestrel(o =>
{
options.AllowSynchronousIO = true;
options.Listen(IPAddress.Any, port);
o.AllowSynchronousIO = true;
o.Listen(IPAddress.Any, port);
});

var app = builder.Build();
Expand Down
8 changes: 2 additions & 6 deletions Testing/Acceptance/AssertX.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Net;
using System.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance;

Expand Down Expand Up @@ -30,14 +29,10 @@ public static void DoesNotContain(string searchFor, string? content)

public static void EndsWith(string searchFor, string? content) => Assert.IsTrue(content?.EndsWith(searchFor) ?? false);

public static void Single<T>(IEnumerable<T> collection) => Assert.IsTrue(collection.Count() == 1);
public static void Single<T>(IEnumerable<T> collection) => Assert.AreEqual(1, collection.Count());

public static void Empty<T>(IEnumerable<T>? collection) => Assert.IsFalse(collection?.Any() ?? false);

public static void Contains<T>(T value, IEnumerable<T> collection) => Assert.IsTrue(collection.Contains(value));

public static void DoesNotContain<T>(T value, IEnumerable<T> collection) => Assert.IsFalse(collection.Contains(value));

public static void IsNullOrEmpty(string? value) => Assert.IsTrue(string.IsNullOrEmpty(value));

/// <summary>
Expand Down Expand Up @@ -79,4 +74,5 @@ public static async Task AssertStatusAsync(this HttpResponseMessage response, Ht
throw new AssertFailedException(builder.ToString());
}
}

}
1 change: 1 addition & 0 deletions Testing/Acceptance/Config.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[assembly: DoNotParallelize]
5 changes: 2 additions & 3 deletions Testing/Acceptance/Engine/BasicTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Net;
using GenHTTP.Modules.Layouting;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down Expand Up @@ -51,7 +50,7 @@ public async Task TestConnectionClose(TestEngine engine)
using var response = await runner.GetResponseAsync(request);

await response.AssertStatusAsync(HttpStatusCode.NotFound);
Assert.IsTrue(response.Headers.Connection.Contains("Close"));
Assert.Contains("Close", response.Headers.Connection);
}

[TestMethod]
Expand All @@ -72,7 +71,7 @@ public async Task TestKeepalive()

using var response = await runner.GetResponseAsync();

Assert.IsTrue(response.Headers.Connection.Contains("Keep-Alive"));
Assert.Contains("Keep-Alive", response.Headers.Connection);
}

}
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/ChunkedContentTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Net;
using System.Net.Http.Json;
using GenHTTP.Modules.Functional;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
2 changes: 0 additions & 2 deletions Testing/Acceptance/Engine/CompanionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

using GenHTTP.Modules.Layouting;

using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

[TestClass]
Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/ConcernTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using GenHTTP.Api.Content;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Functional;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/ContentTypeTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using GenHTTP.Api.Protocol;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/CookieTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Basics;
using GenHTTP.Modules.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
5 changes: 2 additions & 3 deletions Testing/Acceptance/Engine/DeveloperModeTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using GenHTTP.Api.Content;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Layouting;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand All @@ -25,7 +24,7 @@ public async Task TestExceptionsWithTrace(TestEngine engine)

using var response = await runner.GetResponseAsync();

Assert.IsTrue((await response.GetContentAsync()).Contains("at GenHTTP"));
Assert.Contains("at GenHTTP", await response.GetContentAsync());
}

/// <summary>
Expand All @@ -42,7 +41,7 @@ public async Task TestExceptionsWithNoTrace(TestEngine engine)

using var response = await runner.GetResponseAsync();

Assert.IsFalse((await response.GetContentAsync()).Contains("at GenHTTP"));
Assert.DoesNotContain("at GenHTTP", await response.GetContentAsync());
}

private class ThrowingProvider : IHandler
Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/EncodingTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using GenHTTP.Modules.IO;
using GenHTTP.Modules.Layouting;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/FlexibleTypeTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using GenHTTP.Modules.Basics;
using GenHTTP.Modules.IO;
using GenHTTP.Modules.Layouting;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/ForwardingTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using GenHTTP.Api.Infrastructure;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Functional;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/HeaderTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Net;
using GenHTTP.Testing.Acceptance.Utilities;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/HostTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Net;
using GenHTTP.Modules.Layouting;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/Kestrel/CustomizingTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using GenHTTP.Engine.Kestrel;
using GenHTTP.Modules.Layouting;
using Microsoft.AspNetCore.Builder;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine.Kestrel;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/Kestrel/LifecycleTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Net;
using GenHTTP.Modules.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine.Kestrel;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/Kestrel/MappingTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Net;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Functional;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine.Kestrel;

Expand Down
2 changes: 0 additions & 2 deletions Testing/Acceptance/Engine/Kestrel/ProtocolTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

using GenHTTP.Modules.Functional;

using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine.Kestrel;

[TestClass]
Expand Down
2 changes: 0 additions & 2 deletions Testing/Acceptance/Engine/MainHandlerTests.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using GenHTTP.Api.Content;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Layouting;
using Microsoft.VisualStudio.TestTools.UnitTesting;

using StringContent = GenHTTP.Modules.IO.Strings.StringContent;

namespace GenHTTP.Testing.Acceptance.Engine;
Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/MethodTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Net;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Functional;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/ParserTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using GenHTTP.Api.Content;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/PipelineTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Net.Sockets;
using System.Text;
using GenHTTP.Modules.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
13 changes: 6 additions & 7 deletions Testing/Acceptance/Engine/PooledDictionaryTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using GenHTTP.Engine.Shared.Types;

using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

[TestClass]
Expand Down Expand Up @@ -35,15 +33,15 @@ public void TestCounts()
{
using var dict = new PooledDictionary<string, string>();

Assert.AreEqual(0, dict.Keys.Count);
Assert.AreEqual(0, dict.Values.Count);
Assert.IsEmpty(dict.Keys);
Assert.IsEmpty(dict.Values);

AssertX.Empty(dict);

dict["one"] = "one";

Assert.AreEqual(1, dict.Keys.Count);
Assert.AreEqual(1, dict.Values.Count);
Assert.HasCount(1, dict.Keys);
Assert.HasCount(1, dict.Values);

AssertX.Single(dict);
}
Expand All @@ -69,7 +67,7 @@ public void TestResize()
dict.Add(new KeyValuePair<int, int>(i, i));
}

Assert.IsTrue(dict.Capacity > 25);
Assert.IsGreaterThan(25, dict.Capacity);

for (var i = 0; i < 25; i++)
{
Expand All @@ -92,4 +90,5 @@ public void TestNoRemove2()

Assert.ThrowsExactly<NotSupportedException>(() => dict.Remove(new KeyValuePair<string, string>("", "")));
}

}
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/ProtocolTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Basics;
using GenHTTP.Modules.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/ResponseTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using GenHTTP.Modules.Basics;
using GenHTTP.Modules.IO;
using GenHTTP.Modules.Layouting;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/RoutingTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using GenHTTP.Api.Routing;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
4 changes: 3 additions & 1 deletion Testing/Acceptance/Engine/SecurityTests.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
using System.Net;
using System.Security.Authentication;
using System.Security.Cryptography.X509Certificates;

using GenHTTP.Api.Infrastructure;

using GenHTTP.Modules.IO;
using GenHTTP.Modules.Layouting;
using GenHTTP.Modules.Security;
using GenHTTP.Modules.Security.Providers;

using GenHTTP.Testing.Acceptance.Utilities;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/SimpleCertificateProviderTest.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Security.Cryptography.X509Certificates;
using GenHTTP.Engine.Shared.Security;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NSubstitute;

namespace GenHTTP.Testing.Acceptance.Engine;
Expand Down
1 change: 0 additions & 1 deletion Testing/Acceptance/Engine/WireTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Functional;
using GenHTTP.Modules.Layouting;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace GenHTTP.Testing.Acceptance.Engine;

Expand Down
6 changes: 3 additions & 3 deletions Testing/Acceptance/GenHTTP.Testing.Acceptance.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@

<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />

<PackageReference Include="Microsoft.OpenApi" Version="2.3.4" />
<PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.4" />
<PackageReference Include="Microsoft.OpenApi" Version="2.3.5" />
<PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.5" />

<PackageReference Include="MSTest" Version="3.11.0" />
<PackageReference Include="MSTest" Version="4.0.1" />

<PackageReference Include="NSubstitute" Version="5.3.0" />

Expand Down
Loading
Loading