Merge pull request #3 from calebjenkins/develop

develop

README.md

@@ -47,3 +47,4 @@ Please submit all PRs to the `develop` branch
 ## Version History
 - 0.1.0 - intial version. `.NET 7` Installs as a dotnet global tool or run locally as a console web app.
 - 1.0.0 - official release. New features coming soon! 
+- 1.0.1 - added unit tests and version info on launch text

src/WebAPI/Calebs.WebAPI.csproj

@@ -13,8 +13,10 @@
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>Calebs.WebAPI</ToolCommandName>
 		<PackageOutputPath>../../nupkg</PackageOutputPath>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<IsPackable>true</IsPackable>
+		<PackageProjectUrl>https://github.com/calebjenkins/calebs.webapi/</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/calebjenkins/Calebs.WebAPI.git</RepositoryUrl>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -33,8 +35,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="..\..\README.md" Pack="true" PackagePath=""/>
-		<None Include="..\..\LICENSE" Pack="true" PackagePath=""/>
+		<None Include="..\..\README.md" Pack="true" PackagePath="" />
+		<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
 	</ItemGroup>
 
 </Project>

src/WebAPI/Program.cs

@@ -1,5 +1,8 @@
 using FakeAuth; // Using FakeAuth so I can send a 403 without setting up all the needed auth infrastructure
 using Calebs.Extensions.Console;
+using Calebs.Extensions;
+
+//namespace Calebs.WebAPI;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddAuthentication().AddFakeAuth();
@@ -25,8 +28,12 @@
 app.MapGet("/Secure", Check_Secure);
 
 var url = app.Urls.FirstOrDefault();
+var ver = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+
 
 ConsoleColor.Red.WriteLine(" -==::Caleb's Web API::==-");
+ConsoleColor.Blue.Write($"version: {ver}");
+ConsoleColor.Blue.WriteLine(" --- more info at https://github.com/calebjenkins/calebs.webapi/ ");
 Console.WriteLine("");
 Console.WriteLine("Available Endpoints:");
 Console.WriteLine($" - GET {url}/hello");
@@ -50,7 +57,7 @@ IResult Check_Secure(HttpContext context)
 {
     if (context.Request.Headers.Keys.Contains("bearer")) // && context.Request.Headers["bearer"] == TOKEN)
     {
-        return Results.Ok(new { Results = "Suceess!" });
+        return Results.Ok(new { Results = "Success!" });
     }
 
     return Results.Forbid();
@@ -77,3 +84,7 @@ async Task<string> StreamToString(Stream stream)
     var result = await reader.ReadToEndAsync();
     return result;
 }
+
+public partial class Program
+{ } // needed for test visability
+

src/WebAPITests/WebAPIApplication.cs

@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using FakeAuth;
+
+
+namespace Calebs.WebAPI.Tests;
+
+internal class WebAPIApplication : WebApplicationFactory<Program>
+{
+    private readonly string _environment;
+
+    public WebAPIApplication(string environment = "Development")
+    {
+        _environment = environment;
+    }
+
+    protected override IHost CreateHost(IHostBuilder builder)
+    {
+        builder.UseEnvironment(_environment);
+
+        // Add mock/test services to the builder here
+        builder.ConfigureServices(services =>
+        {
+            // nothing to change
+        });
+
+        return base.CreateHost(builder);
+    }
+}

src/WebAPITests/WebAPITests.cs

@@ -0,0 +1,74 @@
+using Microsoft.AspNetCore.Mvc.Testing;
+using Calebs.WebAPI;
+using Microsoft.VisualStudio.TestPlatform.TestHost;
+using System.Net;
+using System.Xml.Linq;
+
+
+namespace Calebs.WebAPI.Tests;
+
+public class WebAPITests
+{
+    private WebAPIApplication _server;
+    private HttpClient _client;
+    private const string _token = "fakeToken123xyz";
+
+    public WebAPITests()
+    {
+        _server = new WebAPIApplication();
+        _client = _server.CreateClient();
+    }
+
+    [Fact]
+    public async Task Hello_Should_Return_HelloWorld()
+    {
+        var response = await _client.GetAsync("/hello/");
+
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        var value = await response.Content.ReadAsStringAsync();
+        value.Should().Be("hello world");
+    }
+    [Theory]
+    [InlineData ("Joe")]
+    [InlineData ("Bill")]
+    [InlineData ("Fred the great!")]
+    [InlineData ("Elizabeth")]
+    public async Task Hello_NAME_Should_return_name(string Name)
+    {
+        var response = await _client.GetAsync($"/hello/{ Name }/");
+
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        var value = await response.Content.ReadAsStringAsync();
+        value.Should().Be($"hello {Name}");
+    }
+
+    [Fact]
+    public async Task Secure_No_Token_Should_Deny()
+    {
+        var response = await _client.GetAsync($"/secure");
+        response.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+    }
+
+    [Fact]
+    public async Task FakeToken_Should_return_token()
+    {
+        var response = await _client.GetAsync($"/FakeToken");
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        var value = await response.Content.ReadAsStringAsync();
+        value.Should().Be(_token);
+    }
+
+    [Fact]
+    public async Task Secure_with_Token_should_return_token()
+    {
+        var newClient = _server.CreateClient();
+        newClient.DefaultRequestHeaders.Add("bearer", _token);
+        var response = await newClient.GetAsync($"/Secure");
+
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        var value = await response.Content.ReadAsStringAsync();
+        value.Should().Contain("Success!");
+    }
+
+
+}