Differential D1672 Diff 4000 autotests/client/test_fake_input.cpp

Changeset View

Standalone View

autotests/client/test_fake_input.cpp

Show First 20 Lines • Show All 44 Lines • ▼ Show 20 Line(s)		41	private Q_SLOTS:
45	void testAuthenticate();	45		void testAuthenticate();
46	void testMotion();	46		void testMotion();
47	void testPointerButtonQt_data();	47		void testPointerButtonQt_data();
48	void testPointerButtonQt();	48		void testPointerButtonQt();
49	void testPointerButtonLinux_data();	49		void testPointerButtonLinux_data();
50	void testPointerButtonLinux();	50		void testPointerButtonLinux();
51	void testAxis_data();	51		void testAxis_data();
52	void testAxis();	52		void testAxis();
		53		void testTouch();
53		54
54	private:	55		private:
55	Display *m_display = nullptr;	56		Display *m_display = nullptr;
56	FakeInputInterface *m_fakeInputInterface = nullptr;	57		FakeInputInterface *m_fakeInputInterface = nullptr;
57	FakeInputDevice *m_device = nullptr;	58		FakeInputDevice *m_device = nullptr;
58	ConnectionThread *m_connection = nullptr;	59		ConnectionThread *m_connection = nullptr;
59	QThread *m_thread = nullptr;	60		QThread *m_thread = nullptr;
60	EventQueue *m_queue = nullptr;	61		EventQueue *m_queue = nullptr;
▲ Show 20 Lines • Show All 251 Lines • ▼ Show 20 Line(s)		298	{
312	// now we can properly test	313		// now we can properly test
313	m_fakeInput->requestPointerAxis(orientation, delta);	314		m_fakeInput->requestPointerAxis(orientation, delta);
314	QVERIFY(axisSpy.wait());	315		QVERIFY(axisSpy.wait());
315	QCOMPARE(axisSpy.count(), 1);	316		QCOMPARE(axisSpy.count(), 1);
316	QCOMPARE(axisSpy.first().at(0).value<Qt::Orientation>(), orientation);	317		QCOMPARE(axisSpy.first().at(0).value<Qt::Orientation>(), orientation);
317	QCOMPARE(axisSpy.first().at(1).value<qreal>(), delta);	318		QCOMPARE(axisSpy.first().at(1).value<qreal>(), delta);
318	}	319		}
319		320
		321		void FakeInputTest::testTouch()
		322		{
		323		QVERIFY(!m_device->isAuthenticated());
		324		QSignalSpy touchDownSpy(m_device, &FakeInputDevice::touchDownRequested);
		325		QVERIFY(touchDownSpy.isValid());
		326		QSignalSpy touchMotionSpy(m_device, &FakeInputDevice::touchMotionRequested);
		327		QVERIFY(touchMotionSpy.isValid());
		328		QSignalSpy touchUpSpy(m_device, &FakeInputDevice::touchUpRequested);
			bshahUnsubmitted Not Done In addition to what @graesslin said, one point about coding style, KWayland is part of KF5 which follows KDE Frameworks 5 Coding style guide for its code. You seem to have used inconsistent coding style for code here and as well other places. Please go over all the code you have added and correct it. bshah: In addition to what @graesslin said, one point about coding style, KWayland is part of KF5…
		329		QVERIFY(touchUpSpy.isValid());
		330		QSignalSpy touchFrameSpy(m_device, &FakeInputDevice::touchFrameRequested);
		331		QVERIFY(touchFrameSpy.isValid());
		332		QSignalSpy touchCancelSpy(m_device, &FakeInputDevice::touchCancelRequested);
		333		QVERIFY(touchCancelSpy.isValid());
		334
		335		// without an authentication we shouldn't get the signals
		336		m_fakeInput->requestTouchDown(0, QPointF(1, 2));
		337		QVERIFY(!touchDownSpy.wait(100));
		338
		339		m_fakeInput->requestTouchMotion(0, QPointF(3, 4));
		340		QVERIFY(!touchMotionSpy.wait(100));
		341
		342		m_fakeInput->requestTouchUp(0);
		343		QVERIFY(!touchUpSpy.wait(100));
		344
		345		m_fakeInput->requestTouchDown(1, QPointF(5, 6));
		346		QVERIFY(!touchDownSpy.wait(100));
		347
		348		m_fakeInput->requestTouchFrame();
		349		QVERIFY(!touchFrameSpy.wait(100));
		350
		351		m_fakeInput->requestTouchCancel();
		352		QVERIFY(!touchCancelSpy.wait(100));
		353
		354		// now let's authenticate the interface
		355		m_device->setAuthentication(true);
		356		m_fakeInput->requestTouchDown(0, QPointF(1, 2));
		357		QVERIFY(touchDownSpy.wait());
		358		QCOMPARE(touchDownSpy.count(), 1);
		359		QCOMPARE(touchDownSpy.last().at(0).value<quint32>(), quint32(0));
		360		QCOMPARE(touchDownSpy.last().at(1).toPointF(), QPointF(1, 2));
		361
		362		m_fakeInput->requestTouchMotion(0, QPointF(3, 4));
		363		QVERIFY(touchMotionSpy.wait());
		364		QCOMPARE(touchMotionSpy.count(), 1);
		365		QCOMPARE(touchMotionSpy.last().at(0).value<quint32>(), quint32(0));
		366		QCOMPARE(touchMotionSpy.last().at(1).toPointF(), QPointF(3, 4));
		367
		368		m_fakeInput->requestTouchUp(0);
		369		QVERIFY(touchUpSpy.wait());
		370		QCOMPARE(touchUpSpy.count(), 1);
		371		QCOMPARE(touchUpSpy.last().at(0).value<quint32>(), quint32(0));
		372
		373		m_fakeInput->requestTouchDown(1, QPointF(5, 6));
		374		QVERIFY(touchDownSpy.wait());
		375		QCOMPARE(touchDownSpy.count(), 2);
		376		QCOMPARE(touchDownSpy.last().at(0).value<quint32>(), quint32(1));
		377		QCOMPARE(touchDownSpy.last().at(1).toPointF(), QPointF(5, 6));
		378
		379		m_fakeInput->requestTouchFrame();
		380		QVERIFY(touchFrameSpy.wait());
		381		QCOMPARE(touchFrameSpy.count(), 1);
		382
		383		m_fakeInput->requestTouchCancel();
		384		QVERIFY(touchCancelSpy.wait());
		385		QCOMPARE(touchCancelSpy.count(), 1);
		386		}
		387
		388
320	QTEST_GUILESS_MAIN(FakeInputTest)	389		QTEST_GUILESS_MAIN(FakeInputTest)
321	#include "test_fake_input.moc"	390		#include "test_fake_input.moc"