diff options
| author | Matthew Williams <mjwilliams@google.com> | 2014-03-25 09:57:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 09:57:36 +0000 |
| commit | c798e4f5497c39a3c6c14b120cffdee1122a9212 (patch) | |
| tree | 929194e78eec01b7913b05aba4a50a9d81974472 /services/tests/servicestests | |
| parent | e9b50e75a050e75161aa316b0c73bdab500ca14d (diff) | |
| parent | 4701b51af216ce2b6fa9fa508ebba47bf13063c7 (diff) | |
| download | frameworks_base-c798e4f5497c39a3c6c14b120cffdee1122a9212.zip frameworks_base-c798e4f5497c39a3c6c14b120cffdee1122a9212.tar.gz frameworks_base-c798e4f5497c39a3c6c14b120cffdee1122a9212.tar.bz2 | |
am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '4701b51af216ce2b6fa9fa508ebba47bf13063c7':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Diffstat (limited to 'services/tests/servicestests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java b/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java index 37176d6..910b685 100644 --- a/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java +++ b/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java @@ -136,10 +136,11 @@ public class SyncOperationTest extends AndroidTestCase { "authority1", b1, soon + 100, soonFlex + 100, unimportant, unimportant, true); assertTrue(op1.compareTo(op2) == -1); - assertTrue("less than not transitive.", op2.compareTo(op1) == 1); - assertTrue(op1.compareTo(op3) == 1); - assertTrue("greater than not transitive. ", op3.compareTo(op1) == -1); - assertTrue("overlapping intervals not the same.", op1.compareTo(op4) == 0); - assertTrue("equality not transitive.", op4.compareTo(op1) == 0); + assertTrue("Less than not transitive.", op2.compareTo(op1) == 1); + assertEquals("Expedited not smaller than non-expedited.", -1, op1.compareTo(op3)); + assertEquals("Greater than not transitive for expedited. ", 1, op3.compareTo(op1)); + assertTrue("overlapping intervals not compared based on start interval.", + op1.compareTo(op4) == -1); + assertTrue("overlapping interval comparison not transitive.", op4.compareTo(op1) == 1); } } |