1623 + //auto buffer_package = std::make_shared<MirBufferPackage>(); 1624 + //ON_CALL(*this, native_buffer_handle()) 1625 + // .WillByDefault(Return(buffer_package));
don't keep dead code in comments.
1673 +#if 0 1674 TEST_F(MirClientSurfaceTest, client_buffer_uses_ipc_message_from_server_on_create) 1675 { 1676 using namespace testing; 1677 @@ -391,6 +394,7 @@ 1678 /* check for same contents */ 1679 EXPECT_THAT(*submitted_package, BufferPackageMatches(mock_server_tool->server_package)); 1680 } 1681 +#endif
don't keep dead code in conditionals.
1689 +#if 0 1690 TEST_F(MirClientSurfaceTest, get_buffer_returns_last_received_buffer_package) 1691 { 1692 using namespace testing; 1693 @@ -520,7 +525,7 @@ 1694 1695 EXPECT_THAT(*surface->get_current_buffer_package(), BufferPackageMatches(mock_server_tool->server_package)); 1696 } 1697 - 1698 +#endif
« Back to merge proposal
1623 + //auto buffer_package = std::make_ shared< MirBufferPackag e>(); buffer_ handle( )) Return( buffer_ package) );
1624 + //ON_CALL(*this, native_
1625 + // .WillByDefault(
don't keep dead code in comments.
1673 +#if 0 MirClientSurfac eTest, client_ buffer_ uses_ipc_ message_ from_server_ on_create) THAT(*submitted _package, BufferPackageMa tches(mock_ server_ tool->server_ package) );
1674 TEST_F(
1675 {
1676 using namespace testing;
1677 @@ -391,6 +394,7 @@
1678 /* check for same contents */
1679 EXPECT_
1680 }
1681 +#endif
don't keep dead code in conditionals.
1689 +#if 0 MirClientSurfac eTest, get_buffer_ returns_ last_received_ buffer_ package) THAT(*surface- >get_current_ buffer_ package( ), BufferPackageMa tches(mock_ server_ tool->server_ package) );
1690 TEST_F(
1691 {
1692 using namespace testing;
1693 @@ -520,7 +525,7 @@
1694
1695 EXPECT_
1696 }
1697 -
1698 +#endif
don't keep dead code in conditionals.