Expand Chrome OS ARC support to create one tree source per package

chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc

Index: chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
diff --git a/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d5a40d3dc167e7b0af693e8db9fe982a928175e8
--- /dev/null
+++ b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
@@ -0,0 +1,128 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.

[hidehiko, 2017/05/08 06:13:11]

Wow, nice adding tests!

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h"
+#include "base/command_line.h"

[hidehiko, 2017/05/08 06:13:11]

Style: could you add an empty line between L5 and L6?

[David Tseng, 2017/05/08 16:10:21]

Done.

+#include "chromeos/chromeos_switches.h"
+#include "components/arc/arc_bridge_service.h"
+#include "components/arc/common/accessibility_helper.mojom.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace arc {
+
+class ArcAccessibilityHelperBridgeTest : public testing::Test {
+ public:
+  ArcAccessibilityHelperBridgeTest() {}

[hidehiko, 2017/05/08 06:13:11]

style: s/{}/= default/ for consistency in ARC?

[David Tseng, 2017/05/08 16:10:21]

Done.

+  void SetUp() override {
+    bridge_service_.reset(new ArcBridgeService());

[hidehiko, 2017/05/08 06:13:11]

Style/optional:

bridge_service_ = base::MakeUnique<ArcBridgeServie>();
accessibility_helper_bridge_ =
  base::MakeUnique<ArcAHB>(bridge_service_.get());

for consistency?

[David Tseng, 2017/05/08 16:10:21]

Done.

+    accessibility_helper_bridge_.reset(
+        new ArcAccessibilityHelperBridge(bridge_service_.get()));
+  }
+
+  ArcAccessibilityHelperBridge* accessibility_helper_bridge() {
+    return accessibility_helper_bridge_.get();
+  }
+
+ private:
+  std::unique_ptr<ArcBridgeService> bridge_service_;
+  std::unique_ptr<ArcAccessibilityHelperBridge> accessibility_helper_bridge_;
+
+  DISALLOW_COPY_AND_ASSIGN(ArcAccessibilityHelperBridgeTest);
+};
+
+TEST_F(ArcAccessibilityHelperBridgeTest, TaskLifecycle) {
+  ArcAccessibilityHelperBridge* ahb = accessibility_helper_bridge();

[hidehiko, 2017/05/08 06:13:11]

could you avoid "ahb" variable name?
Recommendation: accessibility_helper_bridge or helper_bridge etc.

[David Tseng, 2017/05/08 16:10:21]

Done.

+  const auto& package_to_tree = ahb->package_name_to_tree_for_test();
+  const auto& package_to_ids = ahb->package_name_to_task_ids_for_test();
+
+  EXPECT_EQ(0U, package_to_tree.size());
+  EXPECT_EQ(0U, package_to_ids.size());
+
+  ahb->OnTaskCreated(1, "com.android.vending", "launch", "");
+  EXPECT_EQ(0U, package_to_tree.size());
+  EXPECT_EQ(1U, package_to_ids.size());
+  auto entry1 = package_to_ids.find("com.android.vending");

[hidehiko, 2017/05/08 06:13:11]

Actually, this is not entry but iterator? How about renaming?
Or, another approach would be;

ASSERT_EQ(1U, package_to_ids.size());
{
  const auto& entry = *pacakge_to_ids.begin();
  EXPECT_EQ("com.android.vending", entry.first);
  EXPECT_EQ(1U, entry.second.size());
  EXPECT_EQ(1U, entry.second.count(1));
}

Ditto for below.
Note: ASSERT_EQ is for early return, otherwise following EXPECTs will crash.
map::count() returns the number of elements (0 or 1), so better to use _EQ,
instead of _TRUE.

[David Tseng, 2017/05/08 16:10:21]

Done. Also, converted everything to ASSERT_* since there's no real value in
having the the test continue if any expectation fails.

+  EXPECT_NE(package_to_ids.end(), entry1);
+  EXPECT_EQ(1U, entry1->second.size());
+  EXPECT_TRUE(entry1->second.count(1));
+
+  ahb->OnTaskCreated(2, "com.android.vending", "app", "");
+  EXPECT_EQ(0U, package_to_tree.size());
+  EXPECT_EQ(1U, package_to_ids.size());
+  auto entry2 = package_to_ids.find("com.android.vending");
+  EXPECT_NE(package_to_ids.end(), entry2);
+  EXPECT_EQ(2U, entry2->second.size());
+  EXPECT_TRUE(entry2->second.count(1));
+  EXPECT_TRUE(entry2->second.count(2));
+
+  ahb->OnTaskCreated(3, "com.android.music", "app", "");
+  EXPECT_EQ(0U, package_to_tree.size());
+  EXPECT_EQ(2U, package_to_ids.size());
+  auto entry3 = package_to_ids.find("com.android.music");
+  EXPECT_NE(package_to_ids.end(), entry3);
+  EXPECT_EQ(1U, entry3->second.size());
+  EXPECT_TRUE(entry3->second.count(3));
+
+  ahb->OnTaskDestroyed(1);
+  EXPECT_EQ(0U, package_to_tree.size());
+  EXPECT_EQ(2U, package_to_ids.size());
+  entry1 = package_to_ids.find("com.android.vending");
+  EXPECT_NE(package_to_ids.end(), entry1);
+  EXPECT_EQ(1U, entry1->second.size());
+  EXPECT_FALSE(entry1->second.count(1));
+  EXPECT_TRUE(entry1->second.count(2));
+
+  ahb->OnTaskDestroyed(2);
+  EXPECT_EQ(0U, package_to_tree.size());
+  EXPECT_EQ(1U, package_to_ids.size());
+  entry2 = package_to_ids.find("com.android.vending");
+  EXPECT_EQ(package_to_ids.end(), entry2);
+
+  ahb->OnTaskDestroyed(3);
+  EXPECT_EQ(0U, package_to_tree.size());
+  EXPECT_EQ(0U, package_to_ids.size());
+}
+
+TEST_F(ArcAccessibilityHelperBridgeTest, AXTreeSourceLifetime) {
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      chromeos::switches::kEnableChromeVoxArcSupport);
+
+  ArcAccessibilityHelperBridge* ahb = accessibility_helper_bridge();
+  const auto& package_to_tree = ahb->package_name_to_tree_for_test();
+  const auto& package_to_ids = ahb->package_name_to_task_ids_for_test();
+
+  EXPECT_EQ(0U, package_to_tree.size());
+  EXPECT_EQ(0U, package_to_ids.size());
+
+  ahb->OnTaskCreated(1, "com.android.vending", "launch", "");
+  EXPECT_EQ(0U, package_to_tree.size());
+  EXPECT_EQ(1U, package_to_ids.size());
+  auto entry1 = package_to_ids.find("com.android.vending");
+  EXPECT_NE(package_to_ids.end(), entry1);
+  EXPECT_EQ(1U, entry1->second.size());
+  EXPECT_TRUE(entry1->second.count(1));
+
+  auto event = arc::mojom::AccessibilityEventData::New();
+  event->sourceId = 1;
+  event->eventType = arc::mojom::AccessibilityEventType::VIEW_FOCUSED;
+  event->nodeData.push_back(arc::mojom::AccessibilityNodeInfoData::New());
+  event->nodeData[0]->id = 1;
+  event->nodeData[0]->stringProperties =
+      std::unordered_map<arc::mojom::AccessibilityStringProperty,
+                         std::string>();
+  event->nodeData[0]->stringProperties.value().insert(
+      std::make_pair(arc::mojom::AccessibilityStringProperty::PACKAGE_NAME,
+                     "com.android.vending"));
+
+  // Task 1 is not current; gets rejected.
+  ahb->OnAccessibilityEvent(event.Clone());
+  EXPECT_EQ(0U, package_to_tree.size());
+
+  // Task 1 is now current.
+  ahb->OnTaskSetActive(1);
+  ahb->OnAccessibilityEvent(event.Clone());
+  EXPECT_EQ(1U, package_to_tree.size());
+}
+
+}  // namespace arc