commit 1257b85bd89bdb38db4f3729ffe4cfeeb25150b5
author Benjamin Lerman <qsr@chromium.org> Thu Sep 24 09:52:12 2015 +0200
committer Benjamin Lerman <qsr@chromium.org> Thu Sep 24 09:52:12 2015 +0200
tree ba5a42e259117b86f3fad1644b67320cd160e764
parent 5972ee467b06b67a4cd3ab2594584481b6902825

Fix ShellHTTPAppTest#QueryHandling test.

The test was supposing FIFO behavior for messages sent on 2 different
message pipes.

BUG=Fixes https://github.com/domokit/mojo/issues/444
TBR=jamesr@chromium.org

Review URL: https://codereview.chromium.org/1367863004 .

shell/shell_apptest.cc

diff --git a/shell/shell_apptest.cc b/shell/shell_apptest.cc
index 2a5a5df..931cc4d 100644
--- a/shell/shell_apptest.cc
+++ b/shell/shell_apptest.cc
@@ -157,23 +157,26 @@
   application_impl()->ConnectToService(GetURL("app?bar"), &pingable2);
 
   int num_responses = 0;
-  auto callback = [this, &num_responses](const String& app_url,
-                                         const String& connection_url,
-                                         const String& message) {
-    EXPECT_EQ(GetURL("app"), app_url);
-    EXPECT_EQ("hello", message);
-    ++num_responses;
-    if (num_responses == 1) {
-      EXPECT_EQ(GetURL("app?foo"), connection_url);
-    } else if (num_responses == 2) {
-      EXPECT_EQ(GetURL("app?bar"), connection_url);
-      base::MessageLoop::current()->Quit();
-    } else {
-      CHECK(false);
-    }
+  auto callbacks_builder = [this, &num_responses](int query_index) {
+    return [this, &num_responses, query_index](const String& app_url,
+                                               const String& connection_url,
+                                               const String& message) {
+      EXPECT_EQ(GetURL("app"), app_url);
+      EXPECT_EQ("hello", message);
+      if (query_index == 1) {
+        EXPECT_EQ(GetURL("app?foo"), connection_url);
+      } else if (query_index == 2) {
+        EXPECT_EQ(GetURL("app?bar"), connection_url);
+      } else {
+        CHECK(false);
+      }
+      ++num_responses;
+      if (num_responses == 2)
+        base::MessageLoop::current()->Quit();
+    };
   };
-  pingable1->Ping("hello", callback);
-  pingable2->Ping("hello", callback);
+  pingable1->Ping("hello", callbacks_builder(1));
+  pingable2->Ping("hello", callbacks_builder(2));
   base::RunLoop().Run();
 }