[AzureMonitorExporter] Split Integration.Tests project (#29703)

* initial commit * readme * cleanup * fix link according to repo guidelines * azure sdk readme guidelines * remove readme files
Azure · Jul 7, 2022 · b62fd9f · b62fd9f
1 parent ad4d05e
commit b62fd9f
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 11 deletions.
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/Azure.Monitor.OpenTelemetry.Exporter.sln b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/Azure.Monitor.OpenTelemetry.Exporter.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30330.147
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.TestFramework", "..\..\core\Azure.Core.TestFramework\src\Azure.Core.TestFramework.csproj", "{8052009B-2126-44A3-88CD-4F3B17894C64}"
 EndProject
@@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Monitor.OpenTelemetry
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Monitor.OpenTelemetry.Exporter.Tracing.Customization", "tests\Azure.Monitor.OpenTelemetry.Exporter.Tracing.Customization\Azure.Monitor.OpenTelemetry.Exporter.Tracing.Customization.csproj", "{57A53135-3C1B-4106-B873-434B2F606B17}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Monitor.OpenTelemetry.Exporter.E2E.Tests", "tests\E2E.Tests\Azure.Monitor.OpenTelemetry.Exporter.E2E.Tests.csproj", "{5083A0B8-24CE-4AC4-AC23-C9BD87EE2FC8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -57,10 +59,10 @@ Global
 		{57A53135-3C1B-4106-B873-434B2F606B17}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{57A53135-3C1B-4106-B873-434B2F606B17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57A53135-3C1B-4106-B873-434B2F606B17}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9816D6D4-AAF3-42F8-A358-962A8BE6FFC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9816D6D4-AAF3-42F8-A358-962A8BE6FFC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9816D6D4-AAF3-42F8-A358-962A8BE6FFC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9816D6D4-AAF3-42F8-A358-962A8BE6FFC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5083A0B8-24CE-4AC4-AC23-C9BD87EE2FC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5083A0B8-24CE-4AC4-AC23-C9BD87EE2FC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5083A0B8-24CE-4AC4-AC23-C9BD87EE2FC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5083A0B8-24CE-4AC4-AC23-C9BD87EE2FC8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Properties/AssemblyInfo.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@
 
 [assembly: InternalsVisibleTo("Azure.Monitor.OpenTelemetry.Exporter.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")]
 [assembly: InternalsVisibleTo("Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")]
+[assembly: InternalsVisibleTo("Azure.Monitor.OpenTelemetry.Exporter.E2E.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")]
 [assembly: InternalsVisibleTo("Azure.Monitor.OpenTelemetry.Exporter.Benchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")]
 
 // Moq

diff --git a/...nTelemetry.Exporter/tests/E2E.Tests/Azure.Monitor.OpenTelemetry.Exporter.E2E.Tests.csproj b/...nTelemetry.Exporter/tests/E2E.Tests/Azure.Monitor.OpenTelemetry.Exporter.E2E.Tests.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Azure.ApplicationInsights.Query" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(AzureCoreTestFramework)" />
+    <ProjectReference Include="..\..\src\Azure.Monitor.OpenTelemetry.Exporter.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(AzureCoreSharedSources)\HttpPipelineMessageHandler.cs" LinkBase="Shared" />
+  </ItemGroup>
+
+</Project>
diff --git a/...Tests/AzureMonitorLogExporterLiveTests.cs → ...Tests/AzureMonitorLogExporterLiveTests.cs b/...Tests/AzureMonitorLogExporterLiveTests.cs → ...Tests/AzureMonitorLogExporterLiveTests.cs
@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.FunctionalTests
+namespace Azure.Monitor.OpenTelemetry.Exporter.E2E.Tests
 {
     using System.Threading.Tasks;
 
     using Azure.Core.TestFramework;
+    using Azure.Monitor.OpenTelemetry.Exporter;
+    using Azure.Monitor.OpenTelemetry.Exporter.E2E.Tests.TestFramework;
 
     using global::OpenTelemetry;
 

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/E2E.Tests/Properties/AssemblyInfo.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/E2E.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Xunit;
+[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true)]
diff --git a/...gExporterLiveTests/VerifyLogExporter.json → ...gExporterLiveTests/VerifyLogExporter.json b/...gExporterLiveTests/VerifyLogExporter.json → ...gExporterLiveTests/VerifyLogExporter.json
diff --git a/...rterLiveTests/VerifyLogExporterAsync.json → ...rterLiveTests/VerifyLogExporterAsync.json b/...rterLiveTests/VerifyLogExporterAsync.json → ...rterLiveTests/VerifyLogExporterAsync.json
diff --git a/...s/FunctionalTests/AzureMonitorTestBase.cs → ...sts/TestFramework/AzureMonitorTestBase.cs b/...s/FunctionalTests/AzureMonitorTestBase.cs → ...sts/TestFramework/AzureMonitorTestBase.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.FunctionalTests
+namespace Azure.Monitor.OpenTelemetry.Exporter.E2E.Tests.TestFramework
 {
     using System;
     using System.Collections.Generic;

diff --git a/...ionalTests/AzureMonitorTestEnvironment.cs → ...tFramework/AzureMonitorTestEnvironment.cs b/...ionalTests/AzureMonitorTestEnvironment.cs → ...tFramework/AzureMonitorTestEnvironment.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.FunctionalTests
+namespace Azure.Monitor.OpenTelemetry.Exporter.E2E.Tests.TestFramework
 {
     using System;
     using System.Threading.Tasks;

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/E2E.Tests/xunit.runner.json b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/E2E.Tests/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "maxParallelThreads": 1,
+  "parallelizeTestCollections": false
+}
diff --git a/...ter/tests/Integration.Tests/Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.csproj b/...ter/tests/Integration.Tests/Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.csproj
@@ -5,8 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.ApplicationInsights.Query" />
-    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
 
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />