Merge of stephanenicolas#185

CHANGELOG.md

@@ -13,6 +13,7 @@ Version 1.4.7 (Planned on July 30th 2013)
 
 ** Bug fixes
 * Documentation has been updated in RS Starter Guide thanks to Mathieu Castets.
+* removeDataFromCache now returns a future for possible sync. Thanks to sergej-koscejev for the fix in pull request https://github.com/octo-online/robospice/pull/185
 
 
 

robospice-core-parent/robospice-core-test/src/main/java/com/octo/android/robospice/SpiceManagerTest.java

@@ -432,7 +432,7 @@ public void test_spiceManager_can_be_stopped_and_restarted() throws InterruptedE
 
         // given
         spiceManager.start(getInstrumentation().getTargetContext());
-        spiceManager.shouldStop();
+        spiceManager.shouldStopAndJoin(SPICE_MANAGER_WAIT_TIMEOUT);
 
         spiceManager.start(getInstrumentation().getTargetContext());
         SpiceRequestStub<String> spiceRequestStub = new SpiceRequestFailingStub<String>(TEST_CLASS, WAIT_BEFORE_EXECUTING_REQUEST_LARGE);

robospice-core-parent/robospice/src/main/java/com/octo/android/robospice/SpiceManager.java

@@ -913,12 +913,12 @@ public Future<Date> getDateOfDataInCache(Class<?> clazz, final Object cacheKey)
      * @param cacheKey
      *            the key of the object in cache
      */
-    public <T> void removeDataFromCache(final Class<T> clazz, final Object cacheKey) {
+    public <T> Future<?> removeDataFromCache(final Class<T> clazz, final Object cacheKey) {
         if (clazz == null || cacheKey == null) {
             throw new IllegalArgumentException("Both parameters must be non null.");
         }
 
-        executeCommand(new RemoveDataFromCacheCommand(this, clazz, cacheKey));
+        return executeCommand(new RemoveDataFromCacheCommand(this, clazz, cacheKey));
     }
 
     /**