Fix #41 unable to integrate test target

RZBluetooth.podspec

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 Pod::Spec.new do |s|
   s.name         = "RZBluetooth"
-  s.version      = "1.2.1"
+  s.version      = "1.2.2"
   s.summary      = "A Core Bluetooth helper library to simplify the development and testing of Core Bluetooth applications."
 
   s.description  = <<-DESC
@@ -35,12 +35,4 @@ RZBluetooth is a Core Bluetooth helper with 3 primary goals:
     mock.private_header_files = "RZMockBluetooth/**/*+Private.h"
   end
 
-  s.subspec "Test" do |test|
-    test.dependency "RZBluetooth/Mock"
-    test.frameworks = "XCTest"
-    test.source_files = "RZBluetoothTests/RZBTestDefines.h",
-                        "RZBluetoothTests/RZBSimulatedTestCase.{h,m}",
-                        "RZBluetoothTests/Helpers/NSRunLoop+RZBWaitFor.{h,m}"
-    test.public_header_files = "RZBluetoothTests/RZBSimulatedTestCase.h", "RZBluetoothTests/RZBTestDefines.h"
-  end
 end

RZBluetooth.xcodeproj/xcshareddata/xcschemes/RZBluetooth.xcscheme

@@ -20,28 +20,14 @@
                ReferencedContainer = "container:RZBluetooth.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AB45C4A31B6BF70B00CC0166"
-               BuildableName = "RZBluetoothTests.xctest"
-               BlueprintName = "RZBluetoothTests"
-               ReferencedContainer = "container:RZBluetooth.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

RZBluetoothTest.podspec

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+Pod::Spec.new do |s|
+  s.name         = "RZBluetoothTest"
+  s.version      = "1.2.2"
+  s.summary      = "A Core Bluetooth helper library to simplify the development and testing of Core Bluetooth applications."
+
+  s.description  = <<-DESC
+RZBluetooth is a Core Bluetooth helper with 3 primary goals:
+
+- Simplify the delegate callbacks and encourage best practices
+- Provide a pattern for Profile level APIs, with support for public profiles
+- Simplify and encourage testing - including unit tests, automated integration tests, and manual tests.
+                   DESC
+
+  s.homepage     = "http://github.com/Raizlabs/RZBluetooth"
+  s.license      = { :type => "MIT", :file => "LICENSE" }
+  s.author       = { "Brian King" => "[email protected]" }
+  s.osx.deployment_target = "10.10"
+  s.ios.deployment_target = "8.0"
+  s.source       = { :git => "https://github.com/Raizlabs/RZBluetooth.git", :tag => s.version }
+  s.requires_arc = true
+
+  s.dependency "RZBluetooth/Mock"
+  s.frameworks = "XCTest"
+  s.source_files = "RZBluetoothTests/RZBTestDefines.h",
+                        "RZBluetoothTests/RZBSimulatedTestCase.{h,m}",
+                        "RZBluetoothTests/Helpers/NSRunLoop+RZBWaitFor.{h,m}"
+  s.public_header_files = "RZBluetoothTests/RZBSimulatedTestCase.h", "RZBluetoothTests/RZBTestDefines.h"
+
+end

RZBluetoothTests/RZBPeripheralManagerTests.m

@@ -7,10 +7,6 @@
 //
 
 #import "RZBSimulatedTestCase.h"
-#import "RZBPeripheral+RZBBattery.h"
-#import "RZBSimulatedDevice+RZBBatteryLevel.h"
-#import "CBUUID+RZBPublic.h"
-#import "XCTestCase+Helpers.h"
 
 @interface RZBPeripheralManagerTests : RZBSimulatedTestCase
 

RZBluetoothTests/RZBProfileBatteryTests.m

@@ -7,10 +7,6 @@
 //
 
 #import "RZBSimulatedTestCase.h"
-#import "RZBPeripheral+RZBBattery.h"
-#import "RZBSimulatedDevice+RZBBatteryLevel.h"
-#import "CBUUID+RZBPublic.h"
-#import "RZBLog.h"
 
 @interface RZBProfileBatteryTests : RZBSimulatedTestCase
 

RZBluetoothTests/RZBProfileDeviceInfoTests.m

@@ -7,7 +7,6 @@
 //
 
 #import "RZBSimulatedTestCase.h"
-#import "RZBDeviceInfo.h"
 
 @interface RZBProfileDeviceInfoTests : RZBSimulatedTestCase
 @property (strong, nonatomic) RZBDeviceInfo *deviceInfo;

RZBluetoothTests/RZBSimulatedTestCase.h

@@ -1,5 +1,5 @@
 //
-//  RZBProfileTestCase.h
+//  RZBSimulatedTestCase.h
 //  RZBluetooth
 //
 //  Created by Brian King on 8/4/15.
@@ -8,19 +8,8 @@
 
 @import XCTest;
 
-#import "RZBCentralManager.h"
-#import "RZBPeripheral.h"
-#import "RZBScanInfo.h"
-
-#import "RZBMockCentralManager.h"
-#import "RZBMockPeripheralManager.h"
-
-#import "RZBSimulatedDevice.h"
-#import "RZBSimulatedCentral.h"
-#import "RZBSimulatedConnection.h"
-#import "RZBSimulatedCallback.h"
-
-#import "NSError+RZBMock.h"
+#import "RZBluetooth/RZBluetooth.h"
+#import "RZBluetooth/RZMockBluetooth.h"
 
 /**
  *  The RZBSimulatedTestCase is a convience class to assist testing bluetooth code.

RZBluetoothTests/RZBSimulatedTestCase.m

@@ -7,11 +7,10 @@
 //
 
 #import "RZBTestDefines.h"
-#import "RZMockBluetooth.h"
+#import "RZBluetooth/RZMockBluetooth.h"
 #import "RZBSimulatedTestCase.h"
 #import "NSRunLoop+RZBWaitFor.h"
-#import "RZBCentralManager+Private.h"
-#import "RZBLog.h"
+#import "RZBluetooth/RZBCentralManager+Private.h"
 
 @implementation RZBSimulatedTestCase
 

RZBluetoothTests/RZBSimulatedTests.m

@@ -7,9 +7,6 @@
 //
 
 #import "RZBSimulatedTestCase.h"
-#import "RZBPeripheral+RZBBattery.h"
-#import "RZBSimulatedDevice+RZBBatteryLevel.h"
-#import "CBUUID+RZBPublic.h"
 
 @interface RZBSimulatedTests : RZBSimulatedTestCase <RZBPeripheralConnectionDelegate>
 

RZBluetoothTests/RZBUserInteractionTests.m

@@ -7,10 +7,6 @@
 //
 
 #import "RZBSimulatedTestCase.h"
-#import "RZBPeripheral+RZBBattery.h"
-#import "RZBUserInteraction.h"
-#import "RZBSimulatedDevice+RZBBatteryLevel.h"
-#import "RZBErrors.h"
 #import "RZBTestDefines.h"
 
 static const NSTimeInterval DelayCausingTimeout = 1.0;

RZBluetoothTests/RZBluetoothTests-Bridging-Header.h

@@ -2,6 +2,4 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "RZBluetooth.h"
-#import "RZMockBluetooth.h"
-#import "RZBSimulatedTestCase.h"
+#import "RZBSimulatedTestCase.h"

RZMockBluetooth/RZMockBluetooth.h

@@ -19,3 +19,5 @@
 #import "RZBSimulatedConnection.h"
 #import "RZBSimulatedCallback.h"
 #import "NSError+RZBMock.h"
+
+#import "RZBSimulatedDevice+RZBBatteryLevel.h"

RZMockBluetooth/Simulation/RZBSimulatedCallback.m

@@ -113,6 +113,11 @@ - (void)cancel
 {
     @synchronized(self) {
         for (dispatch_source_t timer in self.timers) {
+            // In Xcode 9+, you can not cancel an inactive / suspended timer.
+            // So if the callback is paused, resume it before canceling
+            if (self.paused) {
+                dispatch_resume(timer);
+            }
             dispatch_cancel(timer);
         }
         [self.timers removeAllObjects];