From 519a4fbd46b8e0ec5d30e35da80ce83032fb2f23 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 16 Jun 2022 17:03:38 +0100 Subject: [PATCH] Okey --- .vscode/tasks.json | 2 +- src/isnd/Controllers/Packages/AutoComplete.cs | 10 +++++-- src/isnd/Controllers/Packages/Catalog.cs | 4 +-- src/isnd/Data/PackageVersion.cs | 1 - src/isnd/Startup.cs | 2 +- test/isnd.tests/UnitTestWebHost.cs | 29 ++++++++++++++----- test/isnd.tests/isnd.tests.csproj | 8 +++-- 7 files changed, 37 insertions(+), 19 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 39254a1..1eaca58 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -68,7 +68,7 @@ "args": [ "test", "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" + "--logger:xunit" ], "problemMatcher": "$msCompile", "dependsOn": [ "build", "copyTestConfig"] diff --git a/src/isnd/Controllers/Packages/AutoComplete.cs b/src/isnd/Controllers/Packages/AutoComplete.cs index e8b3a7a..3839216 100644 --- a/src/isnd/Controllers/Packages/AutoComplete.cs +++ b/src/isnd/Controllers/Packages/AutoComplete.cs @@ -22,13 +22,17 @@ namespace isnd.Controllers return Ok(packageManager.AutoComplete(id,skip,take,prerelease,packageType)); } - - protected void CheckParams(int take,string semVerLevel) + protected void CheckParams(int maxTake) { - if (take > maxTake) + if (maxTake > maxTake) { ModelState.AddModelError("take", "Maximum exceeded"); } + } + + protected void CheckParams(int take, string semVerLevel) + { + CheckParams(take); if (semVerLevel != PackageManager.BASE_API_LEVEL) { ModelState.AddModelError("semVerLevel", PackageManager.BASE_API_LEVEL + " expected"); diff --git a/src/isnd/Controllers/Packages/Catalog.cs b/src/isnd/Controllers/Packages/Catalog.cs index 02e6d58..c46301c 100644 --- a/src/isnd/Controllers/Packages/Catalog.cs +++ b/src/isnd/Controllers/Packages/Catalog.cs @@ -32,8 +32,8 @@ namespace isnd.Controllers { string pkgType = ParamHelpers.Optional(ref lower); var pkgVersion = await dbContext.PackageVersions - .Include(v => v.LatestCommit) - .SingleOrDefaultAsync( + .Include(v => v.LatestCommit) + .SingleOrDefaultAsync( v => v.PackageId == id && v.FullString == lower && v.Type == pkgType diff --git a/src/isnd/Data/PackageVersion.cs b/src/isnd/Data/PackageVersion.cs index 683f4e8..0637acb 100644 --- a/src/isnd/Data/PackageVersion.cs +++ b/src/isnd/Data/PackageVersion.cs @@ -40,7 +40,6 @@ namespace isnd.Data public string CommitId { get => CommitNId.ToString(); } - public virtual Commit LatestCommit{ get; set; } public string NugetLink => $"/package/{PackageId}/{FullString}/{PackageId}-{FullString}.nupkg"; public string NuspecLink => $"/package/{PackageId}/{FullString}/{PackageId}-{FullString}.nuspec"; diff --git a/src/isnd/Startup.cs b/src/isnd/Startup.cs index 7d387ca..f0bb020 100644 --- a/src/isnd/Startup.cs +++ b/src/isnd/Startup.cs @@ -96,7 +96,7 @@ namespace isnd } - public static IUnleash UnleashĈlient { get; private set; } + public static IUnleash UnleashClient { get; private set; } public static string ExternalAddress { get; internal set; } diff --git a/test/isnd.tests/UnitTestWebHost.cs b/test/isnd.tests/UnitTestWebHost.cs index 6ef69a9..222d1e2 100644 --- a/test/isnd.tests/UnitTestWebHost.cs +++ b/test/isnd.tests/UnitTestWebHost.cs @@ -10,6 +10,9 @@ using Microsoft.Extensions.Options; using System.Collections.Generic; using System.Threading.Tasks; using System.Diagnostics; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Hosting.Server.Features; +using System.Threading; namespace isnd.host.tests { @@ -19,7 +22,7 @@ namespace isnd.host.tests public void TestHaveTestDbContextAndMigrate() { string envVar = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); - + IWebHost webhost = BuildWebHost(new string[0]); using (var serviceScope = webhost.Services.CreateScope()) @@ -38,25 +41,35 @@ namespace isnd.host.tests } } } - + public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + .UseStartup().Build(); [Fact] public async Task NugetInstallsTest() { - IWebHost webhost = BuildWebHost(new string[0]); - Task running = Task.Run(async () => await webhost.StartAsync()); ProcessStartInfo psi = new ProcessStartInfo("nuget"); psi.ArgumentList.Add("install"); - psi.ArgumentList.Add("isn"); + psi.ArgumentList.Add("gitversion"); + psi.ArgumentList.Add("-PreRelease"); + psi.ArgumentList.Add("-Source"); + psi.ArgumentList.Add("http://localhost:5000"); Process p = Process.Start(psi); p.WaitForExit(); - await webhost.StopAsync(); + Assert.True(p.ExitCode == 0, "nuget install failed!"); } + void PrintAddresses(IServiceProvider services) + { + Console.WriteLine("Checking addresses..."); + var server = services.GetRequiredService(); + var addressFeature = server.Features.Get(); + foreach (var address in addressFeature.Addresses) + { + Console.WriteLine("Listing on address: " + address); + } + } } } diff --git a/test/isnd.tests/isnd.tests.csproj b/test/isnd.tests/isnd.tests.csproj index 288fa2b..89722eb 100644 --- a/test/isnd.tests/isnd.tests.csproj +++ b/test/isnd.tests/isnd.tests.csproj @@ -10,6 +10,7 @@ 0.1.175 + @@ -25,7 +26,8 @@ - - - + \ No newline at end of file