Merge branch 'master' of ssh://github.com/gnustep/libs-base

Tests/base/NSThread/late_unregister.m

@@ -15,13 +15,13 @@
   BOOL deallocated;
 }
 
-- (void)onThreadExit: (NSNotification*)n;
-- (BOOL)isDone;
+- (void) onThreadExit: (NSNotification*)n;
+- (BOOL) isDone;
 @end
 
 @implementation ThreadExpectation
 
-- (id)init
+- (id) init
 {
   if (nil == (self = [super init]))
     {
@@ -33,26 +33,36 @@
 
 
 
-- (void)inThread: (NSThread*)thread
+- (void) inThread: (NSThread*)thread
 {
+  NSNotificationCenter  *nc = [NSNotificationCenter defaultCenter];
+
   /* We explicitly don't retain this so that we can check that it actually says
    * alive until the notification is sent. That check is implicit since
    * PASS_EQUAL in the -onThreadExit method will throw or crash if that isn't
    * the case.
    */
   origThread = thread;
-  [[NSNotificationCenter defaultCenter] addObserver: self
-                                           selector: @selector(onThreadExit:)
-                                               name: NSThreadWillExitNotification
-                                             object: thread];
+  [nc addObserver: self
+         selector: @selector(onThreadExit:)
+             name: NSThreadWillExitNotification
+           object: thread];
 }
 
-- (void)onThreadExit: (NSNotification*)thr
+- (void) onThreadExit: (NSNotification*)thr
 {
-  NSThread *current = [NSThread currentThread];
+  NSThread      *current = [NSThread currentThread];
+  NSThread      *passed = [thr object];
+
+  PASS_EQUAL(passed, origThread,
+    "NSThreadWillExitNotification passes expected thread")
+  PASS_EQUAL(origThread, current,
+    "Correct thread reference can be obtained on exit")
+  PASS([passed isExecuting],
+    "exiting thread is still executing at point of notification")
+  PASS(![passed isFinished],
+    "exiting thread is not finished at point of notification")
 
-  PASS_EQUAL(origThread,current,
-    "Correct thread reference can be obtained on exit");
   [[NSNotificationCenter defaultCenter] removeObserver: self];
   origThread = nil;
   [condition lock];
@@ -61,7 +71,7 @@
   [condition unlock];
 }
 
-- (BOOL)isDone
+- (BOOL) isDone
 {
   return done;
 }