a few attempt to fix the tests

microsoft · Jan 9, 2025 · 781bd0b · 781bd0b
1 parent fd933a7
commit 781bd0b
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 67 deletions.
diff --git a/packages/http-client-csharp/eng/scripts/Get-CadlRanch-Coverage.ps1 b/packages/http-client-csharp/eng/scripts/Get-CadlRanch-Coverage.ps1
@@ -11,7 +11,9 @@ $specsDirectory = Join-Path $packageRoot 'node_modules' '@typespec' 'http-specs'
 $azureSpecsDirectory = Join-Path $packageRoot 'node_modules' '@azure-tools' 'azure-http-specs' 'specs'
 $cadlRanchRoot = Join-Path $packageRoot 'generator' 'TestProjects' 'CadlRanch' 'http'
 $directories = Get-ChildItem -Path "$cadlRanchRoot" -Directory -Recurse
-$cadlRanchCsproj = Join-Path $packageRoot 'generator' 'TestProjects' 'CadlRanch.Tests' 'TestProjects.CadlRanch.Tests.csproj'
+$cadlRanchTestDir = Join-Path $packageRoot 'generator' 'TestProjects' 'CadlRanch.Tests'
+# Get all .csproj files recursively
+$csprojFiles = Get-ChildItem -Path $cadlRanchTestDir -Recurse -Filter *.csproj
 
 $coverageDir = Join-Path $packageRoot 'generator' 'artifacts' 'coverage'
 
@@ -67,8 +69,17 @@ foreach ($directory in $directories) {
 
 # test all
 Write-Host "Generating CadlRanch coverage" -ForegroundColor Cyan
-$command  = "dotnet test $cadlRanchCsproj"
-Invoke $command
+
+foreach ($csprojFile in $csprojFiles) {
+    Write-Host "Testing $csprojFile" -ForegroundColor Cyan
+    $command = "dotnet test $csprojFile"
+    Invoke $command
+    # exit if the testing failed
+    if ($LASTEXITCODE -ne 0) {
+        exit $LASTEXITCODE
+    }
+}
+
 # exit if the testing failed
 if ($LASTEXITCODE -ne 0) {
     exit $LASTEXITCODE

diff --git a/...csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Array/_Type._Array.Tests.csproj b/...csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Array/_Type._Array.Tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="System.Memory.Data" />
+    <PackageReference Include="System.ClientModel" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)\Microsoft.Generator.CSharp\test\common\Microsoft.Generator.CSharp.Tests.Common.csproj" />
+    <ProjectReference Include="$(RepoRoot)\TestProjects\CadlRanch\http\type\array\src\_Type._Array.csproj" />
+    <ProjectReference Include="$(RepoRoot)\TestProjects\CadlRanch.Tests\TestProjects.CadlRanch.Tests.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...tProjects/CadlRanch.Tests/Http/_Type/_Enum/Extensible/_Type._Enum.Extensible.Tests.csproj b/...tProjects/CadlRanch.Tests/Http/_Type/_Enum/Extensible/_Type._Enum.Extensible.Tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="System.Memory.Data" />
+    <PackageReference Include="System.ClientModel" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)\Microsoft.Generator.CSharp\test\common\Microsoft.Generator.CSharp.Tests.Common.csproj" />
+    <ProjectReference Include="$(RepoRoot)\TestProjects\CadlRanch\http\type\enum\extensible\src\_Type._Enum.Extensible.csproj" />
+    <ProjectReference Include="$(RepoRoot)\TestProjects\CadlRanch.Tests\TestProjects.CadlRanch.Tests.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...erator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Fixed/_Type._Enum.Fixed.Tests.csproj b/...erator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Fixed/_Type._Enum.Fixed.Tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="System.Memory.Data" />
+    <PackageReference Include="System.ClientModel" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)\Microsoft.Generator.CSharp\test\common\Microsoft.Generator.CSharp.Tests.Common.csproj" />
+    <ProjectReference Include="$(RepoRoot)\TestProjects\CadlRanch\http\type\enum\fixed\src\_Type._Enum.Fixed.csproj" />
+    <ProjectReference Include="$(RepoRoot)\TestProjects\CadlRanch.Tests\TestProjects.CadlRanch.Tests.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...nt-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchTestAttribute.cs b/...nt-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchTestAttribute.cs
@@ -15,7 +15,7 @@
 namespace TestProjects.CadlRanch.Tests
 {
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    internal partial class CadlRanchTestAttribute : TestAttribute, IApplyToTest
+    public partial class CadlRanchTestAttribute : TestAttribute, IApplyToTest
     {
         [GeneratedRegex("(?<=[a-z])([A-Z])")]
         private static partial Regex ToKebabCase();

diff --git a/...-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj b/...-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj
@@ -7,67 +7,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="../CadlRanch/**/*.cs" Exclude="../CadlRanch/**/Properties/**/*.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" />
-    <Compile Remove="../CadlRanch/**/ClientType.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/client/structure/default/src/Generated/Models/ClientType.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ModelV1.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ModelV1.Serialization.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.Serialization.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.Serialization.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ModelV2.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ModelV2.Serialization.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.Serialization.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.Serialization.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ModelV3.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ModelV3.Serialization.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.Serialization.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/EnumV1.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/added/v1/src/Generated/Models/EnumV1.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV1.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/EnumV2.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/added/v2/src/Generated/Models/EnumV2.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV2.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/EnumV3.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV3.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/TestModel.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Include="../CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/TestModel.Serialization.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Include="../CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ResiliencyServiceDrivenClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ResiliencyServiceDrivenClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/AddedClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/added/v1/src/Generated/AddedClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/AddedClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/added/v1/src/Generated/AddedClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/RenamedFromClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/RenamedFromClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/TypeChangedFromClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/TypeChangedFromClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ReturnTypeChangedFromClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/ReturnTypeChangedFromClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/RemovedClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/RemovedClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/InterfaceV1.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/InterfaceV1.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
-    <Compile Remove="../CadlRanch/**/MadeOptionalClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
-    <Compile Include="../CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="Http\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -81,10 +21,10 @@
     <ProjectReference Include="..\..\Microsoft.Generator.CSharp\test\common\Microsoft.Generator.CSharp.Tests.Common.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <!-- <ItemGroup>
     <None Update="Http\**\TestData\**\*.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-  </ItemGroup>
+  </ItemGroup> -->
 
 </Project>