600 - EXPECT_THAT(last_event_surface, Eq(surface)); 601 - EXPECT_THAT(last_event.type, Eq(mir_event_type_surface)); 602 - EXPECT_THAT(last_event.surface.id, Eq(surface_id)); 603 - EXPECT_THAT(last_event.surface.attrib, Eq(mir_surface_attrib_state)); 604 - EXPECT_THAT(last_event.surface.value, Eq(mir_surface_state_minimized)); 605 - } 606 - 607 - reset_last_event(); 608 - 609 - { 610 - mir_wait_for(mir_surface_set_state(surface, static_cast<MirSurfaceState>(777))); 611 - mir_wait_for(mir_surface_set_state(other_surface, mir_surface_state_maximized)); 612 - 613 - std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; 614 - 615 - EXPECT_THAT(last_event_surface, IsNull()); 616 - EXPECT_THAT(last_event.type, Eq(0)); 617 - EXPECT_THAT(last_event.surface.id, Eq(0)); 618 - EXPECT_THAT(last_event.surface.attrib, Eq(0)); 619 - EXPECT_THAT(last_event.surface.value, Eq(0)); 620 + EXPECT_THAT(last_event, mt::SurfaceEvent(mir_surface_attrib_state, mir_surface_state_minimized));
this test has been weakened to deal with fewer state changes.
« Back to merge proposal
600 - EXPECT_ THAT(last_ event_surface, Eq(surface)); THAT(last_ event.type, Eq(mir_ event_type_ surface) ); THAT(last_ event.surface. id, Eq(surface_id)); THAT(last_ event.surface. attrib, Eq(mir_ surface_ attrib_ state)) ; THAT(last_ event.surface. value, Eq(mir_ surface_ state_minimized )); for(mir_ surface_ set_state( surface, static_ cast<MirSurface State>( 777))); for(mir_ surface_ set_state( other_surface, mir_surface_ state_maximized )); guard<decltype( last_event_ mutex)> last_event_ lock{last_ event_mutex} ; THAT(last_ event_surface, IsNull()); THAT(last_ event.type, Eq(0)); THAT(last_ event.surface. id, Eq(0)); THAT(last_ event.surface. attrib, Eq(0)); THAT(last_ event.surface. value, Eq(0)); THAT(last_ event, mt::SurfaceEven t(mir_surface_ attrib_ state, mir_surface_ state_minimized ));
601 - EXPECT_
602 - EXPECT_
603 - EXPECT_
604 - EXPECT_
605 - }
606 -
607 - reset_last_event();
608 -
609 - {
610 - mir_wait_
611 - mir_wait_
612 -
613 - std::lock_
614 -
615 - EXPECT_
616 - EXPECT_
617 - EXPECT_
618 - EXPECT_
619 - EXPECT_
620 + EXPECT_
this test has been weakened to deal with fewer state changes.