commit 7fac1b48cf6f405cf581bc3037cd1d11c5c4e51c
author Brian Muramatsu <btmura@google.com> Mon Jul 16 13:19:11 2012 -0700
committer Brian Muramatsu <btmura@google.com> Mon Jul 16 13:19:11 2012 -0700
tree 85759f75144e2eb7593b70b96dd0e071ecdd635a
parent 3929c171f79e4212ff27cda38aa07c2623e382d6

Print host output on monkey test failure

Bug 6681325

Change-Id: I5cb6df8ad895af18329f7b451aa07e24b0603c93

hostsidetests/monkey/src/com/android/cts/monkey/PackageTest.java

diff --git a/hostsidetests/monkey/src/com/android/cts/monkey/PackageTest.java b/hostsidetests/monkey/src/com/android/cts/monkey/PackageTest.java
index aa6106b..0e8f276 100644
--- a/hostsidetests/monkey/src/com/android/cts/monkey/PackageTest.java
+++ b/hostsidetests/monkey/src/com/android/cts/monkey/PackageTest.java
@@ -20,18 +20,18 @@
 
     public void testSinglePackage() throws Exception {
         String out = mDevice.executeShellCommand("monkey -v -p " + PKGS[0] + " 5000");
-        assertTrue(out.contains("cmp=com.android.cts.monkey/.MonkeyActivity"));
-        assertFalse(out.contains("cmp=com.android.cts.monkey2/.ChimpActivity"));
+        assertTrue(out, out.contains("cmp=com.android.cts.monkey/.MonkeyActivity"));
+        assertFalse(out, out.contains("cmp=com.android.cts.monkey2/.ChimpActivity"));
 
         out = mDevice.executeShellCommand("monkey -v -p " + PKGS[1] + " 5000");
-        assertFalse(out.contains("cmp=com.android.cts.monkey/.MonkeyActivity"));
-        assertTrue(out.contains("cmp=com.android.cts.monkey2/.ChimpActivity"));
+        assertFalse(out, out.contains("cmp=com.android.cts.monkey/.MonkeyActivity"));
+        assertTrue(out, out.contains("cmp=com.android.cts.monkey2/.ChimpActivity"));
     }
 
     public void testMultiplePackages() throws Exception {
         String out = mDevice.executeShellCommand("monkey -v -p " + PKGS[0]
                 + " -p " + PKGS[1] + " 5000");
-        assertTrue(out.contains("cmp=com.android.cts.monkey/.MonkeyActivity"));
-        assertTrue(out.contains("cmp=com.android.cts.monkey2/.ChimpActivity"));
+        assertTrue(out, out.contains("cmp=com.android.cts.monkey/.MonkeyActivity"));
+        assertTrue(out, out.contains("cmp=com.android.cts.monkey2/.ChimpActivity"));
     }
 }