SteeltoeOSS
/
InitializrService
зеркало из https://github.com/SteeltoeOSS/InitializrService.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Add unit tests for unsupported Steeltoe and framework

This commit is contained in:
Chris Cheetham 2021-07-01 10:44:05 -04:00
Родитель 8652ea314c
Коммит e4e53b3fbf
2 изменённых файлов: 107 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

17
src/InitializrApi/Controllers/ProjectController.cs
Просмотреть файл

@ -72,12 +72,6 @@ namespace Steeltoe.InitializrApi.Controllers
Packaging = spec.Packaging ?? defaults?.Packaging?.Default,
Dependencies = spec.Dependencies ?? defaults?.Dependencies?.Default,
};
if (normalizedSpec.Packaging is null)
{
return StatusCode(
StatusCodes.Status500InternalServerError,
"Default packaging not configured.");
}
if (new ReleaseRange("3.0.0").Accepts(normalizedSpec.SteeltoeVersion)
&& !new ReleaseRange("netcoreapp3.1").Accepts(normalizedSpec.DotNetFramework))
@ -105,14 +99,14 @@ namespace Steeltoe.InitializrApi.Controllers
if (!steeltoeRange.Accepts(normalizedSpec.SteeltoeVersion))
{
return NotFound(
$"Dependency '{deps[i]}' not found for Steeltoe version {normalizedSpec.SteeltoeVersion}.");
$"No dependency '{deps[i]}' found for Steeltoe version {normalizedSpec.SteeltoeVersion}.");
}
var frameworkRange = new ReleaseRange(dep.DotNetFrameworkRange);
if (!frameworkRange.Accepts(normalizedSpec.DotNetFramework))
{
return NotFound(
$"Dependency '{deps[i]}' not found for .NET framework version {normalizedSpec.DotNetFramework}.");
$"No dependency '{deps[i]}' found for .NET framework {normalizedSpec.DotNetFramework}.");
}
deps[i] = dep.Id;
@ -129,6 +123,13 @@ namespace Steeltoe.InitializrApi.Controllers
normalizedSpec.Dependencies = string.Join(',', deps);
}
if (normalizedSpec.Packaging is null)
{
return StatusCode(
StatusCodes.Status500InternalServerError,
"Default packaging not configured.");
}
Logger.LogDebug("Project specification: {ProjectSpec}", normalizedSpec);
try
{

105
test/InitializrApi.Test.Unit/Controllers/ProjectControllerTests.cs
Просмотреть файл

@ -181,6 +181,97 @@ namespace Steeltoe.InitializrApi.Test.Unit.Controllers
result.Value.Should().Be("Default packaging not configured.");
}
[Fact]
public async Task Unsupported_Steeltoe_Version_Should_Return_404_NotFound()
{
// Arrange
var config = new UiConfig
{
Name = new UiConfig.Text { Default = "my project name" },
Description = new UiConfig.Text { Default = "my description" },
Namespace = new UiConfig.Text { Default = "my namespace" },
SteeltoeVersion = new UiConfig.SingleSelectList { Default = "0.0" },
DotNetFramework = new UiConfig.SingleSelectList { Default = "0.0" },
Dependencies = new UiConfig.GroupList
{
Values = new[]
{
new UiConfig.Group
{
Values = new[]
{
new UiConfig.GroupItem
{
Id = "MyDep",
SteeltoeVersionRange = "1.0"
},
},
},
},
},
};
var controller = new ProjectControllerBuilder()
.WithInitializrConfiguration(config)
.Build();
var spec = new ProjectSpec
{
Dependencies = "mydep",
};
// Act
var unknown = await controller.GetProjectArchive(spec);
var result = Assert.IsType<NotFoundObjectResult>(unknown);
// Assert
result.Value.ToString().Should().Be("No dependency 'mydep' found for Steeltoe version 0.0.");
}
[Fact]
public async Task Unsupported_DotNet_Framework_Should_Return_404_NotFound()
{
// Arrange
var config = new UiConfig
{
Name = new UiConfig.Text { Default = "my project name" },
Description = new UiConfig.Text { Default = "my description" },
Namespace = new UiConfig.Text { Default = "my namespace" },
SteeltoeVersion = new UiConfig.SingleSelectList { Default = "0.0" },
DotNetFramework = new UiConfig.SingleSelectList { Default = "0.0" },
Dependencies = new UiConfig.GroupList
{
Values = new[]
{
new UiConfig.Group
{
Values = new[]
{
new UiConfig.GroupItem
{
Id = "MyDep",
DotNetFrameworkRange = "1.0"
},
},
},
},
},
};
var controller = new ProjectControllerBuilder()
.WithInitializrConfiguration(config)
.Build();
var spec = new ProjectSpec
{
Dependencies = "mydep",
};
// Act
var unknown = await controller.GetProjectArchive(spec);
var result = Assert.IsType<NotFoundObjectResult>(unknown);
// Assert
result.Value.ToString().Should().Be("No dependency 'mydep' found for .NET framework 0.0.");
}
/* ----------------------------------------------------------------- *
* test helpers *
* ----------------------------------------------------------------- */
@ -241,19 +332,19 @@ namespace Steeltoe.InitializrApi.Test.Unit.Controllers
var buffer = new StringBuilder();
buffer.Append("project name=").Append(spec.Name ?? "<na>");
buffer.Append(newline);
buffer.Append("description=").Append(spec.Description ?? "<na>" );
buffer.Append("description=").Append(spec.Description ?? "<na>");
buffer.Append(newline);
buffer.Append("namespace=").Append(spec.Namespace ?? "<na>" );
buffer.Append("namespace=").Append(spec.Namespace ?? "<na>");
buffer.Append(newline);
buffer.Append("steeltoe version=").Append(spec.SteeltoeVersion ?? "<na>" );
buffer.Append("steeltoe version=").Append(spec.SteeltoeVersion ?? "<na>");
buffer.Append(newline);
buffer.Append("dotnet framework=").Append(spec.DotNetFramework ?? "<na>" );
buffer.Append("dotnet framework=").Append(spec.DotNetFramework ?? "<na>");
buffer.Append(newline);
buffer.Append("language=").Append(spec.Language ?? "<na>" );
buffer.Append("language=").Append(spec.Language ?? "<na>");
buffer.Append(newline);
buffer.Append("packaging=").Append(spec.Packaging ?? "<na>" );
buffer.Append("packaging=").Append(spec.Packaging ?? "<na>");
buffer.Append(newline);
buffer.Append("dependencies=").Append(spec.Dependencies ?? "<na>" );
buffer.Append("dependencies=").Append(spec.Dependencies ?? "<na>");
buffer.Append(newline);
return Task.FromResult(Encoding.ASCII.GetBytes(buffer.ToString()));
}