Revert "Don't send device info in OPTIONS command"

This reverts commit e9353616056991511d4c3a707e97ca0468c0ef42.

1 files changed, 11 insertions, 11 deletions

diff --git a/tests/src/com/android/exchange/EasSyncServiceTests.java b/tests/src/com/android/exchange/EasSyncServiceTests.java
index d1a5b1e6..8b0b4101 100644
--- a/tests/src/com/android/exchange/EasSyncServiceTests.java
+++ b/tests/src/com/android/exchange/EasSyncServiceTests.java
@@ -17,17 +17,17 @@
 
 package com.android.exchange;
 
-import android.content.Context;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Base64;
-
 import com.android.emailcommon.provider.Account;
 
 import org.apache.http.Header;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpRequestBase;
 
+import android.content.Context;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Base64;
+
 import java.io.IOException;
 
 /**
@@ -109,13 +109,13 @@ public class EasSyncServiceTests extends AndroidTestCase {
         String uriString = svc.makeUriString("OPTIONS", null);
         // These next two should now be cached
         assertNotNull(svc.mAuthString);
-        assertNotNull(svc.mUserString);
+        assertNotNull(svc.mCmdString);
         assertEquals("Basic " + Base64.encodeToString((USER+":"+PASSWORD).getBytes(),
                 Base64.NO_WRAP), svc.mAuthString);
         assertEquals("&User=" + USER + "&DeviceId=" + ID + "&DeviceType=" +
-                EasSyncService.DEVICE_TYPE, svc.mUserString);
-        assertEquals("https://" + HOST + "/Microsoft-Server-ActiveSync", svc.mBaseUriString);
-        assertEquals(svc.mBaseUriString + "?Cmd=OPTIONS" + svc.mUserString, uriString);
+                EasSyncService.DEVICE_TYPE, svc.mCmdString);
+        assertEquals("https://" + HOST + "/Microsoft-Server-ActiveSync?Cmd=OPTIONS" +
+                svc.mCmdString, uriString);
         // User name that requires encoding
         String user = "name_with_underscore@foo%bar.com";
         svc = setupService(user);
@@ -124,9 +124,9 @@ public class EasSyncServiceTests extends AndroidTestCase {
                 Base64.NO_WRAP), svc.mAuthString);
         String safeUserName = "name_with_underscore%40foo%25bar.com";
         assertEquals("&User=" + safeUserName + "&DeviceId=" + ID + "&DeviceType=" +
-                EasSyncService.DEVICE_TYPE, svc.mUserString);
+                EasSyncService.DEVICE_TYPE, svc.mCmdString);
         assertEquals("https://" + HOST + "/Microsoft-Server-ActiveSync?Cmd=OPTIONS" +
-                svc.mUserString, uriString);
+                svc.mCmdString, uriString);
     }
 
     public void testResetHeartbeats() {