Merge pull request #298 from tommeier/occurred-typo

Typo: occured -> occurred

Source/Changes.txt

@@ -1,4 +1,4 @@
-Listing of notable changes by release. More detail is usually found in the Git 
+Listing of notable changes by release. More detail is usually found in the Git
 commit messages and/or the pull requests.
 
 OCMock 3.3 (2016-04-12)
@@ -55,7 +55,7 @@ OCMock 3.1.1 (2014-08-23)
 
 * Fixed a recently introduced bug that resulted in class arguments and return
   values not to be considered objects (Patrick Hartling, Max Shcheglov)
-	
+
 
 OCMock 3.1 (2014-08-22)
 
@@ -86,29 +86,29 @@ OCMock 3.0 (2014-06-12)
 
 * Added macro for verify with delay
 * Fixed several critical bugs
-* Allowing nil as block in stub action. With partial mocks this makes it 
-  possible to overwrite a method to do nothing (Sam Stigler) 
+* Allowing nil as block in stub action. With partial mocks this makes it
+  possible to overwrite a method to do nothing (Sam Stigler)
 * More descriptive messages when trying to verify unknown method
 
 
 OCMock 3.0.M3 (2014-05-31)
 
 * Changed license to Apache 2 license
-* Added support for verify-after-run for class methods and for methods sent 
+* Added support for verify-after-run for class methods and for methods sent
   directly to the real object covered by a partial mock.
 * Using a temporary meta class subclass for mocking class methods, enabling
-  full clean-up. As a consequence class methods mocked on a given class are no 
-  longer mocked in all subclasses. 
+  full clean-up. As a consequence class methods mocked on a given class are no
+  longer mocked in all subclasses.
 * Throwing descriptive exception when attempting to create partial mock on
-  toll-free bridged classes and tagged pointers (Mark Larsen)	
+  toll-free bridged classes and tagged pointers (Mark Larsen)
 
 
 OCMock 3.0.M2 (2014-05-07)
 
 * Added support from verify-after-run. Only works for methods that are sent
-  to a mock object. Does not work for classes and methods sent directly to 
+  to a mock object. Does not work for classes and methods sent directly to
   the real object covered by a partial mock.
-* Failures without location are now thrown as OCMockTestFailure exception, 
+* Failures without location are now thrown as OCMockTestFailure exception,
   not as NSInternalInconsistencyException
 
 
@@ -132,7 +132,7 @@ OCMock 2.2.4 (2014-04-04)
 
 OCMock 2.2.2 (2013-12-19)
 
-* Added implementation for Apple-interal NSIsKind informal protocol (Brian 
+* Added implementation for Apple-interal NSIsKind informal protocol (Brian
   Gerstle)
 * Various fixes for method with structure returns (Carl Lindberg)
 * Added a specially typed method for object references to OCMArg.
@@ -182,7 +182,7 @@ OCMock 2.0 (2012-03-02)
 
 
 
-            
+
 OCMock 1.77 (2011-02-15)
 
 * Added feature to explicitly disable a partial mock
@@ -197,7 +197,7 @@ OCMock 1.70 (2010-08-21)
   Marco Sandrini)
 * Fix to allow block arguments (thanks to Justin DeWind)
 * Now building OCMock library for simulator (i386) and device (armv7)
-* Updated example to run tests on device                    
+* Updated example to run tests on device
 * Changed OCMOCK_VALUE macro to be iOS compatible (thanks to Derek Clarkson)
 * Added a new target to build a static library for iOS use
 * Created an example showing how to use OCMock in an iOS project
@@ -211,7 +211,7 @@ OCMock 1.55 (2009-10-16)
 * Disambiguated mock table method name to avoid compiler warning
 * Renamed some variables to avoid warnings when using -Wshadow
 * Partial mocks are now deallocated as they should
-* Fixed problems that occured when using mocks as arguments
+* Fixed problems that occurred when using mocks as arguments
 * OnCall methods now have same signature as replaced ones.
 * Fixed possible retain bug (Daniel Eggert)
 * Added feature that allows to verify expectations are called in sequence.
@@ -233,7 +233,7 @@ OCMock 1.42 (2009-05-19)
 * Added pass by ref argument setters
 * Linked install name now uses @rpath (Dave Dribbin)
 * Added support for respondsToSelector (Dave Dribin)
-* Added constraint for any pointer 
+* Added constraint for any pointer
 * Now comparing selectors as strings (Dado Colussi)
 
 
@@ -265,7 +265,7 @@ OCMock 1.17 (2007-06-04)
 * Added the ability to create multiple identical expectations on the mock
   object (Jeremy Higgs)
 * Added the ability to mock out nil arguments (Jeremy Higgs)
-* Added slightly modified version of Jon Reid's contribution, which adds the 
+* Added slightly modified version of Jon Reid's contribution, which adds the
   possibility to stub primitive return values.
 * Added Jon Reid's bugfix that prevents a crash when trying to stub an unknown
   method on a protocol.

Source/OCMock/OCMockObject.m

@@ -194,7 +194,7 @@ - (id)verifyAtLocation:(OCMLocation *)location
     }
     if(firstException)
 	{
-        NSString *description = [NSString stringWithFormat:@"%@: %@ (This is a strict mock failure that was ignored when it actually occured.)",
+        NSString *description = [NSString stringWithFormat:@"%@: %@ (This is a strict mock failure that was ignored when it actually occurred.)",
          [self description], [firstException description]];
         OCMReportFailure(location, description);
 	}
@@ -312,7 +312,7 @@ - (BOOL)handleInvocation:(NSInvocation *)anInvocation
         [anInvocation retainObjectArgumentsExcludingObject:self];
         [invocations addObject:anInvocation];
     }
-    
+
     OCMInvocationStub *stub = nil;
     @synchronized(stubs)
     {
@@ -327,7 +327,7 @@ - (BOOL)handleInvocation:(NSInvocation *)anInvocation
     }
     if(stub == nil)
         return NO;
-    
+
     BOOL removeStub = NO;
     @synchronized(expectations)
     {
@@ -339,7 +339,7 @@ - (BOOL)handleInvocation:(NSInvocation *)anInvocation
                 [NSException raise:NSInternalInconsistencyException format:@"%@: unexpected method invoked: %@\n\texpected:\t%@",
                              [self description], [stub description], [[expectations objectAtIndex:0] description]];
             }
-            
+
             // We can't check isSatisfied yet, since the stub won't be satisfied until we call handleInvocation:, and we don't want to call handleInvocation: yes for the reason in the comment above, since we'll still have the current expectation in the expectations array, which will cause an exception if expectationOrderMatters is YES and we're not ready for any future expected methods to be called yet
             if(![(OCMInvocationExpectation *)stub isMatchAndReject])
             {
@@ -357,7 +357,7 @@ - (BOOL)handleInvocation:(NSInvocation *)anInvocation
     }
     [stub handleInvocation:anInvocation];
     [stub release];
-    
+
     return YES;
 }
 
@@ -412,9 +412,9 @@ - (NSString *)_stubDescriptions:(BOOL)onlyExpectations
         {
             expectationsContainStub = [expectations containsObject:stub];
         }
-        
+
 		NSString *prefix = @"";
-		
+
 		if(onlyExpectations)
 		{
 			if(expectationsContainStub == NO)