Differential D3495 Diff 9197 autotests/integration/scene_qpainter_test.cpp

Changeset View

Standalone View

autotests/integration/scene_qpainter_test.cpp

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Line(s)
44	Q_OBJECT	44		Q_OBJECT
45	private Q_SLOTS:	45		private Q_SLOTS:
46	void initTestCase();	46		void initTestCase();
47	void cleanup();	47		void cleanup();
48	void testStartFrame();	48		void testStartFrame();
49	void testCursorMoving();	49		void testCursorMoving();
50	void testWindow_data();	50		void testWindow_data();
51	void testWindow();	51		void testWindow();
		52		void testWindowScaled();
52	void testCompositorRestart_data();	53		void testCompositorRestart_data();
53	void testCompositorRestart();	54		void testCompositorRestart();
54	};	55		};
55		56
56	void SceneQPainterTest::cleanup()	57		void SceneQPainterTest::cleanup()
57	{	58		{
58	Test::destroyWaylandConnection();	59		Test::destroyWaylandConnection();
59	}	60		}
▲ Show 20 Lines • Show All 125 Lines • ▼ Show 20 Line(s)		149	{
185	// let's move the cursor again	186		// let's move the cursor again
186	KWin::Cursor::setPos(10, 10);	187		KWin::Cursor::setPos(10, 10);
187	QVERIFY(frameRenderedSpy.wait());	188		QVERIFY(frameRenderedSpy.wait());
188	painter.fillRect(0, 0, 200, 300, Qt::blue);	189		painter.fillRect(0, 0, 200, 300, Qt::blue);
189	painter.fillRect(5, 5, 10, 10, Qt::red);	190		painter.fillRect(5, 5, 10, 10, Qt::red);
190	QCOMPARE(referenceImage, *scene->backend()->buffer());	191		QCOMPARE(referenceImage, *scene->backend()->buffer());
191	}	192		}
192		193
		194		void SceneQPainterTest::testWindowScaled()
		195		{
		196		KWin::Cursor::setPos(10, 10);
		197		// this test verifies that a window is rendered correctly
		198		using namespace KWayland::Client;
		199		QVERIFY(Test::waitForWaylandPointer());
			graesslinUnsubmitted Done you don't need to do the Test::setupWaylandConnection in the test, that's part of the init() graesslin: you don't need to do the Test::setupWaylandConnection in the test, that's part of the init()
		200		QScopedPointer<Surface> s(Test::createSurface());
		201		QScopedPointer<Pointer> p(Test::waylandSeat()->createPointer());
		202
		203		auto scene = qobject_cast<SceneQPainter*>(KWin::Compositor::self()->scene());
			graesslinUnsubmitted Done the idea of the Test::createShellSurface variant returning a QObject is to have a test_data() with the two supported modes, so that we test both WlShell and XdgShellUnstableV5. You can compare with other tests. If you want to only test WlShell there is a simplified setup method returning a ShellSurface instead of QObject. graesslin: the idea of the Test::createShellSurface variant returning a QObject is to have a test_data()…
			davidedmundsonAuthorUnsubmitted Not Done I don't really need a shell surface at all, I can just remove this. davidedmundson: I don't really need a shell surface at all, I can just remove this.
			graesslinUnsubmitted Not Done the test is called "testWindowScaled", but doesn't create a window. I'm slightly confused. graesslin: the test is called "testWindowScaled", but doesn't create a window. I'm slightly confused.
			davidedmundsonAuthorUnsubmitted Not Done It creates a surface on line 200. What's the difference between a top level mapped surface and a window? davidedmundson: It creates a surface on line 200. What's the difference between a top level mapped surface…
			graesslinUnsubmitted Not Done A surface is something you can attach a buffer to. It's not a window but a wrapper for anything which might need a buffer. E.g. a cursor image. That's what you use in this test. You can create a window from a surface by creating a wl_shell or xgd_shell surface (note it's also called a surface) from it. This will on KWin side then create a ShellClient which represents a window. And I think that's what you want to test as that's what needs to be scaled. graesslin: A surface is something you can attach a buffer to. It's not a window but a wrapper for anything…
			davidedmundsonAuthorUnsubmitted Not Done yeah, sorry. I got confused. You were right. davidedmundson: yeah, sorry. I got confused. You were right.
		204		QVERIFY(scene);
		205		QSignalSpy frameRenderedSpy(scene, &Scene::frameRendered);
		206		QVERIFY(frameRenderedSpy.isValid());
		207
		208		// now let's set a cursor image
		209		QScopedPointer<Surface> cs(Test::createSurface());
		210		QVERIFY(!cs.isNull());
		211		Test::render(cs.data(), QSize(10, 10), Qt::red);
		212		p->setCursor(cs.data(), QPoint(5, 5));
		213
		214		// now let's map the window
		215		s->setScale(2);
		216		QVERIFY(Test::renderAndWaitForShown(s.data(), QSize(400, 600), Qt::blue));
		217
		218		// which should trigger a frame
		219		if (frameRenderedSpy.isEmpty()) {
		220		QVERIFY(frameRenderedSpy.wait());
		221		}
		222		QImage referenceImage(QSize(1280, 1024), QImage::Format_RGB32);
		223		referenceImage.fill(Qt::black);
		224		QPainter painter(&referenceImage);
		225		painter.fillRect(0, 0, 200, 300, Qt::blue);
		226		painter.fillRect(5, 5, 10, 10, Qt::red); //cursor
		227
		228		QCOMPARE(referenceImage, *scene->backend()->buffer());
		229		}
		230
193	void SceneQPainterTest::testCompositorRestart_data()	231		void SceneQPainterTest::testCompositorRestart_data()
			graesslinUnsubmitted Done why are you saving to the tmp directory? graesslin: why are you saving to the tmp directory?
194	{	232		{
195	QTest::addColumn<Test::ShellSurfaceType>("type");	233		QTest::addColumn<Test::ShellSurfaceType>("type");
196		234
197	QTest::newRow("wlShell") << Test::ShellSurfaceType::WlShell;	235		QTest::newRow("wlShell") << Test::ShellSurfaceType::WlShell;
198	QTest::newRow("xdgShellV5") << Test::ShellSurfaceType::XdgShellV5;	236		QTest::newRow("xdgShellV5") << Test::ShellSurfaceType::XdgShellV5;
199	}	237		}
200		238
201	void SceneQPainterTest::testCompositorRestart()	239		void SceneQPainterTest::testCompositorRestart()
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines