diff options
| author | Brett Chabot <brettchabot@google.com> | 2014-08-29 19:03:25 -0700 |
|---|---|---|
| committer | Brett Chabot <brettchabot@google.com> | 2014-09-17 18:35:15 -0700 |
| commit | 1472a9038a93df3b4d0d64eb3f8c309ef2583dc6 (patch) | |
| tree | 446731e8644a22b15c899ac8e10db319255d5e67 | |
| parent | 41d41dce8a720eacc151181dc8e9ef7f35f5d625 (diff) | |
| download | testing-1472a9038a93df3b4d0d64eb3f8c309ef2583dc6.tar.gz | |
Handle ignored + assumption failure
Also fix eclipse classpath
Bug: 16684768
Change-Id: Ic699525d5dc81e74fdc28fe9b81a91c41c9151b8
| -rw-r--r-- | support/src/android/support/test/internal/runner/listener/InstrumentationResultPrinter.java | 9 | ||||
| -rw-r--r-- | support/tests/.classpath | 2 | ||||
| -rw-r--r-- | support/tests/.project | 2 |
3 files changed, 9 insertions, 4 deletions
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 class InstrumentationResultPrinter extends InstrumentationRunListener { */ 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 @@ public class InstrumentationResultPrinter extends InstrumentationRunListener { @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> |