| OLD | NEW |
| 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" | 11 #include "mojo/public/cpp/application/application_impl.h" |
| 12 #include "mojo/public/cpp/application/application_test_base.h" | 12 #include "mojo/public/cpp/application/application_test_base.h" |
| 13 #include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h" | 13 #include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h" |
| 14 #include "third_party/zlib/google/zip.h" | 14 #include "third_party/zlib/google/zip.h" |
| 15 | 15 |
| 16 namespace asset_bundle { | 16 namespace asset_bundle { |
| 17 | 17 |
| 18 class AssetBundleAppTest : public mojo::test::ApplicationTestBase { | 18 class AssetBundleAppTest : public mojo::test::ApplicationTestBase { |
| 19 public: | 19 public: |
| 20 AssetBundleAppTest() {} | 20 AssetBundleAppTest() {} |
| 21 ~AssetBundleAppTest() override {} | 21 ~AssetBundleAppTest() override {} |
| 22 | 22 |
| 23 void SetUp() override { | 23 void SetUp() override { |
| 24 mojo::test::ApplicationTestBase::SetUp(); | 24 mojo::test::ApplicationTestBase::SetUp(); |
| 25 application_impl()->ConnectToService("mojo:asset_bundle", &asset_unpacker_); | 25 application_impl()->ConnectToServiceDeprecated("mojo:asset_bundle", |
| 26 &asset_unpacker_); |
| 26 } | 27 } |
| 27 | 28 |
| 28 protected: | 29 protected: |
| 29 mojo::asset_bundle::AssetUnpackerPtr asset_unpacker_; | 30 mojo::asset_bundle::AssetUnpackerPtr asset_unpacker_; |
| 30 | 31 |
| 31 DISALLOW_COPY_AND_ASSIGN(AssetBundleAppTest); | 32 DISALLOW_COPY_AND_ASSIGN(AssetBundleAppTest); |
| 32 }; | 33 }; |
| 33 | 34 |
| 34 TEST_F(AssetBundleAppTest, CanGetText) { | 35 TEST_F(AssetBundleAppTest, CanGetText) { |
| 35 std::string foo_content = "Some plain data"; | 36 std::string foo_content = "Some plain data"; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 [&](mojo::ScopedDataPipeConsumerHandle asset_pipe) { | 87 [&](mojo::ScopedDataPipeConsumerHandle asset_pipe) { |
| 87 mojo::common::BlockingCopyToString(asset_pipe.Pass(), &outside_content); | 88 mojo::common::BlockingCopyToString(asset_pipe.Pass(), &outside_content); |
| 88 }); | 89 }); |
| 89 ASSERT_TRUE(asset_bundle.WaitForIncomingResponse()); | 90 ASSERT_TRUE(asset_bundle.WaitForIncomingResponse()); |
| 90 | 91 |
| 91 EXPECT_EQ("", outside_content) | 92 EXPECT_EQ("", outside_content) |
| 92 << "Traversing outside of bundle is treated as an empty data stream"; | 93 << "Traversing outside of bundle is treated as an empty data stream"; |
| 93 } | 94 } |
| 94 | 95 |
| 95 } // namespace asset_bundle | 96 } // namespace asset_bundle |
| OLD | NEW |