updated logic, merged

Author: fehguy

modules/swagger-codegen/src/main/resources/objc/api-body.mustache

@@ -129,8 +129,10 @@ static NSString * basePath = @"{{basePath}}";
     if(bodyDictionary == nil) {
       bodyDictionary = [[NSMutableArray alloc] init];
     }
-    [bodyDictionary addObject:{{paramName}}];
-    {{paramName}}.paramName  = @"{{baseName}}";
+    if({{paramName}} != nil) {
+      [bodyDictionary addObject:{{paramName}}];
+      {{paramName}}.paramName  = @"{{baseName}}";
+    }
     {{/isFile}}
     if(bodyDictionary == nil) {
       bodyDictionary = [[NSMutableArray alloc] init];

samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m

@@ -154,7 +154,7 @@ - (void)testGetPetByTags {
 }
 
 - (void)testDeletePet {
-    XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetById"];
+    XCTestExpectation *expectation = [self expectationWithDescription:@"testDeletePet"];
 
     SWGPet* pet = [self createPet];
 
@@ -181,6 +181,42 @@ - (void)testDeletePet {
     [self waitForExpectationsWithTimeout:10.0 handler:nil];
 }
 
+- (void)testUploadFile {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"testUploadFile"];
+
+    NSString* str = @"teststring";
+    NSData* data = [str dataUsingEncoding:NSUTF8StringEncoding];
+    
+    SWGFile * file = [[SWGFile alloc] initWithNameData: @"myFile.txt" mimeType:@"text/plain" data:data];
+    
+    [api uploadFileWithCompletionBlock:@1 additionalMetadata:@"special-metadata" file:file completionHandler:^(NSError *error) {
+        if(error) {
+            // good
+            XCTFail(@"expected a failure");
+            
+        }
+        else {
+            [expectation fulfill];
+        }
+    }];
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
+}
+
+- (void)TestUploadWithoutFile {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"testUploadWithoutFile"];
+    
+    [api uploadFileWithCompletionBlock:@1 additionalMetadata:@"special-metadata" file:nil completionHandler:^(NSError *error) {
+        if(error) {
+            XCTFail(@"failed to upload");
+            
+        }
+        else {
+            [expectation fulfill];
+        }
+    }];
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
+}
+
 - (SWGPet*) createPet {
     SWGPet * pet = [[SWGPet alloc] init];
     pet._id = [[NSNumber alloc] initWithLong:[[NSDate date] timeIntervalSince1970]];