BIS-500 SP-836 : Working on getting the iPad to handle deleted entities.

SVN: 29742

openbis-ipad/source/objc/BisKit/Classes/CISDOBIpadServiceManagerInternal.h

@@ -68,6 +68,7 @@
 @property(strong, readonly) NSManagedObjectContext *managedObjectContext;
 @property(copy, nonatomic) NSError *error;
 @property(strong, readonly) CISDOBIpadServerInfo *serverInfo;
+@property(readonly) NSArray *deletedEntityPermIds;
 
 // Initialization
 - (id)initWithServiceManager:(CISDOBIpadServiceManager *)serviceManager managerCall:(CISDOBIpadServiceManagerCall *)call rawEntities:(NSArray *)rawEntities;

openbis-ipad/source/objc/BisKit/Tests/CISDOBIpadServiceManagerTest.m

@@ -543,9 +543,6 @@ static BOOL IsPermIdTarget(NSString *permId)
     [self performLogin];
     [self performRootLevelCall];
     
-    // Figure out how many targets and compounds are available
-    NSUInteger targetsAndCompoundsCount = [[self targetsAndCompounds] count];
-    
     // Pick an entity to remove from the next result set to simulate deletion
     NSArray *navigationEntities = [self navigationEntities];
     CISDOBIpadEntity *categoryToRemove;
@@ -562,7 +559,7 @@ static BOOL IsPermIdTarget(NSString *permId)
         if ([entitiesToDelete count] < 1) return;
         
         [removedPermIds addObjectsFromArray: entitiesToDelete];
-        STAssertEquals((NSUInteger) targetsAndCompoundsCount + 1, [entitiesToDelete count], @"All targets and compounds should be deleted.");
+        STAssertEquals((NSUInteger) 1, [entitiesToDelete count], @"One navigational entity should have been deleted.");
         NSUInteger navCount = 0, compoundCount = 0, targetCount = 0;
         for (NSString *entityPermId in entitiesToDelete) {
             BOOL is5HTCompound = IsPermIdCompound(entityPermId);
@@ -574,8 +571,8 @@ static BOOL IsPermIdTarget(NSString *permId)
             if (isNav) ++navCount;
         }
         STAssertEquals((NSUInteger) 1, navCount, @"Only one navigational entity should have been deleted");
-        STAssertEquals((NSUInteger) 204, compoundCount, @"204 compound entities should have been deleted");
-        STAssertEquals((NSUInteger) 29, targetCount, @"29 target entities should have been deleted");
+        STAssertEquals((NSUInteger) 0, compoundCount, @"No compound entities should have been deleted");
+        STAssertEquals((NSUInteger) 0, targetCount, @"No target entities should have been deleted");
     };
 
     [self retrieveRootLevelEntitiesSimulatingRemovalOfCategory: categoryToRemove];

openbis-ipad/source/objc/Research/BisMac.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist

@@ -2,71 +2,4 @@
 <Bucket
    type = "1"
    version = "1.0">
-   <FileBreakpoints>
-      <FileBreakpoint
-         shouldBeEnabled = "No"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         filePath = "../BisKit/Classes/CISDOBIpadServiceManager.m"
-         timestampString = "400434185.225155"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "238"
-         endingLineNumber = "238"
-         landmarkName = "-syncEntities:notifying:"
-         landmarkType = "5">
-      </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         filePath = "../BisKit/Tests/CISDOBIpadServiceManagerTest.m"
-         timestampString = "400492308.531648"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "582"
-         endingLineNumber = "582"
-         landmarkName = "-testDeletedEntities"
-         landmarkType = "5">
-      </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         filePath = "../BisKit/Tests/CISDOBIpadServiceManagerTest.m"
-         timestampString = "400492885.083944"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "578"
-         endingLineNumber = "578"
-         landmarkName = "-testDeletedEntities"
-         landmarkType = "5">
-      </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         filePath = "../BisKit/Classes/CISDOBIpadServiceManager.m"
-         timestampString = "400494206.59451"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "185"
-         endingLineNumber = "185"
-         landmarkName = "-finishServerSyncTriggeredAtDate:notifying:"
-         landmarkType = "5">
-      </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         filePath = "../BisKit/Classes/CISDOBIpadServiceManager.m"
-         timestampString = "400495021.048658"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "848"
-         endingLineNumber = "848"
-         landmarkName = "-callCompletionAction:count:"
-         landmarkType = "5">
-      </FileBreakpoint>
-   </FileBreakpoints>
 </Bucket>