diff options
author | Raphael Moll <ralf@android.com> | 2010-07-23 22:59:49 -0400 |
---|---|---|
committer | Raphael Moll <ralf@android.com> | 2010-07-23 22:59:49 -0400 |
commit | acb39937c5573a217d039ec0a0715146cde709d6 (patch) | |
tree | 1de6f1e1f84cc53675e4cf052d4fa4417cfec6d2 /eclipse/plugins | |
parent | 08a820331fb60f908ac20176838e3987ca36d8d2 (diff) | |
download | sdk-acb39937c5573a217d039ec0a0715146cde709d6.zip sdk-acb39937c5573a217d039ec0a0715146cde709d6.tar.gz sdk-acb39937c5573a217d039ec0a0715146cde709d6.tar.bz2 |
Fix SDK build for eclipse tests.
Broken by Change: If04c5f8b10eeaca494a155ed6c4a25bf0d9d892c
Change-Id: I8f60da7d537af68df47119b636eaf03c49b51146
Diffstat (limited to 'eclipse/plugins')
2 files changed, 10 insertions, 9 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 3f40230..3484252 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 @@ -29,6 +29,7 @@ import org.eclipse.jdt.internal.junit.runner.TestExecution; import org.eclipse.jdt.internal.junit.runner.TestReferenceFailure; import java.io.IOException; +import java.util.Map; /** * Supports Eclipse JUnit execution of Android tests. @@ -205,9 +206,9 @@ public class RemoteAdtTestRunner extends RemoteTestRunner { } /* (non-Javadoc) - * @see com.android.ddmlib.testrunner.ITestRunListener#testRunEnded(long) + * @see com.android.ddmlib.testrunner.ITestRunListener#testRunEnded(long, Map<String, String>) */ - public void testRunEnded(long elapsedTime) { + public void testRunEnded(long elapsedTime, Map<String, String> runMetrics) { notifyTestRunEnded(elapsedTime); AdtPlugin.printToConsole(mLaunchInfo.getProject(), LaunchMessages.RemoteAdtTestRunner_RunCompleteMsg); @@ -272,4 +273,4 @@ public class RemoteAdtTestRunner extends RemoteTestRunner { message); } } -}
\ No newline at end of file +} 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 b64ede3..da4abda 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 @@ -37,7 +37,7 @@ class TestCollector implements ITestRunListener { private String mErrorMessage = null; TestCollector() { - mTotalTestCount = 0; + mTotalTestCount = 0; mTestTree = new HashMap<String, TestSuiteReference>(); } @@ -56,9 +56,9 @@ class TestCollector implements ITestRunListener { } /* (non-Javadoc) - * @see com.android.ddmlib.testrunner.ITestRunListener#testRunEnded(long) + * @see com.android.ddmlib.testrunner.ITestRunListener#testRunEnded(long, Map<String, String>) */ - public void testRunEnded(long elapsedTime) { + public void testRunEnded(long elapsedTime, Map<String, String> runMetrics) { // ignore } @@ -104,8 +104,8 @@ class TestCollector implements ITestRunListener { } /** - * Sends info about the test tree to be executed (ie the suites and their enclosed tests) - * + * Sends info about the test tree to be executed (ie the suites and their enclosed tests) + * * @param notified the {@link IVisitsTestTrees} to send test data to */ public void sendTrees(IVisitsTestTrees notified) { @@ -115,7 +115,7 @@ class TestCollector implements ITestRunListener { } /** - * Returns the error message that was reported when collecting test info. + * Returns the error message that was reported when collecting test info. * Returns <code>null</code> if no error occurred. */ public String getErrorMessage() { |