diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-09-23 21:21:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-23 21:21:18 +0000 |
| commit | dab9b085d43cf1ae40b87ecb3a404be4bb8c695a (patch) | |
| tree | 0ec35318c1c8213d8b4e1fa694ed19357d893667 | |
| parent | b8e3092201033e73bf0f74cc8a3c287f535a6ede (diff) | |
| parent | 1dc7e96ab893259ddfbab7dfb08de09aac8c1e88 (diff) | |
| download | sdk-dab9b085d43cf1ae40b87ecb3a404be4bb8c695a.zip sdk-dab9b085d43cf1ae40b87ecb3a404be4bb8c695a.tar.gz sdk-dab9b085d43cf1ae40b87ecb3a404be4bb8c695a.tar.bz2 | |
Merge "Adjust ADT to new ITestRunListener changes." into studio-1.0-dev
2 files changed, 33 insertions, 10 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java index 1205372..a48acd3 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java @@ -448,20 +448,27 @@ public class RemoteAdtTestRunner extends RemoteTestRunner { } @Override - public void testFailed(TestFailure status, TestIdentifier test, String trace) { - String statusString; - if (status == TestFailure.ERROR) { - statusString = MessageIds.TEST_ERROR; - } else { - statusString = MessageIds.TEST_FAILED; - } + public void testFailed(TestIdentifier test, String trace) { + TestReferenceFailure failure = + new TestReferenceFailure(new TestCaseReference(mDeviceName, test), + MessageIds.TEST_FAILED, trace, null); + mNotifier.testFailed(failure); + } + + @Override + public void testAssumptionFailure(TestIdentifier test, String trace) { TestReferenceFailure failure = new TestReferenceFailure(new TestCaseReference(mDeviceName, test), - statusString, trace, null); + MessageIds.TEST_FAILED, trace, null); mNotifier.testFailed(failure); } @Override + public void testIgnored(TestIdentifier test) { + // TODO: implement me? + } + + @Override public synchronized void testRunEnded(long elapsedTime, Map<String, String> runMetrics) { mNotifier.testRunEnded(mDeviceName, elapsedTime); AdtPlugin.printToConsole(mLaunchInfo.getProject(), diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/TestCollector.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/TestCollector.java index 806f289..32c5ef8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/TestCollector.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/TestCollector.java @@ -46,10 +46,26 @@ class TestCollector implements ITestRunListener { } /* (non-Javadoc) - * @see com.android.ddmlib.testrunner.ITestRunListener#testFailed(com.android.ddmlib.testrunner.ITestRunListener.TestFailure, com.android.ddmlib.testrunner.TestIdentifier, java.lang.String) + * @see com.android.ddmlib.testrunner.ITestRunListener#testFailed(com.android.ddmlib.testrunner.TestIdentifier, java.lang.String) */ @Override - public synchronized void testFailed(TestFailure status, TestIdentifier test, String trace) { + public synchronized void testFailed(TestIdentifier test, String trace) { + // ignore - should be impossible since this is only collecting test information + } + + /* (non-Javadoc) + * @see com.android.ddmlib.testrunner.ITestRunListener#testIgnored(com.android.ddmlib.testrunner.TestIdentifier) + */ + @Override + public synchronized void testIgnored(TestIdentifier test) { + // ignore - should be impossible since this is only collecting test information + } + + /* (non-Javadoc) + * @see com.android.ddmlib.testrunner.ITestRunListener#testAssumptionFailure(com.android.ddmlib.testrunner.TestIdentifier, java.lang.String) + */ + @Override + public synchronized void testAssumptionFailure(TestIdentifier test, String trace) { // ignore - should be impossible since this is only collecting test information } |