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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include "mojo/public/cpp/system/macros.h" | 8 #include "mojo/public/cpp/system/macros.h" |
9 #include "mojo/public/interfaces/bindings/tests/versioning_test_client.mojom.h" | 9 #include "mojo/public/interfaces/bindings/tests/versioning_test_client.mojom.h" |
10 #include "mojo/shell/public/cpp/application_impl.h" | |
11 #include "mojo/shell/public/cpp/application_test_base.h" | 10 #include "mojo/shell/public/cpp/application_test_base.h" |
| 11 #include "mojo/shell/public/cpp/shell.h" |
12 | 12 |
13 namespace mojo { | 13 namespace mojo { |
14 namespace test { | 14 namespace test { |
15 namespace versioning { | 15 namespace versioning { |
16 | 16 |
17 class VersioningApplicationTest : public ApplicationTestBase { | 17 class VersioningApplicationTest : public ApplicationTestBase { |
18 public: | 18 public: |
19 VersioningApplicationTest() : ApplicationTestBase() {} | 19 VersioningApplicationTest() : ApplicationTestBase() {} |
20 ~VersioningApplicationTest() override {} | 20 ~VersioningApplicationTest() override {} |
21 | 21 |
22 protected: | 22 protected: |
23 // ApplicationTestBase overrides. | 23 // ApplicationTestBase overrides. |
24 void SetUp() override { | 24 void SetUp() override { |
25 ApplicationTestBase::SetUp(); | 25 ApplicationTestBase::SetUp(); |
26 | 26 |
27 application_impl()->ConnectToService("mojo:versioning_test_service", | 27 shell()->ConnectToService("mojo:versioning_test_service", &database_); |
28 &database_); | |
29 } | 28 } |
30 | 29 |
31 HumanResourceDatabasePtr database_; | 30 HumanResourceDatabasePtr database_; |
32 | 31 |
33 private: | 32 private: |
34 MOJO_DISALLOW_COPY_AND_ASSIGN(VersioningApplicationTest); | 33 MOJO_DISALLOW_COPY_AND_ASSIGN(VersioningApplicationTest); |
35 }; | 34 }; |
36 | 35 |
37 TEST_F(VersioningApplicationTest, Struct) { | 36 TEST_F(VersioningApplicationTest, Struct) { |
38 // The service side uses a newer version of Employee defintion. | 37 // The service side uses a newer version of Employee defintion. |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 // Calling a version 2 method (which the service side doesn't support) closes | 114 // Calling a version 2 method (which the service side doesn't support) closes |
116 // the pipe. | 115 // the pipe. |
117 database_->ListEmployeeIds([](Array<uint64_t> ids) { EXPECT_TRUE(false); }); | 116 database_->ListEmployeeIds([](Array<uint64_t> ids) { EXPECT_TRUE(false); }); |
118 database_.WaitForIncomingResponse(); | 117 database_.WaitForIncomingResponse(); |
119 EXPECT_TRUE(database_.encountered_error()); | 118 EXPECT_TRUE(database_.encountered_error()); |
120 } | 119 } |
121 | 120 |
122 } // namespace versioning | 121 } // namespace versioning |
123 } // namespace examples | 122 } // namespace examples |
124 } // namespace mojo | 123 } // namespace mojo |
OLD | NEW |