Migrate unit testing infrastructure from xcoder to xctool. Add Travis CI integration

Author: blakewatters

.travis.yml

@@ -0,0 +1,6 @@
+language: objective-c
+before_install:
+    - brew update
+    - brew install xctool --HEAD
+    - bundle update
+script: "./Tests/cibuild"

.xctool-args

@@ -0,0 +1,5 @@
+[
+  "-workspace", "RestKit.xcworkspace",
+  "-scheme", "RestKit",
+  "-configuration", "Debug"
+]

Gemfile

@@ -4,7 +4,6 @@ gem "rake", "~> 10.0.0"
 gem "bundler", "~> 1.3.0"
 gem "sinatra", :git => "git://github.com/sinatra/sinatra.git"
 gem "thin", "~> 1.5.0"
-gem 'xcoder', :git => "git://github.com/rayh/xcoder.git"
 gem 'restkit', :git => 'git://github.com/RestKit/RestKit-Gem.git'
 gem 'debugger', '~> 1.3.0'
 gem 'cocoapods', '0.19.1'

Gemfile.lock

@@ -4,19 +4,6 @@ GIT
   specs:
     restkit (0.0.0)
 
-GIT
-  remote: git://github.com/rayh/xcoder.git
-  revision: 2560155d7c817c2e2801e6fb8b75e6453a3e7106
-  specs:
-    xcoder (0.1.17)
-      aws-sdk
-      builder
-      colorize
-      multi_json
-      nokogiri
-      plist
-      rest-client
-
 GIT
   remote: git://github.com/sinatra/sinatra.git
   revision: 54d6ba06cc76b3ddcadbb8ccfe090f134364fca3
@@ -33,11 +20,6 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     addressable (2.3.3)
-    aws-sdk (1.8.5)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
-    builder (3.2.0)
     claide (0.2.0)
     cocoapods (0.19.1)
       activesupport (~> 3.2.13)
@@ -57,7 +39,6 @@ GEM
       rake (~> 10.0.0)
     cocoapods-downloader (0.1.0)
     colored (1.2)
-    colorize (0.5.8)
     columnize (0.3.6)
     daemons (1.1.9)
     debugger (1.3.3)
@@ -76,11 +57,9 @@ GEM
     hashie (1.2.0)
     i18n (0.6.1)
     json (1.7.7)
-    mime-types (1.21)
     multi_json (1.6.1)
     multipart-post (1.2.0)
     netrc (0.7.7)
-    nokogiri (1.5.6)
     octokit (1.23.0)
       addressable (~> 2.2)
       faraday (~> 0.8)
@@ -89,19 +68,15 @@ GEM
       multi_json (~> 1.3)
       netrc (~> 0.7.7)
     open4 (1.3.0)
-    plist (3.1.0)
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
     rake (10.0.3)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.5)
-    uuidtools (2.1.3)
     xcodeproj (0.5.5)
       activesupport (~> 3.2.13)
       colored (~> 1.2)
@@ -117,4 +92,3 @@ DEPENDENCIES
   restkit!
   sinatra!
   thin (~> 1.5.0)
-  xcoder!

Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'xcoder'
 require 'restkit/rake'
 require 'debugger'
 
@@ -16,37 +15,24 @@ RestKit::Rake::ServerTask.new do |t|
 end
 
 namespace :test do
-  namespace :logic do
-    desc "Run the logic tests for iOS"
-    task :ios do
-      config = Xcode.workspace(:RestKit).scheme(:RestKitTests)
-      builder = config.builder
-      build_dir = File.dirname(config.parent.workspace_root) + '/Build'
-      builder.symroot = build_dir + '/Products'
-      builder.objroot = build_dir
-      builder.test(:sdk => 'iphonesimulator')
-    end
-    
-    desc "Run the logic tests for OS X"
-    task :osx do
-      config = Xcode.workspace(:RestKit).scheme(:RestKitFrameworkTests)
-      builder = config.builder
-      build_dir = File.dirname(config.parent.workspace_root) + '/Build'
-      builder.symroot = build_dir + '/Products'
-      builder.objroot = build_dir
-    	builder.test(:sdk => 'macosx')
-    end
-  end    
+  desc "Run the unit tests for iOS"
+  task :ios do
+    system("xctool -scheme RestKit test -test-sdk iphonesimulator")
+    $ios_return_value = $?
+  end
 
-  desc "Run the unit tests for iOS and OS X"
-  task :logic => ['logic:ios', 'logic:osx']
+  desc "Run the unit tests for OS X"
+  task :osx do
+    system("xctool -scheme RestKitFramework test -test-sdk macosx -sdk macosx")
+    $osx_return_value = $?
+  end
 
-  desc "Run all tests for iOS and OS X"
   task :all do
-    Rake.application.invoke_task("test:logic")
-    unit_status = $?.exitstatus
-    puts "\033[0;31m!! Unit Tests failed with exit status of #{unit_status}" if unit_status != 0
-    puts "\033[0;32m** All Tests executed successfully" if unit_status == 0 #&& integration_status == 0
+    Rake.application.invoke_task("test:ios")
+    Rake.application.invoke_task("test:osx")
+    puts "\033[0;31m!! iOS unit tests failed" unless $ios_return_value.success?
+    puts "\033[0;31m!! OS X unit tests failed" unless $osx_return_value.success?
+    puts "\033[0;32m** All tests executed successfully" if $ios_return_value.success? && $osx_return_value.success?
   end
 end
 

RestKit.xcworkspace/xcshareddata/xcschemes/RestKitFrameworkTests.xcscheme

@@ -527,7 +527,7 @@ - (void)testInvocationOfFailureBlock
 
     [requestOperation start];
     expect([requestOperation isFinished]).will.beTruthy();
-    expect(blockError).notTo.beNil();
+    expect(blockError).willNot.beNil();
 }
 
 #pragma mark - Will Map Data Block

RestKit.xcworkspace/xcshareddata/xcschemes/RestKitTests.xcscheme

@@ -2,7 +2,7 @@
 
 # Configure RVM
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-source .rvmrc
+rvm rvmrc load
 
 # Git submodules
 git submodule update --init