diff --git a/modules/swagger-codegen/src/main/resources/csharp/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
index 86589816d12..f1f9b7c9753 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
@@ -63,9 +63,9 @@ namespace {{packageName}}.Model
{{#vars}}{{^isEnum}}
///
- /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+ /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
/// {{#description}}
- /// {{{description}}}{{/description}}
+ /// {{description}}{{/description}}
[DataMember(Name="{{baseName}}", EmitDefaultValue={{emitDefaultValue}})]
public {{{datatype}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }
{{/isEnum}}{{/vars}}
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
index d418e35c141..74f09d4d304 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
@@ -1303,6 +1303,18 @@
"xml": {
"name": "Return"
}
+ },
+ "Name": {
+ "descripton": "Model for testing reserved words",
+ "properties": {
+ "name": {
+ "type": "integer",
+ "format": "int32"
+ }
+ },
+ "xml": {
+ "name": "Name"
+ }
}
}
}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs
index 77100e04b61..081e046118f 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs
@@ -53,19 +53,6 @@ namespace IO.Swagger.Test
}
- ///
- /// Test UpdatePet
- ///
- [Test]
- public void UpdatePetTest()
- {
- // TODO: add unit test for the method 'UpdatePet'
- Pet body = null; // TODO: replace null with proper value
-
- instance.UpdatePet(body);
-
- }
-
///
/// Test AddPet
///
@@ -79,6 +66,33 @@ namespace IO.Swagger.Test
}
+ ///
+ /// Test AddPetUsingByteArray
+ ///
+ [Test]
+ public void AddPetUsingByteArrayTest()
+ {
+ // TODO: add unit test for the method 'AddPetUsingByteArray'
+ byte[] body = null; // TODO: replace null with proper value
+
+ instance.AddPetUsingByteArray(body);
+
+ }
+
+ ///
+ /// Test DeletePet
+ ///
+ [Test]
+ public void DeletePetTest()
+ {
+ // TODO: add unit test for the method 'DeletePet'
+ long? petId = null; // TODO: replace null with proper value
+ string apiKey = null; // TODO: replace null with proper value
+
+ instance.DeletePet(petId, apiKey);
+
+ }
+
///
/// Test FindPetsByStatus
///
@@ -118,50 +132,6 @@ namespace IO.Swagger.Test
Assert.IsInstanceOf (response, "response is Pet");
}
- ///
- /// Test UpdatePetWithForm
- ///
- [Test]
- public void UpdatePetWithFormTest()
- {
- // TODO: add unit test for the method 'UpdatePetWithForm'
- string petId = null; // TODO: replace null with proper value
- string name = null; // TODO: replace null with proper value
- string status = null; // TODO: replace null with proper value
-
- instance.UpdatePetWithForm(petId, name, status);
-
- }
-
- ///
- /// Test DeletePet
- ///
- [Test]
- public void DeletePetTest()
- {
- // TODO: add unit test for the method 'DeletePet'
- long? petId = null; // TODO: replace null with proper value
- string apiKey = null; // TODO: replace null with proper value
-
- instance.DeletePet(petId, apiKey);
-
- }
-
- ///
- /// Test UploadFile
- ///
- [Test]
- public void UploadFileTest()
- {
- // TODO: add unit test for the method 'UploadFile'
- long? petId = null; // TODO: replace null with proper value
- string additionalMetadata = null; // TODO: replace null with proper value
- Stream file = null; // TODO: replace null with proper value
-
- instance.UploadFile(petId, additionalMetadata, file);
-
- }
-
///
/// Test GetPetByIdInObject
///
@@ -189,15 +159,45 @@ namespace IO.Swagger.Test
}
///
- /// Test AddPetUsingByteArray
+ /// Test UpdatePet
///
[Test]
- public void AddPetUsingByteArrayTest()
+ public void UpdatePetTest()
{
- // TODO: add unit test for the method 'AddPetUsingByteArray'
- byte[] body = null; // TODO: replace null with proper value
+ // TODO: add unit test for the method 'UpdatePet'
+ Pet body = null; // TODO: replace null with proper value
- instance.AddPetUsingByteArray(body);
+ instance.UpdatePet(body);
+
+ }
+
+ ///
+ /// Test UpdatePetWithForm
+ ///
+ [Test]
+ public void UpdatePetWithFormTest()
+ {
+ // TODO: add unit test for the method 'UpdatePetWithForm'
+ string petId = null; // TODO: replace null with proper value
+ string name = null; // TODO: replace null with proper value
+ string status = null; // TODO: replace null with proper value
+
+ instance.UpdatePetWithForm(petId, name, status);
+
+ }
+
+ ///
+ /// Test UploadFile
+ ///
+ [Test]
+ public void UploadFileTest()
+ {
+ // TODO: add unit test for the method 'UploadFile'
+ long? petId = null; // TODO: replace null with proper value
+ string additionalMetadata = null; // TODO: replace null with proper value
+ Stream file = null; // TODO: replace null with proper value
+
+ instance.UploadFile(petId, additionalMetadata, file);
}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs
index 0b9acfec5e9..435da36ef02 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs
@@ -53,6 +53,19 @@ namespace IO.Swagger.Test
}
+ ///
+ /// Test DeleteOrder
+ ///
+ [Test]
+ public void DeleteOrderTest()
+ {
+ // TODO: add unit test for the method 'DeleteOrder'
+ string orderId = null; // TODO: replace null with proper value
+
+ instance.DeleteOrder(orderId);
+
+ }
+
///
/// Test FindOrdersByStatus
///
@@ -90,19 +103,6 @@ namespace IO.Swagger.Test
Assert.IsInstanceOf