Differential D11534 Diff 30067 tests/core-impl/logger/TestProxyLogger.cpp

Changeset View

Standalone View

View Options

tests/core-impl/logger/TestProxyLogger.cpp

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Line(s)
70public: 70​public:
71 ProgressJob() : deleteJob( false ), deleteObject( false ) {} 71​ ProgressJob() : deleteJob( false ), deleteObject( false ) {}
72 void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) 72​ void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread)
73 { 73​ {
74 Q_UNUSED(self); 74​ Q_UNUSED(self);
75 Q_UNUSED(thread); 75​ Q_UNUSED(thread);
76 KJob *job = new DummyJob(); 76​ KJob *job = new DummyJob();
77 QObject *obj = new QObject(); 77​ QObject *obj = new QObject();
78 s_logger->newProgressOperation( job, QString( "foo" ), obj, "foo()" ); 78​ s_logger->newProgressOperation( job, QString( "foo" ), obj );
79 79​
80 if( deleteJob ) delete job; 80​ if( deleteJob ) delete job;
81 if( deleteObject ) delete obj; 81​ if( deleteObject ) delete obj;
82 } 82​ }
83 83​
84 bool deleteJob; 84​ bool deleteJob;
85 bool deleteObject; 85​ bool deleteObject;
86 86​
Show All 24 Lines
111}; 111​};
112 112​
113void 113​void
114TestProxyLogger::testDoNotForwardDeletedJob() 114​TestProxyLogger::testDoNotForwardDeletedJob()
115{ 115​{
116 s_logger = new ProxyLogger(); 116​ s_logger = new ProxyLogger();
117 117​
118 Amarok::MockLogger *mock = new Amarok::MockLogger(); 118​ Amarok::MockLogger *mock = new Amarok::MockLogger();
119 EXPECT_CALL( *mock, newProgressOperation( An<KJob*>(), _, _, _, _ ) ).Times( 0 ); 119​ EXPECT_CALL( *mock, newProgressOperationImpl( An<KJob*>(), _, _, _, _ ) ).Times( 0 );
120 120​
121 s_logger->setLogger( mock ); 121​ s_logger->setLogger( mock );
122 122​
123 ProgressJob *job = new ProgressJob(); 123​ ProgressJob *job = new ProgressJob();
124 job->deleteJob = true; 124​ job->deleteJob = true;
125 ThreadWeaver::Queue::instance()->enqueue( QSharedPointer<ThreadWeaver::Job>(job) ); 125​ ThreadWeaver::Queue::instance()->enqueue( QSharedPointer<ThreadWeaver::Job>(job) );
126 126​
127 QTest::qSleep( 10 ); //ensure that the job has time to run 127​ QTest::qSleep( 10 ); //ensure that the job has time to run
128 QTest::qWait( 20 ); //give the ProxyLogger-internal timer time to fire 128​ QTest::qWait( 20 ); //give the ProxyLogger-internal timer time to fire
129 129​
130 QVERIFY( Mock::VerifyAndClearExpectations( &mock ) ); 130​ QVERIFY( Mock::VerifyAndClearExpectations( &mock ) );
131 delete mock; 131​ delete mock;
132} 132​}
133 133​
134void 134​void
135TestProxyLogger::testDoNotForwardDeletedSlot() 135​TestProxyLogger::testDoNotForwardDeletedSlot()
136{ 136​{
137 s_logger = new ProxyLogger(); 137​ s_logger = new ProxyLogger();
138 138​
139 Amarok::MockLogger *mock = new Amarok::MockLogger(); 139​ Amarok::MockLogger *mock = new Amarok::MockLogger();
140 EXPECT_CALL( *mock, newProgressOperation( An<KJob*>(), _, 0, 0, _ ) ).Times( 1 ).WillOnce( Return() ); 140​ EXPECT_CALL( *mock, newProgressOperationImpl( An<KJob*>(), _, nullptr, _, _ ) ).Times( 1 ).WillOnce( Return() );
141 141​
142 s_logger->setLogger( mock ); 142​ s_logger->setLogger( mock );
143 143​
144 ProgressJob *job = new ProgressJob(); 144​ ProgressJob *job = new ProgressJob();
145 job->deleteObject = true; 145​ job->deleteObject = true;
146 ThreadWeaver::Queue::instance()->enqueue( QSharedPointer<ThreadWeaver::Job>(job) ); 146​ ThreadWeaver::Queue::instance()->enqueue( QSharedPointer<ThreadWeaver::Job>(job) );
147 147​
148 QTest::qSleep( 10 ); //ensure that the job has time to run 148​ QTest::qSleep( 10 ); //ensure that the job has time to run
Show All 22 Lines
171} 171​}
172 172​
173void 173​void
174TestProxyLogger::testForwardProgressOperation() 174​TestProxyLogger::testForwardProgressOperation()
175{ 175​{
176 s_logger = new ProxyLogger(); 176​ s_logger = new ProxyLogger();
177 177​
178 Amarok::MockLogger *mock = new Amarok::MockLogger(); 178​ Amarok::MockLogger *mock = new Amarok::MockLogger();
179 EXPECT_CALL( *mock, newProgressOperation( An<KJob*>(), _, _, _, _ ) ).Times( 1 ).WillOnce( Return() ); 179​ EXPECT_CALL( *mock, newProgressOperationImpl( An<KJob*>(), _, _, _, _ ) ).Times( 1 ).WillOnce( Return() );
180 180​
181 s_logger->setLogger( mock ); 181​ s_logger->setLogger( mock );
182 182​
183 s_logger->newProgressOperation( new DummyJob(), QString( "foo" ) ); 183​ s_logger->newProgressOperation( new DummyJob(), QString( "foo" ) );
184 184​
185 QTest::qWait( 20 ); 185​ QTest::qWait( 20 );
186 186​
187 QVERIFY( Mock::VerifyAndClearExpectations( &mock ) ); 187​ QVERIFY( Mock::VerifyAndClearExpectations( &mock ) );
Show All 22 Lines