~kgunn72/mir/dont-crash-when-shooting-invalid-surface

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp

  • Committer: Tarmac
  • Author(s): Alan Griffiths, Alexandros Frantzis, Daniel van Vugt, Kevin DuBois, Christopher James Halse Rogers, chris.gagnon, Mathieu Trudel-Lapierre, Robert Carr, Automatic PS uploader, Kevin Gunn, Daniel d'Andrada, Christopher James Halse Rogers, Michael Terry, Brandon Schaefer, Timo Jyrinki, Mir Team, Andreas Pokorny
  • Date: 2013-12-20 11:11:22 UTC
  • mfrom: (1169.1.1 version-0.1.3)
  • Revision ID: tarmac-20131220111122-h503fd1fnq7pn9za
Latest upstream release: Mir 0.1.3 (r1298).

Approved by Alan Griffiths, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
17
17
 */
18
18
 
19
 
#include "src/server/graphics/gbm/overlapping_output_grouping.h"
 
19
#include "src/platform/graphics/mesa/overlapping_output_grouping.h"
20
20
#include "mir/graphics/display_configuration.h"
21
21
#include "mir/geometry/rectangle.h"
22
22
#include "mir/geometry/rectangles.h"
28
28
#include <tuple>
29
29
 
30
30
namespace mg = mir::graphics;
31
 
namespace mgg = mir::graphics::gbm;
 
31
namespace mgm = mir::graphics::mesa;
32
32
namespace geom = mir::geometry;
33
33
 
34
34
namespace
103
103
                         std::vector<geom::Rectangles> const& expected_groups)
104
104
    {
105
105
        StubDisplayConfiguration conf{info};
106
 
        mgg::OverlappingOutputGrouping grouping{conf};
 
106
        mgm::OverlappingOutputGrouping grouping{conf};
107
107
 
108
108
        std::vector<std::vector<mg::DisplayConfigurationOutput>> grouping_results;
109
109
 
110
110
        grouping.for_each_group(
111
 
            [&](mgg::OverlappingOutputGroup const& group)
 
111
            [&](mgm::OverlappingOutputGroup const& group)
112
112
            {
113
113
                std::vector<mg::DisplayConfigurationOutput> outputs;
114
114
                group.for_each_output([&](mg::DisplayConfigurationOutput const& output)