Refactor test folder to group related projects (#2094)

* Move benchmarks away from tests and mark IsPackable false in root * Move profiler tests in own subfolder * Create test/profiler/applications * move KafkaSample * move MySqlDataSample * move NpgsqlSample * move OracleManagedDataAccessCoreSample * move OracleManagedDataAccessSample * move RabbitMqSample * move SatalliteAssemblySample * move SqlClientSample * move SqliteSample * move AdoNet helpers * Ensure outputpath is not relative * update profiler tests path in workflows * reference to Microsoft.Net.Test.SDK dictates IsTestProject not Directory.Build.props * centralize test configuration * Move azure tests to test/azure * move instrumentation tests to their own folder * Move related grpc test sample project to tests
elastic · May 30, 2023 · 17a34b3 · 17a34b3
1 parent eb7cc0b
commit 17a34b3
Show file tree

Hide file tree

Showing 245 changed files with 330 additions and 466 deletions.
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -101,7 +101,7 @@ jobs:
       uses: ./.github/workflows/test
       with:
           name: 'profiler'
-          project: 'test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj'
+          project: 'test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj'
 
     - name: Create Docker Image
       run: .ci/linux/build_docker.sh
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -83,4 +83,4 @@ jobs:
         uses: ./.github/workflows/test
         with:
           name: 'profiler'
-          project: 'test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj'
+          project: 'test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj'
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -17,6 +17,10 @@
     <ExposedPublicKey>002400000480000094000000060200000024000052534131000400000100010051df3e4d8341d66c6dfbf35b2fda3627d08073156ed98eef81122b94e86ef2e44e7980202d21826e367db9f494c265666ae30869fb4cd1a434d171f6b634aa67fa8ca5b9076d55dc3baa203d3a23b9c1296c9f45d06a45cf89520bef98325958b066d8c626db76dd60d0508af877580accdd0e9f88e46b6421bf09a33de53fe1</ExposedPublicKey>
     <ExposedPublicKeySampleApps>0024000004800000940000000602000000240000525341310004000001000100553bc065771cba5728dd48f670a8f93d119fe6f165a3b65dbff073687a014dd033b9a0019cb7d790c7ffaff9e8b5204eb56364ea7e3da5b681136e3082a2c5ae826018f9d1578536923205ad6e9d7d877dffc22d33099c561f3409874fb286641bac5ec51017baf7817cef7dbf727b05d26e1dccc54de08d786398381b5085b2</ExposedPublicKeySampleApps>
     <DelaySign>false</DelaySign>
+    <!-- Suppress warnings when a proj is marked <IsPackable>false</IsPackable> 
+     but dotnet pack expects to pack it e.g. Microsoft.NET.Sdk.Web test and sample projects. -->
+    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <!-- MinVer Configuration -->
   <PropertyGroup>

diff --git a/ElasticApmAgent.sln b/ElasticApmAgent.sln
diff --git a/benchmarks/Directory.Build.props b/benchmarks/Directory.Build.props
@@ -0,0 +1,4 @@
+<Project>
+  <!-- Test Directory Build Properties -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
diff --git a/...etCorePerf/AspNetCoreLoadTestWithAgent.cs → ...etCorePerf/AspNetCoreLoadTestWithAgent.cs b/...etCorePerf/AspNetCoreLoadTestWithAgent.cs → ...etCorePerf/AspNetCoreLoadTestWithAgent.cs
diff --git a/...orePerf/AspNetCoreLoadTestWithoutAgent.cs → ...orePerf/AspNetCoreLoadTestWithoutAgent.cs b/...orePerf/AspNetCoreLoadTestWithoutAgent.cs → ...orePerf/AspNetCoreLoadTestWithoutAgent.cs
diff --git a/.../AspNetCorePerf/AspNetCoreSampleRunner.cs → .../AspNetCorePerf/AspNetCoreSampleRunner.cs b/.../AspNetCorePerf/AspNetCoreSampleRunner.cs → .../AspNetCorePerf/AspNetCoreSampleRunner.cs
diff --git a/...astic.Apm.Benchmarks/DroppedSpansStats.cs → ...astic.Apm.Benchmarks/DroppedSpansStats.cs b/...astic.Apm.Benchmarks/DroppedSpansStats.cs → ...astic.Apm.Benchmarks/DroppedSpansStats.cs
diff --git a/....Benchmarks/Elastic.Apm.Benchmarks.csproj → ....Benchmarks/Elastic.Apm.Benchmarks.csproj b/....Benchmarks/Elastic.Apm.Benchmarks.csproj → ....Benchmarks/Elastic.Apm.Benchmarks.csproj
@@ -16,8 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\sample\SampleAspNetCoreApp\SampleAspNetCoreApp.csproj"/>
     <ProjectReference Include="..\..\src\Elastic.Apm\Elastic.Apm.csproj"/>
-    <ProjectReference Include="..\Elastic.Apm.Tests.Utilities\Elastic.Apm.Tests.Utilities.csproj"/>
-    <ProjectReference Include="..\Elastic.Apm.Tests\Elastic.Apm.Tests.csproj"/>
+    <ProjectReference Include="..\..\test\Elastic.Apm.Tests.Utilities\Elastic.Apm.Tests.Utilities.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Elastic.Apm.Benchmarks/Helpers/GitInfo.cs → ...Elastic.Apm.Benchmarks/Helpers/GitInfo.cs b/...Elastic.Apm.Benchmarks/Helpers/GitInfo.cs → ...Elastic.Apm.Benchmarks/Helpers/GitInfo.cs
diff --git a/...astic.Apm.Benchmarks/MetricsBenchmarks.cs → ...astic.Apm.Benchmarks/MetricsBenchmarks.cs b/...astic.Apm.Benchmarks/MetricsBenchmarks.cs → ...astic.Apm.Benchmarks/MetricsBenchmarks.cs
diff --git a/.../Elastic.Apm.Benchmarks/PerfTestLogger.cs → .../Elastic.Apm.Benchmarks/PerfTestLogger.cs b/.../Elastic.Apm.Benchmarks/PerfTestLogger.cs → .../Elastic.Apm.Benchmarks/PerfTestLogger.cs
diff --git a/test/Elastic.Apm.Benchmarks/Program.cs → benchmarks/Elastic.Apm.Benchmarks/Program.cs b/test/Elastic.Apm.Benchmarks/Program.cs → benchmarks/Elastic.Apm.Benchmarks/Program.cs
diff --git a/...pm.Benchmarks/PropertyFetcherBenchmark.cs → ...pm.Benchmarks/PropertyFetcherBenchmark.cs b/...pm.Benchmarks/PropertyFetcherBenchmark.cs → ...pm.Benchmarks/PropertyFetcherBenchmark.cs
diff --git a/...pm.Benchmarks/SignatureParserBenchmark.cs → ...pm.Benchmarks/SignatureParserBenchmark.cs b/...pm.Benchmarks/SignatureParserBenchmark.cs → ...pm.Benchmarks/SignatureParserBenchmark.cs
diff --git a/...tResources/db/sql_signature_examples.json → ...tResources/db/sql_signature_examples.json b/...tResources/db/sql_signature_examples.json → ...tResources/db/sql_signature_examples.json
diff --git a/...c.Apm.Benchmarks/TraceParentBenchmarks.cs → ...c.Apm.Benchmarks/TraceParentBenchmarks.cs b/...c.Apm.Benchmarks/TraceParentBenchmarks.cs → ...c.Apm.Benchmarks/TraceParentBenchmarks.cs
diff --git a/...lastic.Apm.Benchmarks/TracerBenchmarks.cs → ...lastic.Apm.Benchmarks/TracerBenchmarks.cs b/...lastic.Apm.Benchmarks/TracerBenchmarks.cs → ...lastic.Apm.Benchmarks/TracerBenchmarks.cs
diff --git a/...pm.Benchmarks/WildcardMatcherBenchmark.cs → ...pm.Benchmarks/WildcardMatcherBenchmark.cs b/...pm.Benchmarks/WildcardMatcherBenchmark.cs → ...pm.Benchmarks/WildcardMatcherBenchmark.cs
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -2,28 +2,37 @@
   <!-- Test Directory Build Properties -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <!-- Suppress warnings when a proj is marked <IsPackable>false</IsPackable> 
-     but dotnet pack expects to pack it e.g. Microsoft.NET.Sdk.Web test and sample projects. -->
-    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
     <!-- Always generate debug symbols this allows fluent symbols exception messages to include variable names -->
     <DebugSymbols>True</DebugSymbols>
-    <!-- All projects in this directory are assumed to be Test projects by default i.e. containing tests. Some may not
-     be however, so they can override this setting so that common test components are not added.
-     -->
-    <IsTestProject>true</IsTestProject>
+
+    <!-- Elastic.Apm.AspNetFullFramework is completely self managed since it needs a lot of special care (for now) -->
+    <IsAspNetFullFrameworkTests Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(ProjectName), '^(.*)AspNetFullFramework\.Tests$'))">true</IsAspNetFullFrameworkTests>
+    <IsRegularTestProject Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(ProjectName), '^(.*)Tests$')) AND '$(IsAspNetFullFrameworkTests)' == ''">true</IsRegularTestProject>
   </PropertyGroup>
+
   <ItemGroup>
     <!-- use xunit config for all test files. Allow assemblies to run in parallel -->
-    <Content Include="$(SolutionRoot)/xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Condition="'$(IsTestProject)' == 'true'" />
+    <Content Include="$(SolutionRoot)\xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Condition="'$(IsRegularTestProject)' == 'true'" />
   </ItemGroup>
-
-  <ItemGroup>
-    <!-- Add coverlet collector for all platforms and frameworks, except net462 -->
-    <PackageReference Include="coverlet.collector" Version="3.0.2" Condition="'$(IsTestProject)' == 'true' AND '$(TargetFramework)' != 'net462'">
+
+  <PropertyGroup
+    Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(ProjectName), '^(.*)Tests$')) AND !$([System.Text.RegularExpressions.Regex]::IsMatch($(ProjectName), '^(.*)AspNetFullFramework\.Tests$'))">
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup 
+    Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(ProjectName), '^(.*)Tests$')) AND !$([System.Text.RegularExpressions.Regex]::IsMatch($(ProjectName), '^(.*)AspNetFullFramework\.Tests$'))">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+
+    <PackageReference Include="JunitXml.TestLogger" Version="3.0.114" PrivateAssets="All" />
+    <PackageReference Include="Nullean.VsTest.Pretty.TestLogger" Version="0.3.0" PrivateAssets="All" />
+
+    <PackageReference Include="FluentAssertions" Version="5.6.0" />
+    <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="JunitXml.TestLogger" Version="2.1.81" Condition="'$(IsTestProject)' == 'true'" />
   </ItemGroup>
 </Project>
diff --git a/test/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj b/test/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj
@@ -3,18 +3,7 @@
       <TargetFramework>net7.0</TargetFramework>
     </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageReference Include="FluentAssertions" Version="5.6.0" />
-    <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageReference Include="Moq" Version="4.12.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-  </ItemGroup>
-  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0"/>
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0"/>
   </ItemGroup>

diff --git a/test/Elastic.Apm.AspNetCore.Tests/Elastic.Apm.AspNetCore.Tests.csproj b/test/Elastic.Apm.AspNetCore.Tests/Elastic.Apm.AspNetCore.Tests.csproj
@@ -11,19 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageReference Include="FluentAssertions" Version="5.6.0" />
-    <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageReference Include="Moq" Version="4.12.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-  </ItemGroup>
-  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />

diff --git a/test/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj b/test/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj
diff --git a/test/Elastic.Apm.Azure.Functions.Tests/Elastic.Apm.Azure.Functions.Tests.csproj b/test/Elastic.Apm.Azure.Functions.Tests/Elastic.Apm.Azure.Functions.Tests.csproj
diff --git a/test/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj b/test/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj
diff --git a/test/Elastic.Apm.Docker.Tests/Elastic.Apm.Docker.Tests.csproj b/test/Elastic.Apm.Docker.Tests/Elastic.Apm.Docker.Tests.csproj
diff --git a/test/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj b/test/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj
diff --git a/test/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj b/test/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj
@@ -6,15 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="Moq" Version="4.12.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj b/test/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj
@@ -6,15 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="Moq" Version="4.12.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Elastic.Apm.Feature.Tests/CloudProviderSteps.cs b/test/Elastic.Apm.Feature.Tests/CloudProviderSteps.cs
@@ -131,7 +131,10 @@ public void CloudMetadataKeyEqualsValue(string key, string value)
 			var token = payloadCollector.Payloads[0].Body[0].SelectToken($"metadata.cloud.{key}");
 
 			token.Should().NotBeNull();
-			token.Value<string>().Should().Be(value);
+			var prop = token as JProperty;
+			prop.Should().NotBeNull();
+			prop.Value<string>().Should().Be(value);
+
 		}
 	}
 }
diff --git a/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj b/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj
@@ -6,13 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
-    <PackageReference Include="FluentAssertions" Version="5.6.0"/>
     <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0"/>
     <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.5"/>
     <PackageReference Include="SpecFlow.xUnit" Version="3.5.5"/>
-    <PackageReference Include="xunit" Version="2.4.1"/>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj b/test/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj
diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj b/test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj