From 6fd71650e5306e9dc92f8d475b1f98b7f8cab440 Mon Sep 17 00:00:00 2001
From: Blake Watters <blakewatters@gmail.com>
Date: Wed, 4 Apr 2012 12:19:24 -0400
Subject: [PATCH] Fix broken unit tests related to Core Data cache skipping
 optimization

---
 .../CoreData/RKManagedObjectLoaderTest.m      |  4 +--
 Tests/RunPlatformUnitTests                    |  8 ++++--
 Tests/Server/lib/restkit/coredata/cache.rb    | 18 -------------
 Tests/Server/server.rb                        | 25 +++++++++++++------
 4 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 100644 Tests/Server/lib/restkit/coredata/cache.rb

diff --git a/Tests/Logic/CoreData/RKManagedObjectLoaderTest.m b/Tests/Logic/CoreData/RKManagedObjectLoaderTest.m
index 891445b7f1..98f60669c7 100644
--- a/Tests/Logic/CoreData/RKManagedObjectLoaderTest.m
+++ b/Tests/Logic/CoreData/RKManagedObjectLoaderTest.m
@@ -176,7 +176,7 @@ - (void)testShouldSkipObjectMappingOnRequestCacheHitWhenObjectCachePresent {
         [mockLoader send];
         [responseLoader waitForResponse];
 
-        [mockLoader verify];
+        STAssertNoThrow([mockLoader verify], nil);
         assertThatInteger([RKHuman count:nil], is(equalToInteger(2)));
         assertThatBool([responseLoader wasSuccessful], is(equalToBool(YES)));
         assertThatBool([responseLoader.response wasLoadedFromCache], is(equalToBool(NO)));
@@ -192,7 +192,7 @@ - (void)testShouldSkipObjectMappingOnRequestCacheHitWhenObjectCachePresent {
         [mockLoader send];
         [responseLoader waitForResponse];
 
-        [mockLoader verify];
+        STAssertNoThrow([mockLoader verify], nil);
         assertThatInteger([RKHuman count:nil], is(equalToInteger(2)));
         assertThatBool([responseLoader wasSuccessful], is(equalToBool(YES)));
         assertThatBool([responseLoader.response wasLoadedFromCache], is(equalToBool(YES)));
diff --git a/Tests/RunPlatformUnitTests b/Tests/RunPlatformUnitTests
index 853ecb4cd6..813da592e1 100755
--- a/Tests/RunPlatformUnitTests
+++ b/Tests/RunPlatformUnitTests
@@ -92,8 +92,12 @@ Main() {
     
     if [ "${TEST_HOST}" != "" ]; then
 
-        #Warning ${LINENO} "Skipping tests; the iPhoneSimulator platform does not currently support application-hosted tests (TEST_HOST set)."
-        export OTHER_TEST_FLAGS="-RegisterForSystemEvents"
+        export CFFIXED_USER_HOME="${BUILT_PRODUCTS_DIR}/UserHome/"
+        mkdir -p "${CFFIXED_USER_HOME}"
+        mkdir -p "${CFFIXED_USER_HOME}/Library/Caches"
+        mkdir "${CFFIXED_USER_HOME}/Library/Preferences"
+        mkdir "${CFFIXED_USER_HOME}/Documents"
+        export OTHER_TEST_FLAGS="${OTHER_TEST_FLAGS} -RegisterForSystemEvents"
         RunTestsForApplication "${TEST_HOST}" "${TEST_BUNDLE_PATH}"
         
     else
diff --git a/Tests/Server/lib/restkit/coredata/cache.rb b/Tests/Server/lib/restkit/coredata/cache.rb
deleted file mode 100644
index 9f61cb33e8..0000000000
--- a/Tests/Server/lib/restkit/coredata/cache.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module RestKit
-  module CoreData
-    class Cache < Sinatra::Base
-
-      get '/coredata/etag' do
-        tag = '2cdd0a2b329541d81e82ab20aff6281b'
-        if tag == request.env["HTTP_IF_NONE_MATCH"]
-          status 304
-          ""
-        else
-          etag(tag)
-          content_type 'application/json'
-          send_file 'Tests/Server/../Fixtures/JSON/humans/all.json'
-        end
-      end
-    end
-  end
-end
diff --git a/Tests/Server/server.rb b/Tests/Server/server.rb
index 9edd029ea9..cb8a61c3c4 100644
--- a/Tests/Server/server.rb
+++ b/Tests/Server/server.rb
@@ -18,7 +18,6 @@
 require 'restkit/network/etags'
 require 'restkit/network/timeout'
 require 'restkit/network/oauth2'
-require 'restkit/coredata/cache'
 
 class Person < Struct.new(:name, :age)
   def to_json(*args)
@@ -27,18 +26,18 @@ def to_json(*args)
 end
 
 class RestKitTestServer < Sinatra::Base
-  self.app_file = __FILE__
-  use RestKit::Network::Authentication
-  use RestKit::Network::ETags
-  use RestKit::Network::Timeout
-  use RestKit::Network::OAuth2
-  use RestKit::CoreData::Cache
+  self.app_file = __FILE__  
 
   configure do
     enable :logging, :dump_errors
     set :public_folder, Proc.new { File.expand_path(File.join(root, '../Fixtures')) }
     set :uploads_path, Proc.new { File.expand_path(File.join(root, '../Fixtures/Uploads')) }
   end
+  
+  use RestKit::Network::Authentication
+  use RestKit::Network::ETags
+  use RestKit::Network::Timeout
+  use RestKit::Network::OAuth2
 
   def render_fixture(path, options = {})
     send_file File.join(settings.public_folder, path), options
@@ -234,6 +233,18 @@ def render_fixture(path, options = {})
     {:per_page => per_page, :total_entries => total_entries,
      :current_page => current_page, :entries => entries}.to_json
   end
+  
+  get '/coredata/etag' do
+    content_type 'application/json'
+    tag = '2cdd0a2b329541d81e82ab20aff6281b'
+    if tag == request.env["HTTP_IF_NONE_MATCH"]
+      status 304
+      ""
+    else
+      etag(tag)
+      render_fixture '/JSON/humans/all.json'
+    end
+  end
 
   # start the server if ruby file executed directly
   run! if app_file == $0