release-request-108343c4-ad88-44f9-aaa2-24d8b8a5c176-for-git_oc-mr1-release-4321077 snap-temp-L97000000100182150

Change-Id: Iea87b91d7180a5705e2a023b406e2dbad4b60a0d

7 files changed, 18 insertions, 0 deletions

diff --git a/build/tasks/tests/instrumentation_test_list.mk b/build/tasks/tests/instrumentation_test_list.mk
index e3d664a8a..2cb62cffc 100644
--- a/build/tasks/tests/instrumentation_test_list.mk
+++ b/build/tasks/tests/instrumentation_test_list.mk
@@ -15,6 +15,7 @@
 instrumentation_tests := \
     HelloWorldTests \
     crashcollector \
+    LongevityLibTests \
     ManagedProvisioningTests \
     FrameworksCoreTests \
     FrameworksNetTests \
diff --git a/libraries/longevity/tests/src/android/platform/longevity/LongevitySuiteTest.java b/libraries/longevity/tests/src/android/platform/longevity/LongevitySuiteTest.java
index ff796ce3f..e866bb3be 100644
--- a/libraries/longevity/tests/src/android/platform/longevity/LongevitySuiteTest.java
+++ b/libraries/longevity/tests/src/android/platform/longevity/LongevitySuiteTest.java
@@ -17,6 +17,8 @@ package android.platform.longevity;
 
 import static org.junit.Assert.fail;
 
+import android.support.test.filters.SmallTest;
+
 import org.junit.Test;
 import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
 import org.junit.runner.RunWith;
@@ -33,6 +35,7 @@ public class LongevitySuiteTest {
      * Unit test that the {@link SuiteClasses} annotation is required.
      */
     @Test
+    @SmallTest
     public void testAnnotationRequired() {
         try {
             new LongevitySuite(NoSuiteClassesSuite.class, new AllDefaultPossibilitiesBuilder(true));
diff --git a/libraries/longevity/tests/src/android/platform/longevity/listeners/BatteryTerminatorTest.java b/libraries/longevity/tests/src/android/platform/longevity/listeners/BatteryTerminatorTest.java
index c1c21b837..45a9dc6d3 100644
--- a/libraries/longevity/tests/src/android/platform/longevity/listeners/BatteryTerminatorTest.java
+++ b/libraries/longevity/tests/src/android/platform/longevity/listeners/BatteryTerminatorTest.java
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.verify;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.test.filters.SmallTest;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -58,6 +59,7 @@ public class BatteryTerminatorTest {
      * Unit test the listener's stops on low battery.
      */
     @Test
+    @SmallTest
     public void testBatteryTerminator_low() throws Exception {
         when(mIntent.getIntExtra("level", -1)).thenReturn(25);
         mListener.testFinished(Description.EMPTY);
@@ -68,6 +70,7 @@ public class BatteryTerminatorTest {
      * Unit test the listener's does not stop on high battery.
      */
     @Test
+    @SmallTest
     public void testBatteryTerminator_high() throws Exception {
         when(mIntent.getIntExtra("level", -1)).thenReturn(75);
         mListener.testFinished(Description.EMPTY);
diff --git a/libraries/longevity/tests/src/android/platform/longevity/listeners/ErrorTerminatorTest.java b/libraries/longevity/tests/src/android/platform/longevity/listeners/ErrorTerminatorTest.java
index 9cbd1a0b5..bba77a070 100644
--- a/libraries/longevity/tests/src/android/platform/longevity/listeners/ErrorTerminatorTest.java
+++ b/libraries/longevity/tests/src/android/platform/longevity/listeners/ErrorTerminatorTest.java
@@ -18,6 +18,8 @@ package android.platform.longevity.listeners;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
+import android.support.test.filters.SmallTest;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.Description;
@@ -47,6 +49,7 @@ public class ErrorTerminatorTest {
      * Unit test the listener's kill logic.
      */
     @Test
+    @SmallTest
     public void testErrorTerminator_errors() throws Exception {
         mListener.testFailure(new Failure(Description.EMPTY, new Throwable()));
         verify(mNotifier).pleaseStop();
@@ -56,6 +59,7 @@ public class ErrorTerminatorTest {
      * Unit test the listener's kill logic.
      */
     @Test
+    @SmallTest
     public void testErrorTerminator_none() throws Exception {
         mListener.testStarted(Description.EMPTY);
         mListener.testFinished(Description.EMPTY);
diff --git a/libraries/longevity/tests/src/android/platform/longevity/listeners/TimeoutTerminatorTest.java b/libraries/longevity/tests/src/android/platform/longevity/listeners/TimeoutTerminatorTest.java
index acfd13547..e0d8ac104 100644
--- a/libraries/longevity/tests/src/android/platform/longevity/listeners/TimeoutTerminatorTest.java
+++ b/libraries/longevity/tests/src/android/platform/longevity/listeners/TimeoutTerminatorTest.java
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.verify;
 
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.support.test.filters.SmallTest;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -51,6 +52,7 @@ public class TimeoutTerminatorTest {
      * Unit test the listener's kill logic.
      */
     @Test
+    @SmallTest
     public void testTimeoutTerminator_pass() throws Exception {
         mListener.testStarted(Description.EMPTY);
         SystemClock.sleep(10L);
@@ -61,6 +63,7 @@ public class TimeoutTerminatorTest {
      * Unit test the listener's kill logic.
      */
     @Test
+    @SmallTest
     public void testTimeoutTerminator_timeout() throws Exception {
         mListener.testStarted(Description.EMPTY);
         SystemClock.sleep(60L);
diff --git a/libraries/longevity/tests/src/android/platform/longevity/scheduler/IterateTest.java b/libraries/longevity/tests/src/android/platform/longevity/scheduler/IterateTest.java
index 6aa17c10b..fa10e8b13 100644
--- a/libraries/longevity/tests/src/android/platform/longevity/scheduler/IterateTest.java
+++ b/libraries/longevity/tests/src/android/platform/longevity/scheduler/IterateTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import android.os.Bundle;
+import android.support.test.filters.SmallTest;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,6 +50,7 @@ public class IterateTest {
      * Unit test the iteration count is respected.
      */
     @Test
+    @SmallTest
     public void testIterationsRespected() {
         // Construct argument bundle.
         Bundle args = new Bundle();
diff --git a/libraries/longevity/tests/src/android/platform/longevity/scheduler/ShuffleTest.java b/libraries/longevity/tests/src/android/platform/longevity/scheduler/ShuffleTest.java
index 97486d290..467910528 100644
--- a/libraries/longevity/tests/src/android/platform/longevity/scheduler/ShuffleTest.java
+++ b/libraries/longevity/tests/src/android/platform/longevity/scheduler/ShuffleTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import android.os.Bundle;
+import android.support.test.filters.SmallTest;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -48,6 +49,7 @@ public class ShuffleTest {
      * Unit test that shuffling with a specific seed is respected.
      */
     @Test
+    @SmallTest
     public void testShuffleSeedRespected()  {
         // Construct argument bundle.
         Bundle args = new Bundle();