| 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 <string> | 5 #include <string> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 private: | 177 private: |
| 178 base::MessageLoop loop_; | 178 base::MessageLoop loop_; |
| 179 ChromiumPicklePasserImpl chromium_service_; | 179 ChromiumPicklePasserImpl chromium_service_; |
| 180 BindingSet<PicklePasser> chromium_bindings_; | 180 BindingSet<PicklePasser> chromium_bindings_; |
| 181 BlinkPicklePasserImpl blink_service_; | 181 BlinkPicklePasserImpl blink_service_; |
| 182 BindingSet<blink::PicklePasser> blink_bindings_; | 182 BindingSet<blink::PicklePasser> blink_bindings_; |
| 183 }; | 183 }; |
| 184 | 184 |
| 185 } // namespace | 185 } // namespace |
| 186 | 186 |
| 187 TEST_F(PickleTest, ChromiumProxyToChromiumService) { | 187 #if _MSC_FULL_VER == 191025017 |
| 188 // Disabled due to this VS 2017 RTM code-gen bug: |
| 189 // https://developercommunity.visualstudio.com/content/problem/40904/bad-code-ge
n-in-chromes-mojo-public-bindings-unitt.html |
| 190 #define MAYBE_ChromiumProxyToChromiumService \ |
| 191 DISABLED_ChromiumProxyToChromiumService |
| 192 #define MAYBE_ChromiumProxyToBlinkService DISABLED_ChromiumProxyToBlinkService |
| 193 #define MAYBE_BlinkProxyToBlinkService DISABLED_BlinkProxyToBlinkService |
| 194 #define MAYBE_BlinkProxyToChromiumService DISABLED_BlinkProxyToChromiumService |
| 195 #else |
| 196 #define MAYBE_ChromiumProxyToChromiumService ChromiumProxyToChromiumService |
| 197 #define MAYBE_ChromiumProxyToBlinkService ChromiumProxyToBlinkService |
| 198 #define MAYBE_BlinkProxyToBlinkService BlinkProxyToBlinkService |
| 199 #define MAYBE_BlinkProxyToChromiumService BlinkProxyToChromiumService |
| 200 #endif |
| 201 |
| 202 TEST_F(PickleTest, MAYBE_ChromiumProxyToChromiumService) { |
| 188 auto chromium_proxy = ConnectToChromiumService(); | 203 auto chromium_proxy = ConnectToChromiumService(); |
| 189 { | 204 { |
| 190 base::RunLoop loop; | 205 base::RunLoop loop; |
| 191 chromium_proxy->PassPickledStruct( | 206 chromium_proxy->PassPickledStruct( |
| 192 PickledStructChromium(1, 2), | 207 PickledStructChromium(1, 2), |
| 193 ExpectResult(PickledStructChromium(1, 2), loop.QuitClosure())); | 208 ExpectResult(PickledStructChromium(1, 2), loop.QuitClosure())); |
| 194 loop.Run(); | 209 loop.Run(); |
| 195 } | 210 } |
| 196 { | 211 { |
| 197 base::RunLoop loop; | 212 base::RunLoop loop; |
| 198 chromium_proxy->PassPickledStruct( | 213 chromium_proxy->PassPickledStruct( |
| 199 PickledStructChromium(4, 5), | 214 PickledStructChromium(4, 5), |
| 200 ExpectResult(PickledStructChromium(4, 5), loop.QuitClosure())); | 215 ExpectResult(PickledStructChromium(4, 5), loop.QuitClosure())); |
| 201 loop.Run(); | 216 loop.Run(); |
| 202 } | 217 } |
| 203 | 218 |
| 204 { | 219 { |
| 205 base::RunLoop loop; | 220 base::RunLoop loop; |
| 206 chromium_proxy->PassPickledEnum( | 221 chromium_proxy->PassPickledEnum( |
| 207 PickledEnumChromium::VALUE_1, | 222 PickledEnumChromium::VALUE_1, |
| 208 ExpectEnumResult(PickledEnumChromium::VALUE_1, loop.QuitClosure())); | 223 ExpectEnumResult(PickledEnumChromium::VALUE_1, loop.QuitClosure())); |
| 209 loop.Run(); | 224 loop.Run(); |
| 210 } | 225 } |
| 211 } | 226 } |
| 212 | 227 |
| 213 TEST_F(PickleTest, ChromiumProxyToBlinkService) { | 228 TEST_F(PickleTest, MAYBE_ChromiumProxyToBlinkService) { |
| 214 auto chromium_proxy = ConnectToBlinkService<PicklePasser>(); | 229 auto chromium_proxy = ConnectToBlinkService<PicklePasser>(); |
| 215 { | 230 { |
| 216 base::RunLoop loop; | 231 base::RunLoop loop; |
| 217 chromium_proxy->PassPickledStruct( | 232 chromium_proxy->PassPickledStruct( |
| 218 PickledStructChromium(1, 2), | 233 PickledStructChromium(1, 2), |
| 219 ExpectResult(PickledStructChromium(1, 2), loop.QuitClosure())); | 234 ExpectResult(PickledStructChromium(1, 2), loop.QuitClosure())); |
| 220 loop.Run(); | 235 loop.Run(); |
| 221 } | 236 } |
| 222 { | 237 { |
| 223 base::RunLoop loop; | 238 base::RunLoop loop; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 251 { | 266 { |
| 252 base::RunLoop loop; | 267 base::RunLoop loop; |
| 253 chromium_proxy->PassPickledEnum( | 268 chromium_proxy->PassPickledEnum( |
| 254 PickledEnumChromium::VALUE_2, | 269 PickledEnumChromium::VALUE_2, |
| 255 EnumFail<PickledEnumChromium>("Blink service should reject this.")); | 270 EnumFail<PickledEnumChromium>("Blink service should reject this.")); |
| 256 ExpectError(&chromium_proxy, loop.QuitClosure()); | 271 ExpectError(&chromium_proxy, loop.QuitClosure()); |
| 257 loop.Run(); | 272 loop.Run(); |
| 258 } | 273 } |
| 259 } | 274 } |
| 260 | 275 |
| 261 TEST_F(PickleTest, BlinkProxyToBlinkService) { | 276 TEST_F(PickleTest, MAYBE_BlinkProxyToBlinkService) { |
| 262 auto blink_proxy = ConnectToBlinkService(); | 277 auto blink_proxy = ConnectToBlinkService(); |
| 263 { | 278 { |
| 264 base::RunLoop loop; | 279 base::RunLoop loop; |
| 265 blink_proxy->PassPickledStruct( | 280 blink_proxy->PassPickledStruct( |
| 266 PickledStructBlink(1, 1), | 281 PickledStructBlink(1, 1), |
| 267 ExpectResult(PickledStructBlink(1, 1), loop.QuitClosure())); | 282 ExpectResult(PickledStructBlink(1, 1), loop.QuitClosure())); |
| 268 loop.Run(); | 283 loop.Run(); |
| 269 } | 284 } |
| 270 | 285 |
| 271 { | 286 { |
| 272 base::RunLoop loop; | 287 base::RunLoop loop; |
| 273 blink_proxy->PassPickledEnum( | 288 blink_proxy->PassPickledEnum( |
| 274 PickledEnumBlink::VALUE_0, | 289 PickledEnumBlink::VALUE_0, |
| 275 ExpectEnumResult(PickledEnumBlink::VALUE_0, loop.QuitClosure())); | 290 ExpectEnumResult(PickledEnumBlink::VALUE_0, loop.QuitClosure())); |
| 276 loop.Run(); | 291 loop.Run(); |
| 277 } | 292 } |
| 278 } | 293 } |
| 279 | 294 |
| 280 TEST_F(PickleTest, BlinkProxyToChromiumService) { | 295 TEST_F(PickleTest, MAYBE_BlinkProxyToChromiumService) { |
| 281 auto blink_proxy = ConnectToChromiumService<blink::PicklePasser>(); | 296 auto blink_proxy = ConnectToChromiumService<blink::PicklePasser>(); |
| 282 { | 297 { |
| 283 base::RunLoop loop; | 298 base::RunLoop loop; |
| 284 blink_proxy->PassPickledStruct( | 299 blink_proxy->PassPickledStruct( |
| 285 PickledStructBlink(1, 1), | 300 PickledStructBlink(1, 1), |
| 286 ExpectResult(PickledStructBlink(1, 1), loop.QuitClosure())); | 301 ExpectResult(PickledStructBlink(1, 1), loop.QuitClosure())); |
| 287 loop.Run(); | 302 loop.Run(); |
| 288 } | 303 } |
| 289 | 304 |
| 290 { | 305 { |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 EXPECT_EQ(PickledEnumChromium::VALUE_1, | 409 EXPECT_EQ(PickledEnumChromium::VALUE_1, |
| 395 passed->f_enum); | 410 passed->f_enum); |
| 396 run_loop.Quit(); | 411 run_loop.Quit(); |
| 397 })); | 412 })); |
| 398 run_loop.Run(); | 413 run_loop.Run(); |
| 399 } | 414 } |
| 400 } | 415 } |
| 401 | 416 |
| 402 } // namespace test | 417 } // namespace test |
| 403 } // namespace mojo | 418 } // namespace mojo |
| OLD | NEW |