This commit is contained in:
2024-03-10 20:10:05 +00:00
parent 89e1b5a235
commit d6180aa154
24 changed files with 255 additions and 78 deletions

View File

@ -47,11 +47,11 @@ namespace isnd.host.tests
{
var services = serviceScope.ServiceProvider;
var dbContext = services.GetRequiredService<ApplicationDbContext>();
var paul = dbContext.Users.FirstOrDefaultAsync
(u => u.Email == "paul@pschneider.fr").Result;
if (paul != null)
var tester = dbContext.Users.FirstOrDefaultAsync
(u => u.Id == server.TestingUser.Id).Result;
if (tester != null)
{
dbContext.Users.Remove(paul);
dbContext.Users.Remove(tester);
dbContext.SaveChanges();
}
}
@ -64,10 +64,10 @@ namespace isnd.host.tests
using (var serviceScope = server.Host.Services.CreateScope())
{
var isnSettings = serviceScope.ServiceProvider.GetService<IOptions<isnd.Entities.IsndSettings>>().Value;
string pkgSourceUrl = isnSettings.ExternalUrl + apiindex;
string pkgSourceUrl = isnSettings.ExternalUrl + apiindex + ".json";
ProcessStartInfo psi = new ProcessStartInfo("nuget");
psi.ArgumentList.Add("install");
psi.ArgumentList.Add("gitversion");
psi.ArgumentList.Add("isnd");
psi.ArgumentList.Add("-PreRelease");
psi.ArgumentList.Add("-Source");
psi.ArgumentList.Add(pkgSourceUrl);
@ -114,7 +114,7 @@ namespace isnd.host.tests
}
public string SPIIndexURI
{
get => server.Addresses.First() + "/v3/index.json";
get => server.Addresses.First(a => a.StartsWith("https:")) + "/v3/index.json";
}
[Fact]
@ -128,7 +128,7 @@ namespace isnd.host.tests
PackageMetadataResource resource = await repository.GetResourceAsync<PackageMetadataResource>();
IEnumerable<IPackageSearchMetadata> packages = await resource.GetMetadataAsync(
"isn.abst",
"isnd",
includePrerelease: true,
includeUnlisted: true,
cache,
@ -149,10 +149,12 @@ namespace isnd.host.tests
[Fact]
public async Task TestFindPackageAsync()
{
ILogger logger = NullLogger.Instance;
ILogger logger = new TestLogger();
CancellationToken cancellationToken = CancellationToken.None;
SourceRepository repository = Repository.Factory.GetCoreV3(SPIIndexURI);
repository.PackageSource.AllowInsecureConnections=true;
PackageSearchResource resource = await repository.GetResourceAsync<PackageSearchResource>();
SearchFilter searchFilter = new SearchFilter(includePrerelease: true);
@ -198,12 +200,23 @@ namespace isnd.host.tests
{
public override void Log(ILogMessage message)
{
Console.WriteLine(message.Message);
string msg = $"{message.Level}: {message.Message}";
switch (message.Level)
{
case LogLevel.Debug:
case LogLevel.Information:
case LogLevel.Verbose:
case LogLevel.Minimal:
case LogLevel.Warning:
case LogLevel.Error:
Debug.WriteLine(msg);
break;
}
}
public async override Task LogAsync(ILogMessage message)
public override Task LogAsync(ILogMessage message)
{
Log(message);
return Task.Run(()=>Log(message));
}
}
}