From 1dc7e96ab893259ddfbab7dfb08de09aac8c1e88 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 12 Sep 2014 18:56:04 -0700 Subject: Adjust ADT to new ITestRunListener changes. This fixes ADT so it compiles against the ITestRunListener changes made to support new JUnit4 states. It does not change ADT to truly support junit4: eg use the junit4.runtime plugin, pass assumptionfailure and ignored test states back to eclipse UI, etc Bug: 16684768 Change-Id: I16ee8d6d863a17fe061446f4ced6ce0ec3780600 --- .../launch/junit/runtime/RemoteAdtTestRunner.java | 23 ++++++++++++++-------- .../launch/junit/runtime/TestCollector.java | 20 +++++++++++++++++-- 2 files changed, 33 insertions(+), 10 deletions(-) (limited to 'eclipse') 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 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 } -- cgit v1.1