am c1548e38: Merge "Add test annotations to frameworks common tests." into froyo

Merge commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192' into froyo-plus-aosp

* commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192':
  Add test annotations to frameworks common tests.
This commit is contained in:
Brett Chabot
2010-04-02 10:28:36 -07:00
committed by Android Git Automerger

View File

@ -18,8 +18,11 @@ package com.android.common;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
public class OperationSchedulerTest extends AndroidTestCase { public class OperationSchedulerTest extends AndroidTestCase {
@MediumTest
public void testScheduler() throws Exception { public void testScheduler() throws Exception {
String name = "OperationSchedulerTest.testScheduler"; String name = "OperationSchedulerTest.testScheduler";
SharedPreferences storage = getContext().getSharedPreferences(name, 0); SharedPreferences storage = getContext().getSharedPreferences(name, 0);
@ -112,6 +115,7 @@ public class OperationSchedulerTest extends AndroidTestCase {
assertTrue(afterSuccess + 1000000 >= scheduler.getNextTimeMillis(options)); assertTrue(afterSuccess + 1000000 >= scheduler.getNextTimeMillis(options));
} }
@SmallTest
public void testParseOptions() throws Exception { public void testParseOptions() throws Exception {
OperationScheduler.Options options = new OperationScheduler.Options(); OperationScheduler.Options options = new OperationScheduler.Options();
assertEquals( assertEquals(
@ -132,6 +136,7 @@ public class OperationSchedulerTest extends AndroidTestCase {
OperationScheduler.parseOptions("", options).toString()); OperationScheduler.parseOptions("", options).toString());
} }
@SmallTest
public void testMoratoriumWithHttpDate() throws Exception { public void testMoratoriumWithHttpDate() throws Exception {
String name = "OperationSchedulerTest.testMoratoriumWithHttpDate"; String name = "OperationSchedulerTest.testMoratoriumWithHttpDate";
SharedPreferences storage = getContext().getSharedPreferences(name, 0); SharedPreferences storage = getContext().getSharedPreferences(name, 0);