remove OCMock and make everything not break.

mbesnili · Jan 12, 2016 · 6f90c0e · 6f90c0e
1 parent 807b5fe
commit 6f90c0e
Show file tree

Hide file tree

Showing 136 changed files with 186 additions and 6,372 deletions.
diff --git a/JSQMessages.xcodeproj/project.pbxproj b/JSQMessages.xcodeproj/project.pbxproj
diff --git a/JSQMessages.xcworkspace/xcshareddata/JSQMessages.xccheckout b/JSQMessages.xcworkspace/xcshareddata/JSQMessages.xccheckout
diff --git a/JSQMessages.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist b/JSQMessages.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/JSQMessagesTests/ControllerTests/JSQMessagesViewControllerTests.m b/JSQMessagesTests/ControllerTests/JSQMessagesViewControllerTests.m
@@ -10,8 +10,6 @@
 
 #import <XCTest/XCTest.h>
 
-#import <OCMock/OCMock.h>
-
 #import "JSQMessagesViewController.h"
 #import "DemoMessagesViewController.h"
 
@@ -103,19 +101,4 @@ - (void)testJSQMessagesViewControllerSubclassInitStoryboards
     XCTAssertNotNil(demoVC.inputToolbar, @"Input toolbar should not be nil");
 }
 
-- (void)testViewConfiguration
-{
-    JSQMessagesViewController *vc = [JSQMessagesViewController messagesViewController];
-    vc.senderId = @"senderId";
-    vc.senderDisplayName = @"senderDisplayName";
-
-    id mockVC = [OCMockObject partialMockForObject:vc];
-    [[mockVC expect] jsq_configureMessagesViewController];
-
-    [vc beginAppearanceTransition:YES animated:NO];
-    [vc endAppearanceTransition];
-
-    [mockVC verify];
-}
-
 @end
diff --git a/JSQMessagesTests/ModelTests/JSQMessageMediaTests.m b/JSQMessagesTests/ModelTests/JSQMessageMediaTests.m
@@ -10,7 +10,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import <OCMock/OCMock.h>
+//#import <OCMock/OCMock.h>
 
 #import "JSQMessage.h"
 
@@ -44,7 +44,7 @@ @interface JSQMessageMediaTests : XCTestCase
 @property (strong, nonatomic) NSString *senderId;
 @property (strong, nonatomic) NSString *senderDisplayName;
 @property (strong, nonatomic) NSDate *date;
-@property (strong, nonatomic) id mockMediaData;
+@property (strong, nonatomic) FakeMedia *fakeMediaData;
 
 @end
 
@@ -57,17 +57,15 @@ - (void)setUp
     self.senderId = @"324543-43556-212343";
     self.senderDisplayName = @"Jesse Squires";
     self.date = [NSDate date];
-
-    self.mockMediaData = [OCMockObject mockForProtocol:@protocol(JSQMessageMediaData)];
-    [[self.mockMediaData stub] mediaHash];
+    self.fakeMediaData = [FakeMedia new];
 }
 
 - (void)tearDown
 {
     self.senderId = nil;
     self.senderDisplayName = nil;
     self.date = nil;
-    self.mockMediaData = nil;
+    self.fakeMediaData = nil;
     [super tearDown];
 }
 
@@ -76,7 +74,7 @@ - (void)testMediaMessageInit
     JSQMessage *msg = [[JSQMessage alloc] initWithSenderId:self.senderId
                                          senderDisplayName:self.senderDisplayName
                                                       date:self.date
-                                                     media:self.mockMediaData];
+                                                     media:self.fakeMediaData];
     XCTAssertNotNil(msg, @"Message should not be nil");
 }
 
@@ -90,7 +88,7 @@ - (void)testMediaMessageIsEqual
     JSQMessage *msg = [[JSQMessage alloc] initWithSenderId:self.senderId
                                          senderDisplayName:self.senderDisplayName
                                                       date:self.date
-                                                     media:self.mockMediaData];
+                                                     media:self.fakeMediaData];
     JSQMessage *copy = [msg copy];
 
     XCTAssertEqualObjects(msg, copy, @"Copied messages should be equal");

diff --git a/Podfile b/Podfile
@@ -8,5 +8,5 @@ inhibit_all_warnings!
 pod 'JSQSystemSoundPlayer', '~> 2.0'
 
 target :JSQMessagesTests, :exclusive => true do
-    pod 'OCMock'
+   pod 'JSQSystemSoundPlayer', '~> 2.0'
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,13 +1,10 @@
 PODS:
   - JSQSystemSoundPlayer (2.0.1)
-  - OCMock (3.2)
 
 DEPENDENCIES:
   - JSQSystemSoundPlayer (~> 2.0)
-  - OCMock
 
 SPEC CHECKSUMS:
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
-  OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb
 
 COCOAPODS: 0.39.0
diff --git a/Pods/Headers/Private/OCMock/NSInvocation+OCMAdditions.h b/Pods/Headers/Private/OCMock/NSInvocation+OCMAdditions.h
diff --git a/Pods/Headers/Private/OCMock/NSMethodSignature+OCMAdditions.h b/Pods/Headers/Private/OCMock/NSMethodSignature+OCMAdditions.h
diff --git a/Pods/Headers/Private/OCMock/NSNotificationCenter+OCMAdditions.h b/Pods/Headers/Private/OCMock/NSNotificationCenter+OCMAdditions.h
diff --git a/Pods/Headers/Private/OCMock/NSObject+OCMAdditions.h b/Pods/Headers/Private/OCMock/NSObject+OCMAdditions.h
diff --git a/Pods/Headers/Private/OCMock/NSValue+OCMAdditions.h b/Pods/Headers/Private/OCMock/NSValue+OCMAdditions.h
diff --git a/Pods/Headers/Private/OCMock/OCClassMockObject.h b/Pods/Headers/Private/OCMock/OCClassMockObject.h
diff --git a/Pods/Headers/Private/OCMock/OCMArg.h b/Pods/Headers/Private/OCMock/OCMArg.h
diff --git a/Pods/Headers/Private/OCMock/OCMArgAction.h b/Pods/Headers/Private/OCMock/OCMArgAction.h
diff --git a/Pods/Headers/Private/OCMock/OCMBlockArgCaller.h b/Pods/Headers/Private/OCMock/OCMBlockArgCaller.h
diff --git a/Pods/Headers/Private/OCMock/OCMBlockCaller.h b/Pods/Headers/Private/OCMock/OCMBlockCaller.h
diff --git a/Pods/Headers/Private/OCMock/OCMBoxedReturnValueProvider.h b/Pods/Headers/Private/OCMock/OCMBoxedReturnValueProvider.h
diff --git a/Pods/Headers/Private/OCMock/OCMConstraint.h b/Pods/Headers/Private/OCMock/OCMConstraint.h
diff --git a/Pods/Headers/Private/OCMock/OCMExceptionReturnValueProvider.h b/Pods/Headers/Private/OCMock/OCMExceptionReturnValueProvider.h
diff --git a/Pods/Headers/Private/OCMock/OCMExpectationRecorder.h b/Pods/Headers/Private/OCMock/OCMExpectationRecorder.h
diff --git a/Pods/Headers/Private/OCMock/OCMFunctions.h b/Pods/Headers/Private/OCMock/OCMFunctions.h
diff --git a/Pods/Headers/Private/OCMock/OCMFunctionsPrivate.h b/Pods/Headers/Private/OCMock/OCMFunctionsPrivate.h
diff --git a/Pods/Headers/Private/OCMock/OCMIndirectReturnValueProvider.h b/Pods/Headers/Private/OCMock/OCMIndirectReturnValueProvider.h
diff --git a/Pods/Headers/Private/OCMock/OCMInvocationExpectation.h b/Pods/Headers/Private/OCMock/OCMInvocationExpectation.h
diff --git a/Pods/Headers/Private/OCMock/OCMInvocationMatcher.h b/Pods/Headers/Private/OCMock/OCMInvocationMatcher.h
diff --git a/Pods/Headers/Private/OCMock/OCMInvocationStub.h b/Pods/Headers/Private/OCMock/OCMInvocationStub.h
diff --git a/Pods/Headers/Private/OCMock/OCMLocation.h b/Pods/Headers/Private/OCMock/OCMLocation.h
diff --git a/Pods/Headers/Private/OCMock/OCMMacroState.h b/Pods/Headers/Private/OCMock/OCMMacroState.h
diff --git a/Pods/Headers/Private/OCMock/OCMNotificationPoster.h b/Pods/Headers/Private/OCMock/OCMNotificationPoster.h
diff --git a/Pods/Headers/Private/OCMock/OCMObserverRecorder.h b/Pods/Headers/Private/OCMock/OCMObserverRecorder.h
diff --git a/Pods/Headers/Private/OCMock/OCMPassByRefSetter.h b/Pods/Headers/Private/OCMock/OCMPassByRefSetter.h
diff --git a/Pods/Headers/Private/OCMock/OCMRealObjectForwarder.h b/Pods/Headers/Private/OCMock/OCMRealObjectForwarder.h
diff --git a/Pods/Headers/Private/OCMock/OCMRecorder.h b/Pods/Headers/Private/OCMock/OCMRecorder.h
diff --git a/Pods/Headers/Private/OCMock/OCMReturnValueProvider.h b/Pods/Headers/Private/OCMock/OCMReturnValueProvider.h
diff --git a/Pods/Headers/Private/OCMock/OCMStubRecorder.h b/Pods/Headers/Private/OCMock/OCMStubRecorder.h
diff --git a/Pods/Headers/Private/OCMock/OCMVerifier.h b/Pods/Headers/Private/OCMock/OCMVerifier.h
diff --git a/Pods/Headers/Private/OCMock/OCMock.h b/Pods/Headers/Private/OCMock/OCMock.h
diff --git a/Pods/Headers/Private/OCMock/OCMockObject.h b/Pods/Headers/Private/OCMock/OCMockObject.h
diff --git a/Pods/Headers/Private/OCMock/OCObserverMockObject.h b/Pods/Headers/Private/OCMock/OCObserverMockObject.h
diff --git a/Pods/Headers/Private/OCMock/OCPartialMockObject.h b/Pods/Headers/Private/OCMock/OCPartialMockObject.h
diff --git a/Pods/Headers/Private/OCMock/OCProtocolMockObject.h b/Pods/Headers/Private/OCMock/OCProtocolMockObject.h
diff --git a/Pods/Headers/Public/OCMock/NSNotificationCenter+OCMAdditions.h b/Pods/Headers/Public/OCMock/NSNotificationCenter+OCMAdditions.h
diff --git a/Pods/Headers/Public/OCMock/OCMArg.h b/Pods/Headers/Public/OCMock/OCMArg.h
diff --git a/Pods/Headers/Public/OCMock/OCMConstraint.h b/Pods/Headers/Public/OCMock/OCMConstraint.h
diff --git a/Pods/Headers/Public/OCMock/OCMFunctions.h b/Pods/Headers/Public/OCMock/OCMFunctions.h
diff --git a/Pods/Headers/Public/OCMock/OCMLocation.h b/Pods/Headers/Public/OCMock/OCMLocation.h
diff --git a/Pods/Headers/Public/OCMock/OCMMacroState.h b/Pods/Headers/Public/OCMock/OCMMacroState.h
diff --git a/Pods/Headers/Public/OCMock/OCMRecorder.h b/Pods/Headers/Public/OCMock/OCMRecorder.h
diff --git a/Pods/Headers/Public/OCMock/OCMStubRecorder.h b/Pods/Headers/Public/OCMock/OCMStubRecorder.h
diff --git a/Pods/Headers/Public/OCMock/OCMock.h b/Pods/Headers/Public/OCMock/OCMock.h
diff --git a/Pods/Headers/Public/OCMock/OCMockObject.h b/Pods/Headers/Public/OCMock/OCMockObject.h
diff --git a/Pods/JSQSystemSoundPlayer/JSQSystemSoundPlayer/Classes/JSQSystemSoundPlayer.h b/Pods/JSQSystemSoundPlayer/JSQSystemSoundPlayer/Classes/JSQSystemSoundPlayer.h
diff --git a/Pods/JSQSystemSoundPlayer/JSQSystemSoundPlayer/Classes/JSQSystemSoundPlayer.m b/Pods/JSQSystemSoundPlayer/JSQSystemSoundPlayer/Classes/JSQSystemSoundPlayer.m
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock