[v6] Add tests for RequiredOptional and Non-String Enum + bonus (#758)

* Required Optional tests * update missing generated files * remove unwanted change * Update test/integration/requiredOptional.spec.ts Co-authored-by: Deyaaeldeen Almahallawi <[email protected]> * Address feedback * Use include Co-authored-by: Deyaaeldeen Almahallawi <[email protected]>
Azure · Oct 13, 2020 · 468b960 · 468b960
1 parent 2633e09
commit 468b960
Show file tree

Hide file tree

Showing 68 changed files with 3,394 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -26,9 +26,9 @@ More information about these can be found [here](https://github.com/Azure/autore
 3. Hook up plugins into the AutoRest pipeline DAG, e.g.
 
 ```yaml
-version: 3.0.6267
+version: 3.0.6320
 use-extension:
-  "@autorest/modelerfour": "4.15.419"
+  "@autorest/modelerfour": "4.15.421"
 
 modelerfour:
   # this runs a pre-namer step to clean up names

diff --git a/autorest.common b/autorest.common
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "devDependencies": {
         "@autorest/test-server": "^3.0.27",
         "@azure/abort-controller": "^1.0.1",
-        "@microsoft.azure/autorest.testserver": "^2.10.51",
+        "@microsoft.azure/autorest.testserver": "^2.10.60",
         "@types/chai": "^4.2.8",
         "@types/express": "^4.17.2",
         "@types/js-yaml": "3.12.1",

diff --git a/test/integration/generated/bodyDate/src/operations/date.ts b/test/integration/generated/bodyDate/src/operations/date.ts
@@ -97,7 +97,7 @@ export class DateOperations {
 
   /**
    * Put max date value 9999-12-31
-   * @param dateBody
+   * @param dateBody date body
    * @param options The options parameters.
    */
   putMaxDate(
@@ -131,7 +131,7 @@ export class DateOperations {
 
   /**
    * Put min date value 0000-01-01
-   * @param dateBody
+   * @param dateBody date body
    * @param options The options parameters.
    */
   putMinDate(

diff --git a/test/integration/generated/bodyDateTime/src/operations/datetime.ts b/test/integration/generated/bodyDateTime/src/operations/datetime.ts
@@ -108,7 +108,7 @@ export class Datetime {
 
   /**
    * Put max datetime value 9999-12-31T23:59:59.999Z
-   * @param datetimeBody
+   * @param datetimeBody datetime body
    * @param options The options parameters.
    */
   putUtcMaxDateTime(
@@ -127,7 +127,7 @@ export class Datetime {
   /**
    * This is against the recommendation that asks for 3 digits, but allow to test what happens in that
    * scenario
-   * @param datetimeBody
+   * @param datetimeBody datetime body
    * @param options The options parameters.
    */
   putUtcMaxDateTime7Digits(
@@ -194,7 +194,7 @@ export class Datetime {
 
   /**
    * Put max datetime value with positive numoffset 9999-12-31t23:59:59.999+14:00
-   * @param datetimeBody
+   * @param datetimeBody datetime body
    * @param options The options parameters.
    */
   putLocalPositiveOffsetMaxDateTime(
@@ -244,7 +244,7 @@ export class Datetime {
 
   /**
    * Put max datetime value with positive numoffset 9999-12-31t23:59:59.999-14:00
-   * @param datetimeBody
+   * @param datetimeBody datetime body
    * @param options The options parameters.
    */
   putLocalNegativeOffsetMaxDateTime(
@@ -294,7 +294,7 @@ export class Datetime {
 
   /**
    * Put min datetime value 0001-01-01T00:00:00Z
-   * @param datetimeBody
+   * @param datetimeBody datetime body
    * @param options The options parameters.
    */
   putUtcMinDateTime(
@@ -328,7 +328,7 @@ export class Datetime {
 
   /**
    * Put min datetime value 0001-01-01T00:00:00+14:00
-   * @param datetimeBody
+   * @param datetimeBody datetime body
    * @param options The options parameters.
    */
   putLocalPositiveOffsetMinDateTime(
@@ -362,7 +362,7 @@ export class Datetime {
 
   /**
    * Put min datetime value 0001-01-01T00:00:00-14:00
-   * @param datetimeBody
+   * @param datetimeBody datetime body
    * @param options The options parameters.
    */
   putLocalNegativeOffsetMinDateTime(

diff --git a/test/integration/generated/bodyDateTimeRfc1123/src/operations/datetimerfc1123.ts b/test/integration/generated/bodyDateTimeRfc1123/src/operations/datetimerfc1123.ts
@@ -100,7 +100,7 @@ export class Datetimerfc1123 {
 
   /**
    * Put max datetime value Fri, 31 Dec 9999 23:59:59 GMT
-   * @param datetimeBody
+   * @param datetimeBody datetime body
    * @param options The options parameters.
    */
   putUtcMaxDateTime(
@@ -150,7 +150,7 @@ export class Datetimerfc1123 {
 
   /**
    * Put min datetime value Mon, 1 Jan 0001 00:00:00 GMT
-   * @param datetimeBody
+   * @param datetimeBody datetime body
    * @param options The options parameters.
    */
   putUtcMinDateTime(

diff --git a/test/integration/generated/bodyDuration/src/operations/duration.ts b/test/integration/generated/bodyDuration/src/operations/duration.ts
@@ -48,7 +48,7 @@ export class Duration {
 
   /**
    * Put a positive duration value
-   * @param durationBody
+   * @param durationBody duration body
    * @param options The options parameters.
    */
   putPositiveDuration(

diff --git a/test/integration/generated/bodyFormData/src/models/index.ts b/test/integration/generated/bodyFormData/src/models/index.ts
@@ -24,6 +24,13 @@ export interface Paths1MqqetpFormdataStreamUploadfilePostRequestbodyContentMulti
   fileName: string;
 }
 
+export interface Paths1P3Stk3FormdataStreamUploadfilesPostRequestbodyContentMultipartFormDataSchema {
+  /**
+   * Files to upload.
+   */
+  fileContent: coreHttp.HttpRequestBody[];
+}
+
 /**
  * Contains response data for the uploadFile operation.
  */
@@ -74,6 +81,31 @@ export type FormdataUploadFileViaBodyResponse = {
   _response: coreHttp.HttpResponse;
 };
 
+/**
+ * Contains response data for the uploadFiles operation.
+ */
+export type FormdataUploadFilesResponse = {
+  /**
+   * BROWSER ONLY
+   *
+   * The response body as a browser Blob.
+   * Always `undefined` in node.js.
+   */
+  blobBody?: Promise<Blob>;
+  /**
+   * NODEJS ONLY
+   *
+   * The response body as a node.js Readable stream.
+   * Always `undefined` in the browser.
+   */
+  readableStreamBody?: NodeJS.ReadableStream;
+
+  /**
+   * The underlying HTTP response.
+   */
+  _response: coreHttp.HttpResponse;
+};
+
 /**
  * Optional parameters.
  */

diff --git a/test/integration/generated/bodyFormData/src/models/mappers.ts b/test/integration/generated/bodyFormData/src/models/mappers.ts
@@ -52,3 +52,21 @@ export const Paths1MqqetpFormdataStreamUploadfilePostRequestbodyContentMultipart
     }
   }
 };
+
+export const Paths1P3Stk3FormdataStreamUploadfilesPostRequestbodyContentMultipartFormDataSchema: coreHttp.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className:
+      "Paths1P3Stk3FormdataStreamUploadfilesPostRequestbodyContentMultipartFormDataSchema",
+    modelProperties: {
+      fileContent: {
+        serializedName: "fileContent",
+        required: true,
+        type: {
+          name: "Sequence",
+          element: { type: { name: "Stream" } }
+        }
+      }
+    }
+  }
+};
diff --git a/test/integration/generated/bodyFormData/src/models/parameters.ts b/test/integration/generated/bodyFormData/src/models/parameters.ts
@@ -100,3 +100,15 @@ export const accept1: OperationParameter = {
     }
   }
 };
+
+export const fileContent2: OperationParameter = {
+  parameterPath: "fileContent",
+  mapper: {
+    serializedName: "fileContent",
+    required: true,
+    type: {
+      name: "Sequence",
+      element: { type: { name: "Stream" } }
+    }
+  }
+};
diff --git a/test/integration/generated/bodyFormData/src/operations/formdata.ts b/test/integration/generated/bodyFormData/src/operations/formdata.ts
@@ -12,7 +12,8 @@ import * as Parameters from "../models/parameters";
 import { BodyFormDataClient } from "../bodyFormDataClient";
 import {
   FormdataUploadFileResponse,
-  FormdataUploadFileViaBodyResponse
+  FormdataUploadFileViaBodyResponse,
+  FormdataUploadFilesResponse
 } from "../models";
 
 /**
@@ -66,6 +67,24 @@ export class Formdata {
       uploadFileViaBodyOperationSpec
     ) as Promise<FormdataUploadFileViaBodyResponse>;
   }
+
+  /**
+   * Upload multiple files
+   * @param fileContent Files to upload.
+   * @param options The options parameters.
+   */
+  uploadFiles(
+    fileContent: coreHttp.HttpRequestBody[],
+    options?: coreHttp.OperationOptions
+  ): Promise<FormdataUploadFilesResponse> {
+    const operationOptions: coreHttp.RequestOptionsBase = coreHttp.operationOptionsToRequestOptionsBase(
+      options || {}
+    );
+    return this.client.sendOperationRequest(
+      { fileContent, options: operationOptions },
+      uploadFilesOperationSpec
+    ) as Promise<FormdataUploadFilesResponse>;
+  }
 }
 // Operation Specifications
 
@@ -104,3 +123,19 @@ const uploadFileViaBodyOperationSpec: coreHttp.OperationSpec = {
   mediaType: "binary",
   serializer
 };
+const uploadFilesOperationSpec: coreHttp.OperationSpec = {
+  path: "/formdata/stream/uploadfiles",
+  httpMethod: "POST",
+  responses: {
+    200: {
+      bodyMapper: { type: { name: "Stream" }, serializedName: "parsedResponse" }
+    },
+    default: {
+      bodyMapper: Mappers.ErrorModel
+    }
+  },
+  formDataParameters: [Parameters.fileContent2],
+  urlParameters: [Parameters.$host],
+  headerParameters: [Parameters.contentType, Parameters.accept],
+  serializer
+};
diff --git a/test/integration/generated/bodyInteger/src/operations/int.ts b/test/integration/generated/bodyInteger/src/operations/int.ts
@@ -132,7 +132,7 @@ export class Int {
 
   /**
    * Put max int32 value
-   * @param intBody
+   * @param intBody int body
    * @param options The options parameters.
    */
   putMax32(
@@ -150,7 +150,7 @@ export class Int {
 
   /**
    * Put max int64 value
-   * @param intBody
+   * @param intBody int body
    * @param options The options parameters.
    */
   putMax64(
@@ -168,7 +168,7 @@ export class Int {
 
   /**
    * Put min int32 value
-   * @param intBody
+   * @param intBody int body
    * @param options The options parameters.
    */
   putMin32(
@@ -186,7 +186,7 @@ export class Int {
 
   /**
    * Put min int64 value
-   * @param intBody
+   * @param intBody int body
    * @param options The options parameters.
    */
   putMin64(
@@ -220,7 +220,7 @@ export class Int {
 
   /**
    * Put datetime encoded as Unix time
-   * @param intBody date in seconds since 1970-01-01T00:00:00Z.
+   * @param intBody int body
    * @param options The options parameters.
    */
   putUnixTimeDate(