Reorganize files

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj

@@ -39,8 +39,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="RouteTests\testcases.json">
-      <LogicalName>RouteTests.testcases.json</LogicalName>
+    <EmbeddedResource Include="RouteTests\RoutingTestCases.json">
+      <LogicalName>RoutingTestCases.json</LogicalName>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RouteTestData.cs → test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestCases.cs

@@ -1,4 +1,4 @@
-// <copyright file="RouteTestData.cs" company="OpenTelemetry Authors">
+// <copyright file="RoutingTestCases.cs" company="OpenTelemetry Authors">
 // Copyright The OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,16 +19,17 @@
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using RouteTests.TestApplication;
 
 namespace RouteTests;
 
-public static class RouteTestData
+public static class RoutingTestCases
 {
     public static IEnumerable<object[]> GetTestCases()
     {
         var assembly = Assembly.GetExecutingAssembly();
-        var input = JsonSerializer.Deserialize<RouteTestCase[]>(
-            assembly.GetManifestResourceStream("RouteTests.testcases.json")!,
+        var input = JsonSerializer.Deserialize<TestCase[]>(
+            assembly.GetManifestResourceStream("RoutingTestCases.json")!,
             new JsonSerializerOptions
             {
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
@@ -37,7 +38,7 @@ public static IEnumerable<object[]> GetTestCases()
         return GetArgumentsFromTestCaseObject(input!);
     }
 
-    private static IEnumerable<object[]> GetArgumentsFromTestCaseObject(IEnumerable<RouteTestCase> input)
+    private static IEnumerable<object[]> GetArgumentsFromTestCaseObject(IEnumerable<TestCase> input)
     {
         var result = new List<object[]>();
 
@@ -55,7 +56,7 @@ private static IEnumerable<object[]> GetArgumentsFromTestCaseObject(IEnumerable<
         return result;
     }
 
-    public class RouteTestCase
+    public class TestCase
     {
         public string Name { get; set; } = string.Empty;
 

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestFixture.cs

@@ -19,6 +19,7 @@
 using System.Text;
 using System.Text.Json;
 using Microsoft.AspNetCore.Builder;
+using RouteTests.TestApplication;
 
 namespace RouteTests;
 
@@ -27,7 +28,7 @@ public class RoutingTestFixture : IDisposable
     private readonly Dictionary<TestApplicationScenario, WebApplication> apps = new();
     private readonly HttpClient client = new();
     private readonly RouteInfoDiagnosticObserver diagnostics = new();
-    private readonly List<TestResult> testResults = new();
+    private readonly List<RoutingTestResult> testResults = new();
 
     public RoutingTestFixture()
     {
@@ -54,7 +55,7 @@ public async Task MakeRequest(TestApplicationScenario scenario, string path)
         await this.client.GetAsync(url).ConfigureAwait(false);
     }
 
-    public void AddTestResult(TestResult testResult)
+    public void AddTestResult(RoutingTestResult testResult)
     {
         var app = this.apps[testResult.TestCase.TestApplicationScenario];
         var baseUrl = app.Urls.First();

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestResult.cs → test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestResult.cs

@@ -1,4 +1,4 @@
-// <copyright file="TestResult.cs" company="OpenTelemetry Authors">
+// <copyright file="RoutingTestResult.cs" company="OpenTelemetry Authors">
 // Copyright The OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,10 +18,11 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using RouteTests.TestApplication;
 
 namespace RouteTests;
 
-public class TestResult
+public class RoutingTestResult
 {
     private static readonly JsonSerializerOptions JsonSerializerOptions = new() { WriteIndented = true };
 
@@ -36,7 +37,7 @@ public class TestResult
     public RouteInfo RouteInfo { get; set; } = new RouteInfo();
 
     [JsonIgnore]
-    public RouteTestData.RouteTestCase TestCase { get; set; } = new RouteTestData.RouteTestCase();
+    public RoutingTestCases.TestCase TestCase { get; set; } = new RoutingTestCases.TestCase();
 
     public override string ToString()
     {

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTests.cs

@@ -41,11 +41,11 @@ public RoutingTests(RoutingTestFixture fixture)
         this.fixture = fixture;
     }
 
-    public static IEnumerable<object[]> TestData => RouteTestData.GetTestCases();
+    public static IEnumerable<object[]> TestData => RoutingTestCases.GetTestCases();
 
     [Theory]
     [MemberData(nameof(TestData))]
-    public async Task TestRoutes(RouteTestData.RouteTestCase testCase, bool useLegacyConventions)
+    public async Task TestRoutes(RoutingTestCases.TestCase testCase, bool useLegacyConventions)
     {
         var previousSetting = Environment.GetEnvironmentVariable("OTEL_SEMCONV_STABILITY_OPT_IN");
         Environment.SetEnvironmentVariable("OTEL_SEMCONV_STABILITY_OPT_IN", useLegacyConventions ? null : "http");
@@ -134,7 +134,7 @@ public async Task TestRoutes(RouteTestData.RouteTestCase testCase, bool useLegac
             Assert.Equal(testCase.ExpectedHttpRoute, metricHttpRoute);
         }
 
-        var testResult = new TestResult
+        var testResult = new RoutingTestResult
         {
             IdealHttpRoute = testCase.ExpectedHttpRoute,
             ActivityDisplayName = activity.DisplayName,

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RouteInfo.cs → test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestApplication/RouteInfo.cs

@@ -26,7 +26,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Routing;
 
-namespace RouteTests;
+namespace RouteTests.TestApplication;
 
 public class RouteInfo
 {

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RouteInfoDiagnosticObserver.cs → test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestApplication/RouteInfoDiagnosticObserver.cs

@@ -20,7 +20,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Diagnostics;
 
-namespace RouteTests;
+namespace RouteTests.TestApplication;
 
 /// <summary>
 /// This observer captures all the available route information for a request.

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RouteInfoMiddleware.cs → test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestApplication/RouteInfoMiddleware.cs

@@ -20,7 +20,7 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Http;
 
-namespace RouteTests;
+namespace RouteTests.TestApplication;
 
 public class RouteInfoMiddleware
 {

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestApplicationFactory.cs → test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestApplication/TestApplicationFactory.cs

@@ -24,7 +24,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 
-namespace RouteTests;
+namespace RouteTests.TestApplication;
 
 public enum TestApplicationScenario
 {
@@ -52,9 +52,7 @@ public enum TestApplicationScenario
 internal class TestApplicationFactory
 {
     private static readonly string AspNetCoreTestsPath = new FileInfo(typeof(RoutingTests)!.Assembly!.Location)!.Directory!.Parent!.Parent!.Parent!.FullName;
-    private static readonly string ContentRootPath = AspNetCoreTestsPath.EndsWith("RouteTests")
-        ? AspNetCoreTestsPath
-        : Path.Combine(AspNetCoreTestsPath, "RouteTests");
+    private static readonly string ContentRootPath = Path.Combine(AspNetCoreTestsPath, "RouteTests", "TestApplication");
 
     public static WebApplication? CreateApplication(TestApplicationScenario config)
     {