Code changes & Changes required for test cases

IoTKitLib/IoTKitLib/ComponentCatalogManagement.m

@@ -245,7 +245,7 @@ -(CloudResponse *)createCustomComponent:(ComponentCatalog *)createComponentCatal
         return [CloudResponse createCloudResponseWithStatus:false andMessage:[NSString stringWithFormat:@"%@:ComponentCatalog need to be initialized & configured to create component",TAG]];
     }
     NSString *msg = [self validateActuatorCommand:createComponentCatalog];
-    if (!msg) {
+    if (msg) {
         return [CloudResponse createCloudResponseWithStatus:false andMessage:msg];
     }
     NSData *data = [self createBodyForCreationOfCustomComponent:createComponentCatalog];
@@ -280,7 +280,7 @@ -(CloudResponse *)updateAComponent:(ComponentCatalog *)updateComponentCatalog
         return [CloudResponse createCloudResponseWithStatus:false andMessage:[NSString stringWithFormat:@"%@:ComponentCatalog need to be initialized & configured to update component",TAG]];
     }
     NSString *msg = [self validateActuatorCommand:updateComponentCatalog];
-    if (!msg) {
+    if (msg) {
         return [CloudResponse createCloudResponseWithStatus:false andMessage:msg];
     }
     NSData *data = [self createBodyForUpdationOfCustomComponent:updateComponentCatalog];

IoTKitLib/IoTKitLib/DataManagement.m

@@ -147,7 +147,7 @@ -(CloudResponse *) submitDataOn:(NSString*) componentName AndValue:(NSString*) c
  **************************************************************************************************************************/
 -(CloudResponse *)retrieveDataOn:(ConfigureRetrieveData *)objRetrieveData{
     NSString *msg = [self validateRetrieveDataValues:objRetrieveData];
-    if (!msg) {
+    if (msg) {
         return [CloudResponse createCloudResponseWithStatus:false andMessage:msg];
     }
     NSData *data = [self createHttpBodyToRetrieveData:objRetrieveData];

IoTKitLib/IoTKitLib/UserManagement.h

@@ -29,7 +29,7 @@
 -(CloudResponse *) deleteUser:(NSString*)userId;
 -(CloudResponse *) getUserInfo:(NSString*)userId;
 -(CloudResponse *) updateUserAttributesOn:(NSString*) userId AndListOfAttributes:(NSDictionary*)listOfUserAttributes;
--(CloudResponse *) acceptTermsAndConditionsOn:(NSString*)userId Acceptance:(BOOL)isAccepted;
+//-(CloudResponse *) acceptTermsAndConditionsOn:(NSString*)userId Acceptance:(BOOL)isAccepted;
 -(CloudResponse *) requestChangePasswordOn:(NSString*)emailId;
 -(CloudResponse *) updateForgotPassword:(NSString*)mailToken AndNewPassword:(NSString*)newPassword;
 -(CloudResponse *) changePasswordOn:(NSString*)emailId AndCurrentPassword:(NSString*)currentPassword

IoTKitLib/IoTKitLib/UserManagement.m

@@ -144,7 +144,7 @@ -(CloudResponse *) updateUserAttributesOn:(NSString*) userId AndListOfAttributes
  * PARAMETERS : 1)userId
                 2)isAccepted(true/false)
  **************************************************************************************************************************/
--(CloudResponse *) acceptTermsAndConditionsOn:(NSString*)userId Acceptance:(BOOL)isAccepted{
+/*-(CloudResponse *) acceptTermsAndConditionsOn:(NSString*)userId Acceptance:(BOOL)isAccepted{
     NSString *tempUserId = [self validateAndGetUserId:userId];
     if(!tempUserId){
         return [CloudResponse createCloudResponseWithStatus:false andMessage:[NSString stringWithFormat:@"%@:userID empty and cannot find from user defaults",TAG]];
@@ -159,7 +159,7 @@ -(CloudResponse *) acceptTermsAndConditionsOn:(NSString*)userId Acceptance:(BOOL
                                                                           AuthToken:self.getStoredAuthToken
                                                                         DeviceToken:nil];
     return [self initiateHttpOperation:httpOperation];
-}
+}*/
 /***************************************************************************************************************************
  * FUNCTION NAME: requestChangePasswordOn
  *
@@ -332,7 +332,7 @@ -(NSData*)validateAndCreateHttpBodyForNewUser:(NSString*)emailId AndPassword:(NS
         NSLog(@"%@:emailID and password are mandatory",TAG);
         return nil;
     }
-    NSDictionary *newUserJson = [NSDictionary dictionaryWithObjectsAndKeys:emailId,EMAIL,password,PASSWORD,nil];
+    NSDictionary *newUserJson = [NSDictionary dictionaryWithObjectsAndKeys:emailId,EMAIL,password,PASSWORD,[NSNumber numberWithBool:true],@"termsAndConditions",nil];
     NSError *error;
     return [NSJSONSerialization dataWithJSONObject:newUserJson options:NSJSONWritingPrettyPrinted error:&error];
 }

IoTKitLib/IoTKitLib/http/HttpRequestOperation.m

@@ -181,7 +181,7 @@ - (CloudResponse *)initiateAsyncRequest {
                                [self completeHandler:response onData:data AndError:error];
                            }];
 
-    return [CloudResponse createCloudResponseWithStatus:true andMessage:@"initiateAsyncRequest"];
+    return [CloudResponse createCloudResponseWithStatus:true andMessage:@"initiatedAsyncRequest"];
 }
 
 /***************************************************************************************************************************

IoTTests/BasicSetup.h

@@ -29,8 +29,6 @@
 
 @interface BasicSetup : XCTestCase
 
--(void)configureResponseDelegateWithExpectedResponseCode:(NSInteger)expectedResponseCode;
--(void)waitForServerResponse;
 -(NSString*)getRandomValueString;
 -(NSString*)getRandomAccountName;
 -(NSString*)getRandomDeviceName;

IoTTests/BasicSetup.m

@@ -27,49 +27,8 @@
 #define RANDOM_RANGE_MAX 10000
 #define RANDOM_RANGE_MAX_READING 100
 
-@interface BasicSetup ()
-
-@property(nonatomic,assign)NSInteger expectedResponseCode;
-@property(nonatomic,assign)NSInteger serverResponseCode;
-@property(nonatomic,assign)BOOL isServerResponded;
-@property(nonatomic,retain)NSString* serverResponseContent;
-@property(nonatomic,retain)HttpResponseDelegatee *responseDelegate;
-
-@end
-
 @implementation BasicSetup
 
-/***************************************************************************************************************************
- * FUNCTION NAME: waitForServerResponse
- *
- * DESCRIPTION: method waits(UI thread) in active loop until server responsds for given request
- *
- * RETURNS: nothing
- *
- * PARAMETERS : nil
- **************************************************************************************************************************/
--(void)waitForServerResponse{
-    @synchronized(self){
-        while(!_isServerResponded){}
-        _isServerResponded = false;
-        XCTAssertEqual(_expectedResponseCode, _serverResponseCode,@"Server Response:%@", _serverResponseContent);
-    }
-}
-
-/***************************************************************************************************************************
- * FUNCTION NAME: notifyServerResponse
- *
- * DESCRIPTION: method which notifies(updates _isServerResponded flag) when server responsds
- *
- * RETURNS: nothing
- *
- * PARAMETERS : nil
- **************************************************************************************************************************/
--(void)notifyServerResponse{
-    _isServerResponded = true;
-    CFRunLoopStop(CFRunLoopGetCurrent());
-}
-
 /***************************************************************************************************************************
  * FUNCTION NAME: setUp
  *
@@ -81,8 +40,6 @@ -(void)notifyServerResponse{
  **************************************************************************************************************************/
 - (void)setUp {
     [super setUp];
-    _isServerResponded = false;
-    _responseDelegate = [HttpResponseDelegatee sharedInstance];
 }
 
 /***************************************************************************************************************************
@@ -98,27 +55,6 @@ - (void)tearDown {
     [super tearDown];
 }
 
-/***************************************************************************************************************************
- * FUNCTION NAME: configureResponseDelegateWithExpectedResponseCode
- *
- * DESCRIPTION: method creates delegate receive server responses
- *
- * RETURNS: nothing
- *
- * PARAMETERS : expected response code
- **************************************************************************************************************************/
--(void)configureResponseDelegateWithExpectedResponseCode:(NSInteger)expectedResponseCode{
-    __block BasicSetup *blockTest = self;
-    __block HttpResponseDelegatee *blockResponseDelegate = _responseDelegate;
-    blockResponseDelegate.readResponse = ^(CloudResponse *cloudResponse)
-    {
-        _expectedResponseCode = expectedResponseCode;
-        _serverResponseCode = cloudResponse.responseCode;
-        _serverResponseContent = cloudResponse.responseString;
-        [blockTest notifyServerResponse];
-    };
-}
-
 /***************************************************************************************************************************
  * FUNCTION NAME: getRandomValueString
  *

IoTTests/Module_001_AuthorizationManagementTests.m

@@ -43,19 +43,17 @@ - (void)tearDown {
     [super tearDown];
 }
 - (void)test_101_GetNewAuthorizationToken {
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_authorizationObject getNewAuthorizationTokenWithUsername:@"intel.aricent.iot5@gmail.com" andPassword:@"Password2529"]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_authorizationObject getNewAuthorizationTokenWithUsername:@"intel.aricent.iot6@gmail.com" andPassword:@"Password2529"];
+    XCTAssertEqual(response.responseCode, 200);
+
 }
 - (void)test_103_GetAuthorizationTokenInfo {
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_authorizationObject getAuthorizationTokenInfo]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_authorizationObject getAuthorizationTokenInfo];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_102_ValidateAuthorizationToken{
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_authorizationObject validateAuthorizationToken]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_authorizationObject validateAuthorizationToken];
+    XCTAssertEqual(response.responseCode, 200);
 }
 
 @end

IoTTests/Module_002_AccountManagementTests.m

@@ -43,45 +43,37 @@ - (void)tearDown {
 }
 
 - (void)test_201_CreateAnAccount {
-    [self configureResponseDelegateWithExpectedResponseCode:201];
-    XCTAssertTrue([_accountManagementObject createAnAccount:[self getRandomAccountName]]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_accountManagementObject createAnAccount:[self getRandomAccountName]];
+    XCTAssertEqual(response.responseCode, 201);
 }
 - (void)test_202_GetNewAuthorizationToken{
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    AuthorizationManagement *auth = [[AuthorizationManagement alloc]init];
-    XCTAssertTrue([auth getNewAuthorizationTokenWithUsername:@"intel.aricent.iot5@gmail.com" andPassword:@"Password2529"]);
-    [self waitForServerResponse];
+     AuthorizationManagement *auth = [[AuthorizationManagement alloc]init];
+    CloudResponse *response = [auth getNewAuthorizationTokenWithUsername:@"intel.aricent.iot6@gmail.com" andPassword:@"Password2529"];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_203_GetAccountInformation {
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_accountManagementObject getAccountInformation]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_accountManagementObject getAccountInformation];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_204_RenewAccountActivationCode {
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_accountManagementObject renewAccountActivationCode]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_accountManagementObject renewAccountActivationCode];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_205_GetAccountActivationCode {
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_accountManagementObject getAccountActivationCode]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_accountManagementObject getAccountActivationCode];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_206_AddAnotherUserToYourAccount {
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_accountManagementObject addAnotherUserToAccount:[HttpUrlBuilder getAccountId] UserGettingInvited:@"545b0cb707024be10dec1152" Admin:false]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_accountManagementObject addAnotherUserToAccount:[HttpUrlBuilder getAccountId] UserGettingInvited:@"545b0cb707024be10dec1152" Admin:true];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_207_UpdateAnAccount {
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_accountManagementObject updateAnAccount:[HttpUrlBuilder getAccountName]
-                   andOptionalAttributesWithSimpleKeyValues:nil]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_accountManagementObject updateAnAccount:[HttpUrlBuilder getAccountName]
+                               andOptionalAttributesWithSimpleKeyValues:nil];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_208_DeleteAnAccount {
-    [self configureResponseDelegateWithExpectedResponseCode:204];
-    XCTAssertTrue([_accountManagementObject deleteAnAccount]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_accountManagementObject deleteAnAccount];
+    XCTAssertEqual(response.responseCode, 204);
 }
 @end

IoTTests/Module_003_DeviceManagementTests.m

@@ -43,7 +43,6 @@ - (void)tearDown {
 }
 
 - (void)test_301_CreateNewDevice{
-    [self configureResponseDelegateWithExpectedResponseCode:201];
     NSString *devId = [self getRandomDeviceId];
     Device *device = [Device createDeviceWithDeviceName:[self getRandomDeviceName]
                                                               andDeviceId:devId andGatewayId:devId];
@@ -54,11 +53,10 @@ - (void)test_301_CreateNewDevice{
     [device addAttributeName:@"Camera" andValue:@"8MP"];
     [device addAttributeName:@"Wifi" andValue:@"YES"];
     [device addAttributeName:@"Retina Display" andValue:@"NO"];
-    XCTAssertTrue([_deviceObject createNewDevice:device]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject createNewDevice:device];
+    XCTAssertEqual(response.responseCode, 201);
 }
 - (void)test_302_UpdateADevice{
-    [self configureResponseDelegateWithExpectedResponseCode:200];
     Device *updateDevice = [Device createDeviceWithDeviceName:[self getRandomDeviceName]
                                                               andDeviceId:nil andGatewayId:[HttpUrlBuilder getDeviceId]];
     [updateDevice addLocationInfo:15.0 AndLongitude:25.0 ANdHeight:20.0];
@@ -68,53 +66,44 @@ - (void)test_302_UpdateADevice{
     [updateDevice addAttributeName:@"Camera" andValue:@"8MP"];
     [updateDevice addAttributeName:@"Wifi" andValue:@"YES"];
     [updateDevice addAttributeName:@"Retina Display" andValue:@"YES"];
-    XCTAssertTrue([_deviceObject updateADevice:updateDevice]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject updateADevice:updateDevice];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_303_GetDeviceList{
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_deviceObject getDeviceList]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject getDeviceList];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_304_GetMyDeviceInfo{
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_deviceObject getMyDeviceInfo]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject getMyDeviceInfo];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_305_GetInfoOnDevice{
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_deviceObject getInfoOnDevice:[HttpUrlBuilder getDeviceId]]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject getInfoOnDevice:[HttpUrlBuilder getDeviceId]];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_306_ActivateADevice{
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_deviceObject activateADevice:[HttpUrlBuilder getAccountActivationCode]]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject activateADevice:[HttpUrlBuilder getAccountActivationCode]];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_307_AddComponentToDevice{
-    [self configureResponseDelegateWithExpectedResponseCode:201];
-    XCTAssertTrue([_deviceObject addComponentToDevice:[self getRandomDeviceComponentName] WithType:@"temperature.v1.0"]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject addComponentToDevice:[self getRandomDeviceComponentName] WithType:@"temperature.v1.0"];
+    XCTAssertEqual(response.responseCode, 201);
 }
 - (void)test_308_GetAllAttributes{
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_deviceObject getAllAttributes]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject getAllAttributes];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_309_GetAllTags{
-    [self configureResponseDelegateWithExpectedResponseCode:200];
-    XCTAssertTrue([_deviceObject getAllTags]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject getAllTags];
+    XCTAssertEqual(response.responseCode, 200);
 }
 - (void)test_310_DeleteAComponent{
-    [self configureResponseDelegateWithExpectedResponseCode:204];
-    XCTAssertTrue([_deviceObject deleteAComponent:[HttpUrlBuilder getComponentName]]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject deleteAComponent:[HttpUrlBuilder getComponentName]];
+    XCTAssertEqual(response.responseCode, 204);
 }
 - (void)test_311_DeleteADevice{
-    [self configureResponseDelegateWithExpectedResponseCode:204];
-    XCTAssertTrue([_deviceObject deleteADevice:[HttpUrlBuilder getDeviceId]]);
-    [self waitForServerResponse];
+    CloudResponse *response = [_deviceObject deleteADevice:[HttpUrlBuilder getDeviceId]];
+    XCTAssertEqual(response.responseCode, 204);
 }
 
 @end