← Back to branch summary

~unity-team/qtmir/dpr

« back to all changes in this revision

Viewing changes to tests/modules/SurfaceManager/mirsurfaceitem_test.cpp

  • Committer: Gerry Boland
  • Date: 2015-12-14 12:28:33 UTC
  • mfrom: (321.2.107 qtmir)
  • Revision ID: gerry.boland@canonical.com-20151214122833-gcdw2xaji4jd4027
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/modules/SurfaceManager/mirsurfaceitem_test.cpp
34
34
public:
35
35
    MirSurfaceItemTest()
36
36
    {
 
37
        setenv("QT_QPA_PLATFORM", "minimal", 1);
 
38
        int argc = 0;
 
39
        char **argv = nullptr;
 
40
        m_app = new QGuiApplication(argc, argv);
 
41
 
37
42
        // We don't want the logging spam cluttering the test results
38
 
        QLoggingCategory::setFilterRules(QStringLiteral("qtmir.surfaces=false"));        
39
 
    }
 
43
        QLoggingCategory::setFilterRules(QStringLiteral("qtmir.surfaces=false"));
 
44
    }
 
45
    virtual ~MirSurfaceItemTest()
 
46
    {
 
47
        delete m_app;
 
48
    }
 
49
    QGuiApplication *m_app;
40
50
};
41
51
 
42
52
/*
100
110
    delete fakeSurface;
101
111
}
102
112
 
103
 
TEST_F(MirSurfaceItemTest, DISABLED_SetSurfaceInitializesVisiblity)
 
113
TEST_F(MirSurfaceItemTest, SetSurfaceInitializesVisiblity)
104
114
{
105
115
    MirSurfaceItem *surfaceItem = new MirSurfaceItem;
106
116
    surfaceItem->setVisible(false);
107
 
    
 
117
 
108
118
    FakeMirSurface *fakeSurface = new FakeMirSurface;
109
119
    surfaceItem->setSurface(fakeSurface);
110
120
 
114
124
    delete fakeSurface;
115
125
}
116
126
 
117
 
TEST_F(MirSurfaceItemTest, DISABLED_ggregateSurfaceVisibility)
 
127
TEST_F(MirSurfaceItemTest, AggregateSurfaceVisibility)
118
128
{
119
129
    MirSurfaceItem *surfaceItem1 = new MirSurfaceItem;
120
130
    surfaceItem1->setVisible(true);
121
131
    MirSurfaceItem *surfaceItem2 = new MirSurfaceItem;
122
132
    surfaceItem1->setVisible(true);
123
 
    
 
133
 
124
134
    FakeMirSurface *fakeSurface = new FakeMirSurface;
125
135
    surfaceItem1->setSurface(fakeSurface);
126
136
    surfaceItem2->setSurface(fakeSurface);