running unit tests - wip #1

tye-v2 · Feb 13, 2024 · 3ca36c8 · 3ca36c8
1 parent bd3e4fc
commit 3ca36c8
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 34 deletions.
diff --git a/test/E2ETest/ApplicationFactoryTests.cs b/test/E2ETest/ApplicationFactoryTests.cs
@@ -135,33 +135,34 @@ public async Task TargetFrameworkFromCliArgs()
             // Debug targets can be null if not specified, so make sure calling host.Start does not throw.
             var outputContext = new OutputContext(_sink, Verbosity.Debug);
             var projectFile = new FileInfo(yamlFile);
-            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, "netcoreapp3.1");
+            var framework = "net7.0";
+            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, framework);
 
             Assert.Single(applicationBuilder.Services);
             var service = applicationBuilder.Services.Single(s => s.Name == "multi-targetframeworks");
 
             var containsTargetFramework = ((DotnetProjectServiceBuilder)service).BuildProperties.TryGetValue("TargetFramework", out var targetFramework);
             Assert.True(containsTargetFramework);
-            Assert.Equal("netcoreapp3.1", targetFramework);
+            Assert.Equal(framework, targetFramework);
         }
 
         [Fact]
         public async Task TargetFrameworkFromCliArgsDoesNotOverwriteYaml()
         {
             using var projectDirectory = TestHelpers.CopyTestProjectDirectory(Path.Combine("multi-targetframeworks"));
-            var yamlFile = Path.Combine(projectDirectory.DirectoryPath, "tye-with-netcoreapp21.yaml");
+            var yamlFile = Path.Combine(projectDirectory.DirectoryPath, "tye-with-net7.0.yaml");
 
             // Debug targets can be null if not specified, so make sure calling host.Start does not throw.
             var outputContext = new OutputContext(_sink, Verbosity.Debug);
             var projectFile = new FileInfo(yamlFile);
-            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, "netcoreapp3.1");
+            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, "net8.0");
 
             Assert.Single(applicationBuilder.Services);
             var service = applicationBuilder.Services.Single(s => s.Name == "multi-targetframeworks");
 
             var containsTargetFramework = ((DotnetProjectServiceBuilder)service).BuildProperties.TryGetValue("TargetFramework", out var targetFramework);
             Assert.True(containsTargetFramework);
-            Assert.Equal("netcoreapp2.1", targetFramework);
+            Assert.Equal("net7.0", targetFramework);
         }
 
         [Fact]
@@ -173,7 +174,7 @@ public async Task TargetFrameworkFromCliArgsDoesNotOverrideSingleTFM()
             // Debug targets can be null if not specified, so make sure calling host.Start does not throw.
             var outputContext = new OutputContext(_sink, Verbosity.Debug);
             var projectFile = new FileInfo(yamlFile);
-            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, "net5.0");
+            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, "net7.0");
 
             Assert.Single(applicationBuilder.Services);
             var service = applicationBuilder.Services.Single(s => s.Name == "test-project");
@@ -205,7 +206,7 @@ public async Task ThrowIfSpecifyTargetFrameworkNotDefinedIsCsproj()
             var outputContext = new OutputContext(_sink, Verbosity.Debug);
             var projectFile = new FileInfo(yamlFile);
 
-            await Assert.ThrowsAsync<CommandException>(async () => await ApplicationFactory.CreateAsync(outputContext, projectFile, "net5.0"));
+            await Assert.ThrowsAsync<CommandException>(async () => await ApplicationFactory.CreateAsync(outputContext, projectFile, "netcoreapp1.1"));
         }
 
         [Fact]

diff --git a/test/E2ETest/testassets/projects/multi-targetframeworks/multi-targetframeworks/Program.cs b/test/E2ETest/testassets/projects/multi-targetframeworks/multi-targetframeworks/Program.cs
@@ -5,11 +5,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-#if NETCOREAPP3_1
-#else
-using Microsoft.AspNetCore;
-#endif
-
 namespace MultiTargetFrameworks
 {
     public class Program
@@ -19,17 +14,11 @@ public static void Main(string[] args)
             CreateHostBuilder(args).Build().Run();
         }
 
-#if NETCOREAPP3_1
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(web =>
                 {
                     web.UseStartup<Startup>();
                 });
-#else
-        public static IWebHostBuilder CreateHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>();
-#endif
     }
 }
diff --git a/test/E2ETest/testassets/projects/multi-targetframeworks/multi-targetframeworks/Startup.cs b/test/E2ETest/testassets/projects/multi-targetframeworks/multi-targetframeworks/Startup.cs
@@ -28,12 +28,7 @@ public void Configure(IApplicationBuilder app)
         {
             app.Use(async (httpContext, next) =>
             {
-#if NETCOREAPP3_1
                 await httpContext.Response.WriteAsync(System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription);
-#else
-                var framework = Assembly.GetEntryAssembly()?.GetCustomAttribute<TargetFrameworkAttribute>()?.FrameworkName;
-                await httpContext.Response.WriteAsync(framework);
-#endif
             });
         }
     }

diff --git a/...sets/projects/multi-targetframeworks/multi-targetframeworks/multi-targetframeworks.csproj b/...sets/projects/multi-targetframeworks/multi-targetframeworks/multi-targetframeworks.csproj
@@ -1,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0</TargetFrameworks>
     <RootNamespace>MultiTargetFrameworks</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
 </Project>
diff --git a/...rgetframeworks/tye-with-netcoreapp21.yaml → ...lti-targetframeworks/tye-with-net7.0.yaml b/...rgetframeworks/tye-with-netcoreapp21.yaml → ...lti-targetframeworks/tye-with-net7.0.yaml
@@ -6,4 +6,4 @@ services:
   project: multi-targetframeworks/multi-targetframeworks.csproj
   buildProperties:
     - name: TargetFramework
-      value: netcoreapp2.1
+      value: net7.0
diff --git a/...rgetframeworks/tye-with-netcoreapp31.yaml → ...lti-targetframeworks/tye-with-net8.0.yaml b/...rgetframeworks/tye-with-netcoreapp31.yaml → ...lti-targetframeworks/tye-with-net8.0.yaml
@@ -6,4 +6,4 @@ services:
   project: multi-targetframeworks/multi-targetframeworks.csproj
   buildProperties:
     - name: TargetFramework
-      value: netcoreapp3.1
+      value: net8.0
diff --git a/test/Test.Infrastructure/TestHelpers.cs b/test/Test.Infrastructure/TestHelpers.cs
@@ -19,6 +19,8 @@ namespace Test.Infrastructure
 {
     public static class TestHelpers
     {
+        private const string solutionName = "tye2";
+
         private static readonly TimeSpan WaitForServicesTimeout = Debugger.IsAttached ? TimeSpan.FromMinutes(5) : TimeSpan.FromMinutes(1);
 
         // https://github.com/dotnet/aspnetcore/blob/5a0526dfd991419d5bce0d8ea525b50df2e37b04/src/Testing/src/TestPathUtilities.cs
@@ -47,7 +49,7 @@ public static string GetSolutionRootDirectory(string solution)
         public static DirectoryInfo GetTestAssetsDirectory()
         {
             return new DirectoryInfo(Path.Combine(
-                TestHelpers.GetSolutionRootDirectory("tye"),
+                TestHelpers.GetSolutionRootDirectory(solutionName),
                 "test",
                 "E2ETest",
                 "testassets"));
@@ -56,7 +58,7 @@ public static DirectoryInfo GetTestAssetsDirectory()
         public static DirectoryInfo GetTestProjectDirectory(string projectName)
         {
             var directory = new DirectoryInfo(Path.Combine(
-                TestHelpers.GetSolutionRootDirectory("tye"),
+                TestHelpers.GetSolutionRootDirectory(solutionName),
                 "test",
                 "E2ETest",
                 "testassets",
@@ -69,7 +71,7 @@ public static DirectoryInfo GetTestProjectDirectory(string projectName)
         public static DirectoryInfo GetSampleProjectDirectory(string projectName)
         {
             var directory = new DirectoryInfo(Path.Combine(
-                TestHelpers.GetSolutionRootDirectory("tye"),
+                TestHelpers.GetSolutionRootDirectory(solutionName),
                 "samples",
                 projectName));
             Assert.True(directory.Exists, $"Project {projectName} not found.");
@@ -83,7 +85,7 @@ public static TempDirectory CopyTestProjectDirectory(string projectName)
 
             // We need to hijack any P2P references to Tye libraries.
             // Test projects must use $(TyeLibrariesPath) to find their references.
-            var libraryPath = Path.Combine(TestHelpers.GetSolutionRootDirectory("tye"), "src");
+            var libraryPath = Path.Combine(TestHelpers.GetSolutionRootDirectory(solutionName), "src");
             if (!libraryPath.EndsWith(Path.DirectorySeparatorChar))
             {
                 libraryPath += Path.DirectorySeparatorChar;

diff --git a/tye2.sln.DotSettings b/tye2.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=targetframeworks/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
		<s:Boolean x:Key="/Default/UserDictionary/Words/=targetframeworks/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>