Chromium Code Reviews

Side by Side Diff: services/asset_bundle/asset_bundle_apptest.cc

Issue 1990603002: Make ApplicationTestBase not use ApplicationImpl. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: delete ApplicationImpl::WaitForInitialize() Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "mojo/data_pipe_utils/data_pipe_utils.h" 10 #include "mojo/data_pipe_utils/data_pipe_utils.h"
11 #include "mojo/public/cpp/application/application_impl.h"
12 #include "mojo/public/cpp/application/application_test_base.h" 11 #include "mojo/public/cpp/application/application_test_base.h"
13 #include "mojo/public/cpp/application/connect.h" 12 #include "mojo/public/cpp/application/connect.h"
14 #include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h" 13 #include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h"
15 #include "third_party/zlib/google/zip.h" 14 #include "third_party/zlib/google/zip.h"
16 15
17 namespace asset_bundle { 16 namespace asset_bundle {
18 17
19 class AssetBundleAppTest : public mojo::test::ApplicationTestBase { 18 class AssetBundleAppTest : public mojo::test::ApplicationTestBase {
20 public: 19 public:
21 AssetBundleAppTest() {} 20 AssetBundleAppTest() {}
22 ~AssetBundleAppTest() override {} 21 ~AssetBundleAppTest() override {}
23 22
24 void SetUp() override { 23 void SetUp() override {
25 mojo::test::ApplicationTestBase::SetUp(); 24 mojo::test::ApplicationTestBase::SetUp();
26 mojo::ConnectToService(application_impl()->shell(), "mojo:asset_bundle", 25 mojo::ConnectToService(shell(), "mojo:asset_bundle",
27 GetProxy(&asset_unpacker_)); 26 GetProxy(&asset_unpacker_));
28 } 27 }
29 28
30 protected: 29 protected:
31 mojo::asset_bundle::AssetUnpackerPtr asset_unpacker_; 30 mojo::asset_bundle::AssetUnpackerPtr asset_unpacker_;
32 31
33 DISALLOW_COPY_AND_ASSIGN(AssetBundleAppTest); 32 DISALLOW_COPY_AND_ASSIGN(AssetBundleAppTest);
34 }; 33 };
35 34
36 TEST_F(AssetBundleAppTest, CanGetText) { 35 TEST_F(AssetBundleAppTest, CanGetText) {
(...skipping 51 matching lines...)
88 [&](mojo::ScopedDataPipeConsumerHandle asset_pipe) { 87 [&](mojo::ScopedDataPipeConsumerHandle asset_pipe) {
89 mojo::common::BlockingCopyToString(asset_pipe.Pass(), &outside_content); 88 mojo::common::BlockingCopyToString(asset_pipe.Pass(), &outside_content);
90 }); 89 });
91 ASSERT_TRUE(asset_bundle.WaitForIncomingResponse()); 90 ASSERT_TRUE(asset_bundle.WaitForIncomingResponse());
92 91
93 EXPECT_EQ("", outside_content) 92 EXPECT_EQ("", outside_content)
94 << "Traversing outside of bundle is treated as an empty data stream"; 93 << "Traversing outside of bundle is treated as an empty data stream";
95 } 94 }
96 95
97 } // namespace asset_bundle 96 } // namespace asset_bundle
OLDNEW

Powered by Google App Engine