Merge pull request #8 from grigaci/features/warnings

Fix warnings
grigaci · Oct 19, 2015 · 85f6a0a · 85f6a0a
2 parents c80d90f + 1930d37
commit 85f6a0a
Show file tree

Hide file tree

Showing 198 changed files with 4,615 additions and 4,251 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,13 @@
 language: objective-c
 xcode_workspace: BIObjCHelpers.xcworkspace
-osx_image: beta-xcode6.3
+osx_image: xcode7
 
 before_install:
 - gem i cocoapods --no-ri --no-rdoc
 - gem i slather --no-ri --no-rdoc
 - brew uninstall xctool; brew install xctool --HEAD;
 
 script:
-- xctool test -workspace BIObjCHelpers.xcworkspace -scheme BIObjCHelpersTests -sdk iphonesimulator8.3 -destination "platform=iOS Simulator,name=iPhone 6,OS=8.3"
+- xctool test -workspace BIObjCHelpers.xcworkspace -scheme BIObjCHelpersTests -sdk iphonesimulator9.0 -destination "platform=iOS Simulator,name=iPhone 6,OS=9.0"
 
 after_success: slather
diff --git a/BIObjCHelpers.xcodeproj/project.pbxproj b/BIObjCHelpers.xcodeproj/project.pbxproj
@@ -868,7 +868,7 @@
 		43BE6C1D1B56882B001F0A00 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0640;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "iGama Apps";
 				TargetAttributes = {
 					43BE6C241B56882B001F0A00 = {
@@ -1072,10 +1072,11 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
-				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
+				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1089,7 +1090,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1119,15 +1120,15 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
-				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
+				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -1138,6 +1139,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7DC7BA7D38B46B467A3DCB83 /* Pods-BIObjCHelpersTests.debug.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1148,6 +1151,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 817E8A412EFC8949D37CE542 /* Pods.debug.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1159,16 +1164,14 @@
 			baseConfigurationReference = 7DC7BA7D38B46B467A3DCB83 /* Pods-BIObjCHelpersTests.debug.xcconfig */;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = BIObjCHelpersTests/SupportingFiles/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.igamaapps.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -1178,12 +1181,10 @@
 			baseConfigurationReference = B17EECE85027D221447B728D /* Pods-BIObjCHelpersTests.release.xcconfig */;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "";
 				INFOPLIST_FILE = BIObjCHelpersTests/SupportingFiles/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.igamaapps.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

diff --git a/BIObjCHelpers.xcodeproj/xcshareddata/xcschemes/BIObjCHelpers.xcscheme b/BIObjCHelpers.xcodeproj/xcshareddata/xcschemes/BIObjCHelpers.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0640"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -51,6 +51,14 @@
                BlueprintName = "BIObjCHelpersTests"
                ReferencedContainer = "container:BIObjCHelpers.xcodeproj">
             </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "BITableViewCellTestCase/testSnapshotViewSeparator375x44">
+               </Test>
+               <Test
+                  Identifier = "BITableViewCellTestCase/testSnapshotViewSeparatorCustomHeight375x44">
+               </Test>
+            </SkippedTests>
          </TestableReference>
       </Testables>
       <MacroExpansion>
@@ -62,15 +70,18 @@
             ReferencedContainer = "container:BIObjCHelpers.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -92,10 +103,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

diff --git a/BIObjCHelpers.xcodeproj/xcshareddata/xcschemes/BIObjCHelpersTests.xcscheme b/BIObjCHelpers.xcodeproj/xcshareddata/xcschemes/BIObjCHelpersTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0640"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -56,15 +56,18 @@
             ReferencedContainer = "container:BIObjCHelpers.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -86,10 +89,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

diff --git a/BIObjCHelpers/Batch/BIBatch.h b/BIObjCHelpers/Batch/BIBatch.h
@@ -14,6 +14,9 @@ typedef void(^BIBatchCompletionBlock)(NSError * __nullable error, NSArray * __nu
 
 @interface BIBatch : NSObject// __deprecated_msg("Use BIBatchRequest")
 
+- (nonnull instancetype)init NS_UNAVAILABLE;
++ (nonnull instancetype)new NS_UNAVAILABLE;
+
 /*!
  * @brief Designated initializer for a table view batch.
  * @param sectionIndex The index of the section where to fetch data.

diff --git a/BIObjCHelpers/Batch/BIBatchRequest.h b/BIObjCHelpers/Batch/BIBatchRequest.h
@@ -34,6 +34,9 @@ typedef NS_ENUM(NSUInteger, BIBatchInsertPosition) {
  */
 @interface BIBatchRequest : NSObject
 
+- (nonnull instancetype)init NS_UNAVAILABLE;
++ (nonnull instancetype)new NS_UNAVAILABLE;
+
 /*!
  * @brief Designated initializer for a table view batch.
  * @param sectionIndex The index of the section where to fetch data.

diff --git a/BIObjCHelpers/Views/TableView/ActivityIndicator/BIActivityIndicatorContainerView.h b/BIObjCHelpers/Views/TableView/ActivityIndicator/BIActivityIndicatorContainerView.h
@@ -10,8 +10,6 @@
 
 @interface BIActivityIndicatorContainerView : UIView
 
-- (nonnull instancetype)initWithFrame:(CGRect)frame NS_DESIGNATED_INITIALIZER;
-
 @property (nonatomic, strong, nonnull, readonly) UIActivityIndicatorView *activityIndicatorView;
 
 @end
diff --git a/BIObjCHelpers/Views/TableView/ActivityIndicator/BIActivityIndicatorContainerView.m b/BIObjCHelpers/Views/TableView/ActivityIndicator/BIActivityIndicatorContainerView.m
@@ -22,11 +22,21 @@ @implementation BIActivityIndicatorContainerView
 - (nonnull instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        [self addSubview:self.activityIndicatorView];
+        [self BI_commonSetup];
     }
     return self;
 }
 
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if (self) {
+        [self BI_commonSetup];
+    }
+    return self;
+}
+
+#pragma mark - UIView methods
+
 - (void)layoutSubviews {
     [super layoutSubviews];
     CGPoint center = CGPointMake(CGRectGetWidth(self.bounds) / 2.f, CGRectGetHeight(self.bounds) / 2.f);
@@ -50,4 +60,10 @@ - (UIActivityIndicatorView *)activityIndicatorView {
     return _activityIndicatorView;
 }
 
+#pragma mark - Private methods
+
+- (void)BI_commonSetup {
+    [self addSubview:self.activityIndicatorView];
+}
+
 @end
diff --git a/BIObjCHelpersTests/SupportingFiles/Info.plist b/BIObjCHelpersTests/SupportingFiles/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.igamaapps.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/...CHelpersTests/Tests/Datasource/CollectionView/BIDatasourceFetchedCollectionViewTestCase.m b/...CHelpersTests/Tests/Datasource/CollectionView/BIDatasourceFetchedCollectionViewTestCase.m
@@ -12,6 +12,12 @@
 
 #import "BIDatasourceFetchedCollectionView.h"
 
+#define HC_SHORTHAND
+#import <OCHamcrest/OCHamcrest.h>
+
+#define MOCKITO_SHORTHAND
+#import <OCMockito/OCMockito.h>
+
 @interface BIDatasourceFetchedCollectionViewTestCase : BITestCaseCoreData
 
 @property (nonatomic, strong) BIDatasourceFetchedCollectionView *datasource;
@@ -87,7 +93,8 @@ - (void)testAddSection {
         testSections = sections;
     };
 
-    [self.datasource controller:fetchedResults didChangeSection:nil atIndex:sectionIndexToInsert forChangeType:NSFetchedResultsChangeInsert];
+    id <NSFetchedResultsSectionInfo> sectionInfo = mockProtocol(@protocol(NSFetchedResultsSectionInfo));
+    [self.datasource controller:fetchedResults didChangeSection:sectionInfo atIndex:sectionIndexToInsert forChangeType:NSFetchedResultsChangeInsert];
     [self.datasource controllerDidChangeContent:fetchedResults];
 
     XCTAssert([testSections isEqualToIndexSet:sectionIndexSetToInsert]);
@@ -104,7 +111,8 @@ - (void)testDeleteSection {
         testSections = sections;
     };
 
-    [self.datasource controller:fetchedResults didChangeSection:nil atIndex:sectionIndexToDeleted forChangeType:NSFetchedResultsChangeDelete];
+    id <NSFetchedResultsSectionInfo> sectionInfo = mockProtocol(@protocol(NSFetchedResultsSectionInfo));
+    [self.datasource controller:fetchedResults didChangeSection:sectionInfo atIndex:sectionIndexToDeleted forChangeType:NSFetchedResultsChangeDelete];
     [self.datasource controllerDidChangeContent:fetchedResults];
 
     XCTAssert([testSections isEqualToIndexSet:sectionIndexSetToDelete]);
@@ -128,7 +136,8 @@ - (void)testAddItems {
         wasReloaded = YES;
     };
 
-    [self.datasource controller:fetchedResults didChangeObject:nil atIndexPath:nil forChangeType:NSFetchedResultsChangeInsert newIndexPath:indexPath];
+    id <NSFetchedResultsSectionInfo> sectionInfo = mockProtocol(@protocol(NSFetchedResultsSectionInfo));
+    [self.datasource controller:fetchedResults didChangeObject:sectionInfo atIndexPath:nil forChangeType:NSFetchedResultsChangeInsert newIndexPath:indexPath];
     [self.datasource controllerDidChangeContent:fetchedResults];
 
     if (!wasReloaded) {
@@ -156,7 +165,8 @@ - (void)testDeleteItems {
         wasReloaded = YES;
     };
 
-    [self.datasource controller:fetchedResults didChangeObject:nil atIndexPath:indexPath forChangeType:NSFetchedResultsChangeDelete newIndexPath:nil];
+    id <NSFetchedResultsSectionInfo> sectionInfo = mockProtocol(@protocol(NSFetchedResultsSectionInfo));
+    [self.datasource controller:fetchedResults didChangeObject:sectionInfo atIndexPath:indexPath forChangeType:NSFetchedResultsChangeDelete newIndexPath:nil];
     [self.datasource controllerDidChangeContent:fetchedResults];
 
     if (!wasReloaded) {
@@ -184,7 +194,8 @@ - (void)testUpdateItems {
         wasReloaded = YES;
     };
 
-    [self.datasource controller:fetchedResults didChangeObject:nil atIndexPath:indexPath forChangeType:NSFetchedResultsChangeUpdate newIndexPath:nil];
+    id <NSFetchedResultsSectionInfo> sectionInfo = mockProtocol(@protocol(NSFetchedResultsSectionInfo));
+    [self.datasource controller:fetchedResults didChangeObject:sectionInfo atIndexPath:indexPath forChangeType:NSFetchedResultsChangeUpdate newIndexPath:nil];
     [self.datasource controllerDidChangeContent:fetchedResults];
 
     if (!wasReloaded) {
@@ -215,7 +226,8 @@ - (void)testMoveItems {
         wasReloaded = YES;
     };
 
-    [self.datasource controller:fetchedResults didChangeObject:nil atIndexPath:from forChangeType:NSFetchedResultsChangeMove newIndexPath:to];
+    id <NSFetchedResultsSectionInfo> sectionInfo = mockProtocol(@protocol(NSFetchedResultsSectionInfo));
+    [self.datasource controller:fetchedResults didChangeObject:sectionInfo atIndexPath:from forChangeType:NSFetchedResultsChangeMove newIndexPath:to];
     [self.datasource controllerDidChangeContent:fetchedResults];
 
     if (!wasReloaded) {