From 80ffbac222697e18a6a2cddc3726e2714666a8f7 Mon Sep 17 00:00:00 2001 From: Iain Munro Date: Mon, 15 May 2017 01:33:26 +0200 Subject: [PATCH] [TypeScriptAngular2Client] Changed enums single quotes for values to double. Updated test: enumArrayMdoelTest #1334 --- .../codegen/languages/AbstractTypeScriptClientCodegen.java | 2 +- .../codegen/typescript/fetch/TypeScriptFetchModelTest.java | 4 ++-- .../petstore/typescript-angular2/default/model/Order.ts | 6 +++--- .../petstore/typescript-angular2/default/model/Pet.ts | 6 +++--- .../client/petstore/typescript-angular2/npm/model/Order.ts | 6 +++--- .../client/petstore/typescript-angular2/npm/model/Pet.ts | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java index b446b8caec6..62a61927a7d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -277,7 +277,7 @@ public String toEnumValue(String value, String datatype) { if ("number".equals(datatype)) { return value; } else { - return "\'" + escapeText(value) + "\'"; + return "\"" + escapeText(value) + "\""; } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/fetch/TypeScriptFetchModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/fetch/TypeScriptFetchModelTest.java index d5125805adb..acccdebfc2d 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/fetch/TypeScriptFetchModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/fetch/TypeScriptFetchModelTest.java @@ -203,10 +203,10 @@ public void enumArrayMdoelTest() { HashMap fish= new HashMap(); fish.put("name", "Fish"); - fish.put("value", "'fish'"); + fish.put("value", "\"fish\""); HashMap crab= new HashMap(); crab.put("name", "Crab"); - crab.put("value", "'crab'"); + crab.put("value", "\"crab\""); Assert.assertEquals(prope.allowableValues.get("enumVars"), Arrays.asList(fish, crab)); // assert inner items diff --git a/samples/client/petstore/typescript-angular2/default/model/Order.ts b/samples/client/petstore/typescript-angular2/default/model/Order.ts index 9f41fd70a09..f5021a02eda 100644 --- a/samples/client/petstore/typescript-angular2/default/model/Order.ts +++ b/samples/client/petstore/typescript-angular2/default/model/Order.ts @@ -31,8 +31,8 @@ export class Order { } export namespace OrderEnums { export enum StatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' + Placed = "placed", + Approved = "approved", + Delivered = "delivered" } } diff --git a/samples/client/petstore/typescript-angular2/default/model/Pet.ts b/samples/client/petstore/typescript-angular2/default/model/Pet.ts index c85304ee35a..3fe6b45adad 100644 --- a/samples/client/petstore/typescript-angular2/default/model/Pet.ts +++ b/samples/client/petstore/typescript-angular2/default/model/Pet.ts @@ -31,8 +31,8 @@ export class Pet { } export namespace PetEnums { export enum StatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' + Available = "available", + Pending = "pending", + Sold = "sold" } } diff --git a/samples/client/petstore/typescript-angular2/npm/model/Order.ts b/samples/client/petstore/typescript-angular2/npm/model/Order.ts index 9f41fd70a09..f5021a02eda 100644 --- a/samples/client/petstore/typescript-angular2/npm/model/Order.ts +++ b/samples/client/petstore/typescript-angular2/npm/model/Order.ts @@ -31,8 +31,8 @@ export class Order { } export namespace OrderEnums { export enum StatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' + Placed = "placed", + Approved = "approved", + Delivered = "delivered" } } diff --git a/samples/client/petstore/typescript-angular2/npm/model/Pet.ts b/samples/client/petstore/typescript-angular2/npm/model/Pet.ts index c85304ee35a..3fe6b45adad 100644 --- a/samples/client/petstore/typescript-angular2/npm/model/Pet.ts +++ b/samples/client/petstore/typescript-angular2/npm/model/Pet.ts @@ -31,8 +31,8 @@ export class Pet { } export namespace PetEnums { export enum StatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' + Available = "available", + Pending = "pending", + Sold = "sold" } }