iOS: Re-running a test should respect shouldRunOnMainThread.

Classes-iOS/GHUnitIOSTestViewController.h

@@ -40,10 +40,11 @@
   GHImageDiffView *imageDiffView_;
 
   GHTestNode *testNode_;
+  GHTestGroup *group_;
 
   GHTestRunner *runner_;
 }
 
-- (void)setTest:(id<GHTest>)test;
+- (void)setTest:(id<GHTest>)test group:(id<GHTest>)group;
 
 @end

Classes-iOS/GHUnitIOSTestViewController.m

@@ -44,6 +44,7 @@ - (id)init {
 
 - (void)dealloc {
   [testNode_ release];
+  [group_ release];
   [super dealloc];
 }
 
@@ -59,12 +60,16 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
 }
 
 - (void)_runTest {
-  id<GHTest> test = [testNode_.test copyWithZone:NULL];
-  NSLog(@"Re-running: %@", test);
+  NSLog(@"Re-running: %@", group_);
   [testView_ setText:@"Running..."];
-  [test run:GHTestOptionForceSetUpTearDownClass];  
-  [self setTest:test];
+
+  id<GHTest> test = [testNode_.test copyWithZone:nil];
+  GHTestGroup* group = [[GHTestGroup alloc] initWithGroup:group_ test:test];
+  [group run:GHTestOptionForceSetUpTearDownClass];  
+  [self setTest:test group:group];
+
   [test release];
+  [group release];
 }
 
 - (void)_showImageDiff {
@@ -101,12 +106,14 @@ - (NSString *)updateTestView {
   return text;
 }
 
-- (void)setTest:(id<GHTest>)test {
+- (void)setTest:(id<GHTest>)test group:(id<GHTest>)group {
   [self view];
   self.title = [test name];
 
   [testNode_ release];
   testNode_ = [[GHTestNode nodeWithTest:test children:nil source:nil] retain];
+  [group_ release];
+  group_ = [group retain];
   NSString *text = [self updateTestView];
   NSLog(@"%@", text);
 }

Classes-iOS/GHUnitIOSViewController.m

@@ -204,7 +204,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     GHTestNode *testNode = [[sectionNode children] objectAtIndex:indexPath.row];
 
     GHUnitIOSTestViewController *testViewController = [[GHUnitIOSTestViewController alloc] init]; 
-    [testViewController setTest:testNode.test];
+    [testViewController setTest:testNode.test group:sectionNode.test];
     [self.navigationController pushViewController:testViewController animated:YES];
     [testViewController release];
   }

Classes/GHTest/GHTestGroup.h

@@ -125,6 +125,10 @@
  */
 - (id)initWithTestCase:(id)testCase selector:(SEL)selector delegate:(id<GHTestDelegate>)delegate;
 
+
+- (id)initWithGroup:(GHTestGroup*)group test:(id<GHTest>)test;
+
+
 /*!
  Create test group from a test case.
  @param testCase Test case, could be a subclass of SenTestCase or GHTestCase

Classes/GHTest/GHTestGroup.m

@@ -72,6 +72,16 @@ - (id)initWithTestCase:(id)testCase selector:(SEL)selector delegate:(id<GHTestDe
   return self;
 }
 
+- (id)initWithGroup:(GHTestGroup*)group test:(id<GHTest>)test {
+    if ((self = [super init])) {
+        name_ = [group.name retain];        
+        children_ = [[NSMutableArray arrayWithObject:test] retain];
+        delegate_ = group.delegate;
+        testCase_ = group.testCase;
+    } 
+    return self;
+}
+
 + (GHTestGroup *)testGroupFromTestCase:(id)testCase delegate:(id<GHTestDelegate>)delegate {
   return [[[GHTestGroup alloc] initWithTestCase:testCase delegate:delegate] autorelease];
 }