am 35c05cde: Merge "Handle ignored + assumption failure" into lmp-dev
* commit '35c05cdef6ffdece03f1e6b9dd22f999bbc9f4f0':
Handle ignored + assumption failure
diff --git a/support/src/android/support/test/internal/runner/listener/InstrumentationResultPrinter.java b/support/src/android/support/test/internal/runner/listener/InstrumentationResultPrinter.java
index c913abc..0c45c3b 100644
--- a/support/src/android/support/test/internal/runner/listener/InstrumentationResultPrinter.java
+++ b/support/src/android/support/test/internal/runner/listener/InstrumentationResultPrinter.java
@@ -80,6 +80,11 @@
*/
public static final int REPORT_VALUE_RESULT_IGNORED = -3;
/**
+ * The test completed with an assumption failure.
+ */
+ public static final int REPORT_VALUE_RESULT_ASSUMPTION_FAILURE = -4;
+
+ /**
* If included in the status bundle sent to an IInstrumentationWatcher, this key
* identifies a stack trace describing an error or failure. This is sent with any status
* message describing a specific test being completed.
@@ -141,14 +146,14 @@
@Override
public void testFailure(Failure failure) throws Exception {
- mTestResultCode = REPORT_VALUE_RESULT_ERROR;
+ mTestResultCode = REPORT_VALUE_RESULT_FAILURE;
reportFailure(failure);
}
@Override
public void testAssumptionFailure(Failure failure) {
- mTestResultCode = REPORT_VALUE_RESULT_FAILURE;
+ mTestResultCode = REPORT_VALUE_RESULT_ASSUMPTION_FAILURE;
reportFailure(failure);
}
diff --git a/support/tests/.classpath b/support/tests/.classpath
index 730d799..1d411a2 100644
--- a/support/tests/.classpath
+++ b/support/tests/.classpath
@@ -5,7 +5,7 @@
<classpathentry kind="src" path="hamcrest-src"/>
<classpathentry kind="src" path="junit4-src"/>
<classpathentry kind="src" path="objenesis-src"/>
- <classpathentry kind="src" path="mockito-src"/>
+ <classpathentry excluding="org/mockito/internal/creation/cglib/|org/mockito/internal/creation/AbstractMockitoMethodProxy.java|org/mockito/internal/creation/AcrossJVMSerializationFeature.java|org/mockito/internal/creation/CglibMockMaker.java|org/mockito/internal/creation/DelegatingMockitoMethodProxy.java|org/mockito/internal/creation/MethodInterceptorFilter.java|org/mockito/internal/creation/MockitoMethodProxy.java|org/mockito/internal/creation/SerializableMockitoMethodProxy.java|org/mockito/internal/invocation/realmethod/CGLIBProxyRealMethod.java|org/mockito/internal/invocation/realmethod/FilteredCGLIBProxyRealMethod.java|org/mockito/internal/invocation/realmethod/HasCGLIBMethodProxy.java|org/mockito/internal/creation/jmock/" kind="src" path="mockito-src"/>
<classpathentry kind="src" path="dexmaker-mockito"/>
<classpathentry kind="src" path="android-support-test-src"/>
<classpathentry kind="src" path="hamcrest-library-src"/>
diff --git a/support/tests/.project b/support/tests/.project
index 6608212..9f3c1a8 100644
--- a/support/tests/.project
+++ b/support/tests/.project
@@ -34,7 +34,7 @@
<link>
<name>android-support-test-src</name>
<type>2</type>
- <locationURI>ANDROID_TOP/frameworks/testing/support/src</locationURI>
+ <locationURI>ANDROID_TOP/frameworks/testing/support/lib/src</locationURI>
</link>
<link>
<name>dexmaker-dx-src</name>
