Adopt versioning spector scenario (Azure#51911)

* Adopt versioning spector scenario

* regen

Author: JoshLove-msft

eng/packages/http-client-csharp/eng/scripts/Generate.ps1

@@ -52,12 +52,6 @@ function IsSpecDir {
 $failingSpecs = @(
     Join-Path 'http' 'streaming' 'jsonl'
     Join-Path 'http' 'payload' 'xml'
-    Join-Path 'http' 'versioning' 'added'
-    Join-Path 'http' 'versioning' 'madeOptional'
-    Join-Path 'http' 'versioning' 'removed'
-    Join-Path 'http' 'versioning' 'renamedFrom'
-    Join-Path 'http' 'versioning' 'returnTypeChangedFrom'
-    Join-Path 'http' 'versioning' 'typeChangedFrom'
     Join-Path 'http' 'client' 'naming' # pending until https://github.com/microsoft/typespec/issues/5653 is resolved
     Join-Path 'http' 'response' 'status-code-range' # Response namespace conflicts with Azure.Response
     # Azure scenarios not yet buildable

eng/packages/http-client-csharp/eng/scripts/Generation.psm1

@@ -27,7 +27,8 @@ function Get-TspCommand {
         [string]$specFile,
         [string]$generationDir,
         [bool]$generateStub = $false,
-        [string]$apiVersion = $null
+        [string]$apiVersion = $null,
+        [string]$libraryNameOverride = $null
     )
     $command = "npx tsp compile $specFile"
     $command += " --trace @azure-typespec/http-client-csharp"
@@ -46,6 +47,10 @@ function Get-TspCommand {
         $command += " --option @azure-typespec/http-client-csharp.api-version=$apiVersion"
     }
 
+    if ($libraryNameOverride) {
+        $command += " --option @azure-typespec/http-client-csharp.package-name=$libraryNameOverride"
+    }
+
     $command += " --option @azure-typespec/http-client-csharp.new-project=true"
 
     return $command
@@ -189,16 +194,19 @@ function Generate-Versioning {
     ## get the last two directories of the output directory and add V1/V2 to disambiguate the namespaces
     $namespaceRoot = $(($outputFolders[-2..-1] | `
                            ForEach-Object { $_.Substring(0,1).ToUpper() + $_.Substring(1) }) -join ".")
+    $v1LibraryNameOverride = $namespaceRoot + ".V1"
+    $v2LibraryNameOverride = $namespaceRoot + ".V2"
 
-    Invoke (Get-TspCommand $specFilePath $v1Dir -generateStub $generateStub -apiVersion "v1")
-    Invoke (Get-TspCommand $specFilePath $v2Dir -generateStub $generateStub -apiVersion "v2")
+    Invoke (Get-TspCommand $specFilePath $v1Dir -generateStub $generateStub -apiVersion "v1" -libraryNameOverride $v1LibraryNameOverride)
+    Invoke (Get-TspCommand $specFilePath $v2Dir -generateStub $generateStub -apiVersion "v2" -libraryNameOverride $v2LibraryNameOverride)
 
     if ($outputFolders.Contains("removed")) {
         $v2PreviewDir = $(Join-Path $outputDir "v2Preview")
         if ($createOutputDirIfNotExist -and -not (Test-Path $v2PreviewDir)) {
             New-Item -ItemType Directory -Path $v2PreviewDir | Out-Null
         }
-        Invoke (Get-TspCommand $specFilePath $v2PreviewDir -generateStub $generateStub -apiVersion "v2preview")
+        $v2PreviewLibraryNameOverride = $namespaceRoot + ".V2Preview"
+        Invoke (Get-TspCommand $specFilePath $v2PreviewDir -generateStub $generateStub -apiVersion "v2preview" -libraryNameOverride $v2PreviewLibraryNameOverride)
     }
 
     # exit if the generation failed

eng/packages/http-client-csharp/generator/Azure.Generator/src/Properties/launchSettings.json

@@ -369,6 +369,66 @@
       "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/type/union/discriminated -g AzureStubGenerator",
       "commandName": "Executable",
       "executablePath": "dotnet"
+    },
+    "http-versioning-added-v1": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/added/v1 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-added-v2": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/added/v2 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-madeOptional-v1": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/madeOptional/v1 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-madeOptional-v2": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/madeOptional/v2 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-removed-v1": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/removed/v1 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-removed-v2": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/removed/v2 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-renamedFrom-v1": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/renamedFrom/v1 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-renamedFrom-v2": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/renamedFrom/v2 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-returnTypeChangedFrom-v1": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-returnTypeChangedFrom-v2": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-typeChangedFrom-v1": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/typeChangedFrom/v1 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
+    },
+    "http-versioning-typeChangedFrom-v2": {
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/versioning/typeChangedFrom/v2 -g AzureStubGenerator",
+      "commandName": "Executable",
+      "executablePath": "dotnet"
     }
   }
 }

eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Versioning/Added/V1/VersioningAddedV1Tests.cs

@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+extern alias VersioningAddedV1;
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+using VersioningAddedV1::Versioning.Added;
+
+namespace TestProjects.Spector.Tests.Http.Versioning.Added.V1
+{
+    public class VersioningAddedV1Tests : SpectorTestBase
+    {
+        [SpectorTest]
+        public void TestAddedMembersV1Client()
+        {
+            /* verify ModelV1. */
+            var properties = typeof(ModelV1).GetProperties();
+            Assert.IsNotNull(properties);
+            Assert.AreEqual(2, properties.Length);
+            /* verify property UnionProp added in V2 is not present.*/
+            Assert.IsNull(typeof(ModelV1).GetProperty("UnionProp"));
+
+            /* verify EnumV1. */
+            Assert.True(typeof(EnumV1).IsEnum);
+            var enumValues = typeof(EnumV1).GetEnumNames();
+            Assert.IsNotNull(enumValues);
+            Assert.AreEqual(1, enumValues.Length);
+            /* verify added enum value EnumMemberV2. */
+            Assert.IsFalse(enumValues.Contains("EnumMemberV2"));
+
+            /* check existence of the added model ModelV2. */
+            Assert.IsNull(Type.GetType("Versioning.Added.V1.Models.ModelV2"));
+
+            /* check existence of the added enum EnumV2. */
+            Assert.IsNull(Type.GetType("Versioning.Added.V1.Models.EnumV2"));
+
+            /* check the added parameter. */
+            var methods = typeof(AddedClient).GetMethods().Where(m => m.Name == "V1" || m.Name == "V1Async");
+            Assert.IsNotNull(methods);
+            Assert.AreEqual(4, methods.Count());
+            var methodsArray = methods.ToArray();
+            foreach (var method in methodsArray)
+            {
+                Assert.IsFalse(method.GetParameters().Any(p => p.Name == "headerV2"));
+            }
+
+            /* check the existence of added method in V2. */
+            var addedMethods = typeof(AddedClient).GetMethods().Where(m => m.Name == "V2" || m.Name == "V2Async");
+            Assert.IsEmpty(addedMethods);
+
+            /* check the existence of added interface in V2. */
+            Assert.IsNull(Type.GetType("Versioning.Added.V1.InterfaceV2"));
+        }
+    }
+}

eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Versioning/Added/V2/VersioningAddedV2Tests.cs

@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+extern alias VersioningAddedV2;
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using VersioningAddedV2::Versioning.Added;
+
+namespace TestProjects.Spector.Tests.Http.Versioning.Added.V2
+{
+    public class VersioningAddedV2Tests : SpectorTestBase
+    {
+        [SpectorTest]
+        public void TestAddedMembersV2Client()
+        {
+            /* verify ModelV1. */
+            var properties = typeof(ModelV1).GetProperties();
+            Assert.IsNotNull(properties);
+            Assert.AreEqual(3, properties.Length);
+            /* verify added property UnionProp in V2.*/
+            Assert.IsNotNull(typeof(ModelV1).GetProperty("UnionProp"));
+
+            /* verify EnumV1. */
+            Assert.True(typeof(EnumV1).IsEnum);
+            var enumValues = typeof(EnumV1).GetEnumNames();
+            Assert.IsNotNull(enumValues);
+            Assert.AreEqual(2, enumValues.Length);
+            /* verify added enum value EnumMemberV2. */
+            Assert.IsTrue(enumValues.Contains("EnumMemberV2"));
+
+            /* check existence of the added model ModelV2. */
+            var modelV2Type = typeof(ModelV1).Assembly.GetType("Versioning.Added.ModelV2");
+            Assert.IsNotNull(modelV2Type);
+
+            /* check existence of the added enum EnumV2. */
+            var enumV2Type = typeof(ModelV1).Assembly.GetType("Versioning.Added.EnumV2");
+            Assert.IsNotNull(enumV2Type);
+
+            /* check the added parameter. */
+            var methods = typeof(AddedClient).GetMethods().Where(m => m.Name == "V1" || m.Name == "V1Async");
+            Assert.IsNotNull(methods);
+            Assert.AreEqual(4, methods.Count());
+            var methodsArray = methods.ToArray();
+            foreach (var method in methodsArray)
+            {
+                Assert.IsTrue(method.GetParameters().Any(p => p.Name == "headerV2"));
+            }
+
+            /* check the existence of added method in V2. */
+            var addedMethods = typeof(AddedClient).GetMethods().Where(m => m.Name == "V2" || m.Name == "V2Async");
+            Assert.IsNotNull(addedMethods);
+            Assert.AreEqual(4, addedMethods.Count());
+
+            /* check the existence of added interface in V2. */
+            var interfaceV2Type = typeof(ModelV1).Assembly.GetType("Versioning.Added.InterfaceV2");
+            Assert.IsNotNull(interfaceV2Type);
+        }
+
+        [SpectorTest]
+        public Task Versioning_Added_v1() => Test(async (host) =>
+        {
+            ModelV1 modelV1 = new ModelV1("foo", EnumV1.EnumMemberV2, BinaryData.FromObjectAsJson(10));
+            var response = await new AddedClient(host).V1Async("bar", modelV1);
+            Assert.AreEqual(200, response.GetRawResponse().Status);
+            Assert.AreEqual("foo", response.Value.Prop);
+            Assert.AreEqual(EnumV1.EnumMemberV2, response.Value.EnumProp);
+            Assert.AreEqual(10, response.Value.UnionProp.ToObjectFromJson<int>());
+        });
+
+        [SpectorTest]
+        public Task Versioning_Added_v2() => Test(async (host) =>
+        {
+            ModelV2 modelV2 = new ModelV2("foo", EnumV2.EnumMember, BinaryData.FromObjectAsJson("bar"));
+            var response = await new AddedClient(host).V2Async(modelV2);
+            Assert.AreEqual(200, response.GetRawResponse().Status);
+            Assert.AreEqual("foo", response.Value.Prop);
+            Assert.AreEqual(EnumV2.EnumMember, response.Value.EnumProp);
+            Assert.AreEqual("bar", response.Value.UnionProp.ToObjectFromJson<string>());
+        });
+
+        [SpectorTest]
+        public Task Versioning_Added_InterfaceV2() => Test(async (host) =>
+        {
+            ModelV2 modelV2 = new ModelV2("foo", EnumV2.EnumMember, BinaryData.FromObjectAsJson("bar"));
+            var response = await new AddedClient(host).GetInterfaceV2Client().V2InInterfaceAsync(modelV2);
+            Assert.AreEqual(200, response.GetRawResponse().Status);
+            Assert.AreEqual("foo", response.Value.Prop);
+            Assert.AreEqual(EnumV2.EnumMember, response.Value.EnumProp);
+            Assert.AreEqual("bar", response.Value.UnionProp.ToObjectFromJson<string>());
+        });
+    }
+}

eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Versioning/MadeOptional/V1/VersioningMadeOptionalV1Tests.cs

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+extern alias MadeOptionalV1;
+
+using System.Linq;
+using MadeOptionalV1::Versioning.MadeOptional;
+using NUnit.Framework;
+
+namespace TestProjects.Spector.Tests.Http.Versioning.MadeOptional.V1
+{
+    public class VersioningMadeOptionalV1Tests : SpectorTestBase
+    {
+        [SpectorTest]
+        public void CheckMadeOptionalMembers()
+        {
+            var constructors = typeof(TestModel).GetConstructors();
+            Assert.IsNotNull(constructors);
+            Assert.AreEqual(1, constructors.Length);
+            /* property will not in public constructor signature. */
+            Assert.IsTrue(constructors[0].GetParameters().Any(p => p.Name == "changedProp"));
+        }
+    }
+}

eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Versioning/MadeOptional/V2/VersioningMadeOptionalV2Tests.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+extern alias MadeOptionalV2;
+using System.Linq;
+using System.Threading.Tasks;
+using MadeOptionalV2::Versioning.MadeOptional;
+using NUnit.Framework;
+
+namespace TestProjects.Spector.Tests.Http.Versioning.MadeOptional.V2
+{
+    public class VersioningMadeOptionalV2Tests : SpectorTestBase
+    {
+        [SpectorTest]
+        public void CheckMadeOptionalMembers()
+        {
+            var constructors = typeof(TestModel).GetConstructors();
+            Assert.IsNotNull(constructors);
+            Assert.AreEqual(1, constructors.Length);
+            /* optional property will not show in public constructor signature. */
+            Assert.False(constructors[0].GetParameters().Any(p => p.Name == "changedProp"));
+        }
+
+        [SpectorTest]
+        public Task Versioning_MadeOptional_Test() => Test(async (host) =>
+        {
+            TestModel body = new TestModel("foo");
+            var response = await new MadeOptionalClient(host).TestAsync(body);
+            Assert.AreEqual(200, response.GetRawResponse().Status);
+            Assert.AreEqual("foo", response.Value.Prop);
+        });
+    }
+}

eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Versioning/Removed/V1/VersioningRemovedV1Tests.cs

@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+extern alias RemovedV1;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using RemovedV1::Versioning.Removed;
+using RemovedV1::Versioning.Removed.V1;
+
+namespace TestProjects.Spector.Tests.Http.Versioning.Removed.V1
+{
+    public class VersioningRemovedV1Tests : SpectorTestBase
+    {
+        [SpectorTest]
+        public void TestRemovedMembers()
+        {
+            var assembly = typeof(RemovedClient).Assembly;
+            /* check existence of the removed model ModelV1. */
+            var modelV1Type = assembly.GetType("Versioning.Removed.ModelV1");
+            Assert.IsNotNull(modelV1Type);
+
+            /* check existence of the removed enum EnumV1. */
+            var enumV1Type = assembly.GetType("Versioning.Removed.EnumV1");
+            Assert.IsNotNull(enumV1Type);
+
+            /* check existence of removed method V1 */
+            var removedMethods = typeof(RemovedClient).GetMethods().Where(m => m.Name == "V1" || m.Name == "V1Async");
+            Assert.AreEqual(4, removedMethods.Count());
+
+            /* check existence of removed parameter. */
+            var v2Methods = typeof(RemovedClient).GetMethods().Where(m => m.Name == "V2" || m.Name == "V2Async");
+            Assert.IsNotNull(v2Methods);
+            Assert.AreEqual(4, v2Methods.Count());
+            foreach (var method in v2Methods)
+            {
+                Assert.IsTrue(method.GetParameters().Any(p => p.Name == "param"));
+            }
+
+            /* check existence of removed interface. */
+            var interfaceV1Type = assembly.GetType("Versioning.Removed.InterfaceV1");
+            Assert.IsNotNull(interfaceV1Type);
+
+            // Only initial versions is defined
+            var enumType = typeof(RemovedClientOptions.ServiceVersion);
+            Assert.AreEqual(new string[] { "V1" }, enumType.GetEnumNames());
+        }
+
+        [SpectorTest]
+        public Task Versioning_Removed_V3Model() => Test(async (host) =>
+        {
+            var model = new ModelV3("123", EnumV3.EnumMemberV1);
+            var response = await new RemovedClient(host).ModelV3Async(model);
+            Assert.AreEqual(200, response.GetRawResponse().Status);
+            Assert.AreEqual("123", response.Value.Id);
+            Assert.AreEqual(EnumV3.EnumMemberV1, response.Value.EnumProp);
+        });
+    }
+}