Notify Files App when ARC++ app is installed/removed

components/arc/intent_helper/arc_intent_helper_bridge_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.

[Yusuke Sato, 2016/11/28 19:24:54]

Thanks for adding the test!

[oka, 2016/11/29 06:56:49]

Acknowledged.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 
 #include <utility>
+#include <vector>

[Yusuke Sato, 2016/11/28 19:24:54]

This is already in arc_intent_helper_bridge.h. Remove?

[oka, 2016/11/29 06:56:49]

Done.

 
+#include "base/memory/ptr_util.h"

[Yusuke Sato, 2016/11/28 19:24:54]

What is this for?

[oka, 2016/11/29 06:56:49]

Removed.

 #include "components/arc/common/intent_helper.mojom.h"
+#include "components/arc/intent_helper/activity_icon_loader.h"
+#include "components/arc/intent_helper/local_activity_resolver.h"
+#include "components/arc/test/fake_arc_bridge_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace arc {
 
+class ArcIntentHelperTest : public testing::Test {

[Yusuke Sato, 2016/11/28 19:24:54]

Please put this in an anonymous namespace.

 namespace arc {
 
 namespace {
 
 class ... {
 
 };
 
 }  // namespace
 
 }  // namespace arc

[oka, 2016/11/29 06:56:49]

Done.

+ public:
+  ArcIntentHelperTest()
+      : icon_loader_(new ActivityIconLoader),

[Yusuke Sato, 2016/11/28 19:24:54]

nit: could you add ()? IIUC, Chromium folks are trying to always prefer 'new
T()' style.

[oka, 2016/11/29 06:56:49]

Done.

+        activity_resolver_(new LocalActivityResolver) {}

[Yusuke Sato, 2016/11/28 19:24:54]

same

[oka, 2016/11/29 06:56:49]

Done.

+
+ protected:
+  std::unique_ptr<FakeArcBridgeService> fake_arc_bridge_service_;
+  scoped_refptr<ActivityIconLoader> icon_loader_;
+  scoped_refptr<LocalActivityResolver> activity_resolver_;
+  std::unique_ptr<ArcIntentHelperBridge> instance_;
+
+ private:
+  void SetUp() override {
+    fake_arc_bridge_service_.reset(new FakeArcBridgeService);

[Yusuke Sato, 2016/11/28 19:24:54]

same

[oka, 2016/11/29 06:56:49]

Done.

+    instance_.reset(new ArcIntentHelperBridge(
+        fake_arc_bridge_service_.get(), icon_loader_, activity_resolver_));
+  }
+
+  void TearDown() override {
+    instance_.reset();
+    fake_arc_bridge_service_.reset();
+  }
+};
+
 // Tests if IsIntentHelperPackage works as expected. Probably too trivial
 // to test but just in case.
-TEST(ArcIntentHelperTest, TestIsIntentHelperPackage) {
+TEST_F(ArcIntentHelperTest, TestIsIntentHelperPackage) {
   EXPECT_FALSE(ArcIntentHelperBridge::IsIntentHelperPackage(""));
   EXPECT_FALSE(ArcIntentHelperBridge::IsIntentHelperPackage(
       ArcIntentHelperBridge::kArcIntentHelperPackageName + std::string("a")));
   EXPECT_FALSE(ArcIntentHelperBridge::IsIntentHelperPackage(
       ArcIntentHelperBridge::kArcIntentHelperPackageName +
       std::string("/.ArcIntentHelperActivity")));
   EXPECT_TRUE(ArcIntentHelperBridge::IsIntentHelperPackage(
       ArcIntentHelperBridge::kArcIntentHelperPackageName));
 }
 
 // Tests if FilterOutIntentHelper removes handlers as expected.
-TEST(ArcIntentHelperTest, TestFilterOutIntentHelper) {
+TEST_F(ArcIntentHelperTest, TestFilterOutIntentHelper) {
   {
     std::vector<mojom::IntentHandlerInfoPtr> orig;
     std::vector<mojom::IntentHandlerInfoPtr> filtered =
         ArcIntentHelperBridge::FilterOutIntentHelper(std::move(orig));
     EXPECT_EQ(0U, filtered.size());
   }
 
   {
     std::vector<mojom::IntentHandlerInfoPtr> orig;
     orig.push_back(mojom::IntentHandlerInfo::New());
@@ skipping 55 matching lines @@
     orig[1]->name = "1";
     orig[1]->package_name = ArcIntentHelperBridge::kArcIntentHelperPackageName;
 
     // FilterOutIntentHelper should remove all elements.
     std::vector<mojom::IntentHandlerInfoPtr> filtered =
         ArcIntentHelperBridge::FilterOutIntentHelper(std::move(orig));
     EXPECT_EQ(0U, filtered.size());
   }
 }
 
+// Tests if observer is called when intent filter is updated.
+TEST_F(ArcIntentHelperTest, TestObserverIsCalled) {
+  struct FakeObserver : public ArcIntentHelperObserver {
+   public:
+    FakeObserver() : updated_(false) {}
+    void OnAppsUpdated() override { updated_ = true; }
+    bool updated_;
+  };
+
+  std::unique_ptr<FakeObserver> observer(new FakeObserver);

[Yusuke Sato, 2016/11/28 19:24:54]

same

[oka, 2016/11/29 06:56:49]

Done.

+  instance_->AddObserver(observer.get());
+  std::vector<mojom::IntentFilterPtr> v;
+  instance_->OnIntentFiltersUpdated(std::move(v));

[Yusuke Sato, 2016/11/28 19:24:54]

nit: I'd add EXPECT_FALSE() call between L145&146.

[oka, 2016/11/29 06:56:49]

Done.

+
+  EXPECT_TRUE(observer->updated_);
+}

[Yusuke Sato, 2016/11/28 19:24:54]

Can you also do

 observer->updated_ = false;  // or observer.Reset();
 instance_->RemoveObserver(observer.get());
 instance_->OnIntentFiltersUpdated(std::move(v2));
 EXPECT_FALSE(observer->updated_);

to test RemoveObserver?

[oka, 2016/11/29 06:56:49]

Done.

+
 }  // namespace arc