commit 5a9e2f48a6ff326df4efc74b1144d1655e4cfb2e
author Brian Muramatsu <btmura@google.com> Tue Jul 17 14:11:56 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 17 14:11:56 2012 -0700
tree 68a5ad99a285352c48f255b968b337b7bed6f43d
parent d25311872125dfd0bfab8dd8d2f5216925257081
parent 472e49de36737f528fbbdf5adde51f1cd47eef22

am 472e49de: am db7523ad: Merge "Fix PackageTest#testSinglePackage" into jb-dev

* commit '472e49de36737f528fbbdf5adde51f1cd47eef22':
  Fix PackageTest#testSinglePackage

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 0e8f276..3859f19 100644
--- a/hostsidetests/monkey/src/com/android/cts/monkey/PackageTest.java
+++ b/hostsidetests/monkey/src/com/android/cts/monkey/PackageTest.java
@@ -16,22 +16,32 @@
 
 package com.android.cts.monkey;
 
+import java.util.regex.Pattern;
+
 public class PackageTest extends AbstractMonkeyTest {
 
+    private static final Pattern ALLOW_MONKEY =
+            Pattern.compile("^.*Allowing.*cmp=com\\.android\\.cts\\.monkey/\\.MonkeyActivity.*$",
+                    Pattern.MULTILINE);
+
+    private static final Pattern ALLOW_CHIMP =
+            Pattern.compile("^.*Allowing.*cmp=com\\.android\\.cts\\.monkey2/\\.ChimpActivity.*$",
+                    Pattern.MULTILINE);
+
     public void testSinglePackage() throws Exception {
         String out = mDevice.executeShellCommand("monkey -v -p " + PKGS[0] + " 5000");
-        assertTrue(out, out.contains("cmp=com.android.cts.monkey/.MonkeyActivity"));
-        assertFalse(out, out.contains("cmp=com.android.cts.monkey2/.ChimpActivity"));
+        assertTrue(out, ALLOW_MONKEY.matcher(out).find());
+        assertFalse(out, ALLOW_CHIMP.matcher(out).find());
 
         out = mDevice.executeShellCommand("monkey -v -p " + PKGS[1] + " 5000");
-        assertFalse(out, out.contains("cmp=com.android.cts.monkey/.MonkeyActivity"));
-        assertTrue(out, out.contains("cmp=com.android.cts.monkey2/.ChimpActivity"));
+        assertFalse(out, ALLOW_MONKEY.matcher(out).find());
+        assertTrue(out, ALLOW_CHIMP.matcher(out).find());
     }
 
     public void testMultiplePackages() throws Exception {
         String out = mDevice.executeShellCommand("monkey -v -p " + PKGS[0]
                 + " -p " + PKGS[1] + " 5000");
-        assertTrue(out, out.contains("cmp=com.android.cts.monkey/.MonkeyActivity"));
-        assertTrue(out, out.contains("cmp=com.android.cts.monkey2/.ChimpActivity"));
+        assertTrue(out, ALLOW_MONKEY.matcher(out).find());
+        assertTrue(out, ALLOW_CHIMP.matcher(out).find());
     }
 }