Create exchange2; restore ICS sources to exchange

Change-Id: I076ad6c1e24ed071fe2d2867ca0fe3fbaff5a95f

3 files changed, 43 insertions, 80 deletions

diff --git a/tests/src/com/android/exchange/EasAccountServiceTests.java b/tests/src/com/android/exchange/EasAccountServiceTests.java
deleted file mode 100644
index eafd0f99..00000000
--- a/tests/src/com/android/exchange/EasAccountServiceTests.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.content.Context;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.EasAccountServiceTests exchange
- */
-@SmallTest
-public class EasAccountServiceTests extends AndroidTestCase {
-
-    Context mMockContext;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mMockContext = getContext();
-    }
-
-    public void testResetHeartbeats() {
-        EasAccountService svc = new EasAccountService();
-        // Test case in which the minimum and force heartbeats need to come up
-        svc.mPingMaxHeartbeat = 1000;
-        svc.mPingMinHeartbeat = 200;
-        svc.mPingHeartbeat = 300;
-        svc.mPingForceHeartbeat = 100;
-        svc.mPingHeartbeatDropped = true;
-        svc.resetHeartbeats(400);
-        assertEquals(400, svc.mPingMinHeartbeat);
-        assertEquals(1000, svc.mPingMaxHeartbeat);
-        assertEquals(400, svc.mPingHeartbeat);
-        assertEquals(400, svc.mPingForceHeartbeat);
-        assertFalse(svc.mPingHeartbeatDropped);
-
-        // Test case in which the force heartbeat needs to come up
-        svc.mPingMaxHeartbeat = 1000;
-        svc.mPingMinHeartbeat = 200;
-        svc.mPingHeartbeat = 100;
-        svc.mPingForceHeartbeat = 100;
-        svc.mPingHeartbeatDropped = true;
-        svc.resetHeartbeats(150);
-        assertEquals(200, svc.mPingMinHeartbeat);
-        assertEquals(1000, svc.mPingMaxHeartbeat);
-        assertEquals(150, svc.mPingHeartbeat);
-        assertEquals(150, svc.mPingForceHeartbeat);
-        assertFalse(svc.mPingHeartbeatDropped);
-
-        // Test case in which the maximum needs to come down
-        svc.mPingMaxHeartbeat = 1000;
-        svc.mPingMinHeartbeat = 200;
-        svc.mPingHeartbeat = 800;
-        svc.mPingForceHeartbeat = 100;
-        svc.mPingHeartbeatDropped = true;
-        svc.resetHeartbeats(600);
-        assertEquals(200, svc.mPingMinHeartbeat);
-        assertEquals(600, svc.mPingMaxHeartbeat);
-        assertEquals(600, svc.mPingHeartbeat);
-        assertEquals(100, svc.mPingForceHeartbeat);
-        assertFalse(svc.mPingHeartbeatDropped);
-    }
-}
diff --git a/tests/src/com/android/exchange/EasSyncServiceTests.java b/tests/src/com/android/exchange/EasSyncServiceTests.java
index 150b1f1b..54d76b36 100644
--- a/tests/src/com/android/exchange/EasSyncServiceTests.java
+++ b/tests/src/com/android/exchange/EasSyncServiceTests.java
@@ -128,4 +128,46 @@ public class EasSyncServiceTests extends AndroidTestCase {
         assertEquals("https://" + HOST + "/Microsoft-Server-ActiveSync?Cmd=Sync" +
                 svc.mUserString, uriString);
     }
+
+    public void testResetHeartbeats() {
+        EasSyncService svc = new EasSyncService();
+        // Test case in which the minimum and force heartbeats need to come up
+        svc.mPingMaxHeartbeat = 1000;
+        svc.mPingMinHeartbeat = 200;
+        svc.mPingHeartbeat = 300;
+        svc.mPingForceHeartbeat = 100;
+        svc.mPingHeartbeatDropped = true;
+        svc.resetHeartbeats(400);
+        assertEquals(400, svc.mPingMinHeartbeat);
+        assertEquals(1000, svc.mPingMaxHeartbeat);
+        assertEquals(400, svc.mPingHeartbeat);
+        assertEquals(400, svc.mPingForceHeartbeat);
+        assertFalse(svc.mPingHeartbeatDropped);
+
+        // Test case in which the force heartbeat needs to come up
+        svc.mPingMaxHeartbeat = 1000;
+        svc.mPingMinHeartbeat = 200;
+        svc.mPingHeartbeat = 100;
+        svc.mPingForceHeartbeat = 100;
+        svc.mPingHeartbeatDropped = true;
+        svc.resetHeartbeats(150);
+        assertEquals(200, svc.mPingMinHeartbeat);
+        assertEquals(1000, svc.mPingMaxHeartbeat);
+        assertEquals(150, svc.mPingHeartbeat);
+        assertEquals(150, svc.mPingForceHeartbeat);
+        assertFalse(svc.mPingHeartbeatDropped);
+
+        // Test case in which the maximum needs to come down
+        svc.mPingMaxHeartbeat = 1000;
+        svc.mPingMinHeartbeat = 200;
+        svc.mPingHeartbeat = 800;
+        svc.mPingForceHeartbeat = 100;
+        svc.mPingHeartbeatDropped = true;
+        svc.resetHeartbeats(600);
+        assertEquals(200, svc.mPingMinHeartbeat);
+        assertEquals(600, svc.mPingMaxHeartbeat);
+        assertEquals(600, svc.mPingHeartbeat);
+        assertEquals(100, svc.mPingForceHeartbeat);
+        assertFalse(svc.mPingHeartbeatDropped);
+    }
 }
diff --git a/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java b/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
index a7425d74..57b5fb9c 100644
--- a/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
+++ b/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
@@ -201,7 +201,7 @@ public class MailboxUtilitiesTests extends ExchangeTestCase {
                 "box3", mAccount.mId, false, mProviderContext, Mailbox.TYPE_MAIL, box2);
         box3.mParentKey = Mailbox.PARENT_KEY_UNINITIALIZED;
         box3.save(mProviderContext);
-        simulateFolderSyncChangeHandling(accountSelector, box3 /*box3's parent*/);
+        simulateFolderSyncChangeHandling(accountSelector, box2 /*box3's parent*/);
 
         box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
         box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);