/*
 * Copyright (c) 2012, salesforce.com, inc.
 * All rights reserved.
 * Redistribution and use of this software in source and binary forms, with or
 * without modification, are permitted provided that the following conditions
 * are met:
 * - Redistributions of source code must retain the above copyright notice, this
 * list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 * - Neither the name of salesforce.com, inc. nor the names of its contributors
 * may be used to endorse or promote products derived from this software without
 * specific prior written permission of salesforce.com, inc.
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
package com.salesforce.samples.templateapp;

import com.salesforce.androidsdk.app.SalesforceSDKManager;
import com.salesforce.androidsdk.auth.HttpAccess;
import com.salesforce.androidsdk.util.EventsObservable.EventType;
import com.salesforce.androidsdk.util.NativeInstrumentationTestCase;

/**
 * Tests for TemplateApp
 */
public class TemplateAppTest extends NativeInstrumentationTestCase {

	/**
	 * Load app then click logout
	 * @throws Exception
	 */
	public void testLogout() throws Exception {
		clickView(mainActivity.findViewById(R.id.logout_button));
		waitForEvent(EventType.LogoutComplete);
		cleanupActivityFollowingLogout();
	}

	/**
	 * Check the user agent used by http access
	 */
	public void testUserAgentOfHttpAccess() {
		String userAgent = HttpAccess.DEFAULT.getUserAgent();
		assertTrue("User agent should start with SalesforceMobileSDK/<version>", userAgent.startsWith("SalesforceMobileSDK/" + SalesforceSDKManager.SDK_VERSION));
		assertTrue("User agent should contain Template/1.0 Native", userAgent.contains("Template/1.0 Native"));
	}
	
}

@@ -1702,124 +1702,8 @@
 er;%0A
-import com.salesforce.androidsdk.auth.HttpAccess;%0Aimport com.salesforce.androidsdk.util.EventsObservable.EventType;%0A
 impo
@@ -1875,258 +1875,8 @@
  %7B%0A%0A
-%09/**%0A%09 * Load app then click logout%0A%09 * @throws Exception%0A%09 */%0A%09public void testLogout() throws Exception %7B%0A%09%09clickView(mainActivity.findViewById(R.id.logout_button));%0A%09%09waitForEvent(EventType.LogoutComplete);%0A%09%09cleanupActivityFollowingLogout();%0A%09%7D%0A%0A
 %09/**
@@ -1994,26 +1994,42 @@
 t = 
-HttpAccess.DEFAULT
+SalesforceSDKManager.getInstance()
 .get

Remove redundant logout test