commit 71a2924928d9e35a5d2d03239ba33d40d8bc4e90
author Mark Lindner <mlindner@google.com> Thu Jun 02 18:21:27 2011 -0700
committer Brian Muramatsu <btmura@google.com> Thu Dec 15 17:43:20 2011 -0800
tree 657b4078db32a4759348677beb602641da67ad19
parent 63a917bdcde962862b5471939e5397ac3636d46e

Fixed bugs in test case that caused test failure.

- reversed logic in setNewLatch() was nulling out mLatch in MockSyncAdapter
immediately after setting it, so the latch never signalled.
- tests that initiated a sync weren't cleaning up after themselves, leading
to leftover state that affected subsequent tests

b/4479894

TESTED = runs on m4 without test failures

Change-Id: I038aba89a5c7a944a90ef8b6fba07fd4630d7906

tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java

diff --git a/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java b/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java
index 1cc4cfb..2da0bfb 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java
@@ -57,6 +57,9 @@
         // Need to clean up created account
         removeAccount(sAccountManager, ACCOUNT, null /* callback */);
 
+        // Need to cancel any sync that was started.
+        cancelSync(null, AUTHORITY, LATCH_TIMEOUT_MS);
+
         super.tearDown();
     }
 
@@ -87,8 +90,8 @@
     }
 
     private CountDownLatch setNewLatch(CountDownLatch latch) {
-        getMockSyncAdapter().setLatch(latch);
         getMockSyncAdapter().clearData();
+        getMockSyncAdapter().setLatch(latch);
         return latch;
     }
 
@@ -101,7 +104,9 @@
 
         // Wait with timeout for the callback to do its work
         try {
-            latch.await(latchTimeoutMs, TimeUnit.MILLISECONDS);
+            if (!latch.await(latchTimeoutMs, TimeUnit.MILLISECONDS)) {
+                fail("should not time out waiting on latch");
+            }
         } catch (InterruptedException e) {
             fail("should not throw an InterruptedException");
         }