@@ -44,51 +44,49 @@ private slots:
4444
4545 void testSingletonInstance ()
4646 {
47-
4847 auto *manager1 = E2EFolderManager::instance ();
4948 auto *manager2 = E2EFolderManager::instance ();
5049
51- QVERIFY (manager1 != nullptr );
50+ QVERIFY (manager1);
5251 QCOMPARE (manager1, manager2);
5352 }
5453
5554 void testInitializeWithNoAccounts ()
5655 {
57-
58- QCOMPARE (AccountManager::instance ()->accounts ().size (), 0 );
56+ QVERIFY (AccountManager::instance ()->accounts ().isEmpty ());
5957
6058 auto *manager = E2EFolderManager::instance ();
6159
62- QVERIFY (manager != nullptr );
60+ QVERIFY (manager);
6361 }
6462
6563 void testInitializeWithExistingAccount ()
6664 {
67-
6865 auto account = Account::create ();
6966 account->setCredentials (new FakeCredentials{new FakeQNAM ({})});
7067 account->setUrl (QUrl (" http://example.com" ));
7168
72- [[maybe_unused]] auto accountState = new AccountState (account);
69+ auto accountState = new AccountState (account);
70+ accountState->setParent (this );
7371 AccountManager::instance ()->addAccount (account);
7472
7573 auto *manager = E2EFolderManager::instance ();
7674
77- QVERIFY (manager != nullptr );
75+ QVERIFY (manager);
7876 QCOMPARE (AccountManager::instance ()->accounts ().size (), 1 );
7977 }
8078
8179 void testAccountAddedSignal ()
8280 {
83-
8481 auto *manager = E2EFolderManager::instance ();
85- QVERIFY (manager != nullptr );
82+ QVERIFY (manager);
8683
8784 auto account = Account::create ();
8885 account->setCredentials (new FakeCredentials{new FakeQNAM ({})});
8986 account->setUrl (QUrl (" http://example.com" ));
9087
91- [[maybe_unused]] auto accountState = new AccountState (account);
88+ auto accountState = new AccountState (account);
89+ accountState->setParent (this );
9290
9391 // Spy on the accountAdded signal to verify E2EFolderManager reacts to it
9492 QSignalSpy accountAddedSpy (AccountManager::instance (), &AccountManager::accountAdded);
@@ -116,12 +114,13 @@ private slots:
116114 };
117115 account->setCapabilities (capabilities);
118116
119- [[maybe_unused]] auto accountState = new AccountState (account);
117+ auto accountState = new AccountState (account);
118+ accountState->setParent (this );
120119 AccountManager::instance ()->addAccount (account);
121120
122121 // E2EFolderManager is initialized via constructor when instance() is called
123122 auto *manager = E2EFolderManager::instance ();
124- QVERIFY (manager != nullptr );
123+ QVERIFY (manager);
125124
126125 QVERIFY (account->e2e ());
127126
@@ -133,7 +132,6 @@ private slots:
133132
134133 void testNoRestorationWhenE2ENotInitialized ()
135134 {
136-
137135 auto account = Account::create ();
138136 account->setCredentials (new FakeCredentials{new FakeQNAM ({})});
139137 account->setUrl (QUrl (" http://example.com" ));
@@ -146,7 +144,6 @@ private slots:
146144
147145 void testMultipleAccountsHandling ()
148146 {
149-
150147 auto account1 = Account::create ();
151148 account1->setCredentials (new FakeCredentials{new FakeQNAM ({})});
152149 account1->setUrl (QUrl (" http://example1.com" ));
@@ -155,15 +152,17 @@ private slots:
155152 account2->setCredentials (new FakeCredentials{new FakeQNAM ({})});
156153 account2->setUrl (QUrl (" http://example2.com" ));
157154
158- [[maybe_unused]] auto accountState1 = new AccountState (account1);
159- [[maybe_unused]] auto accountState2 = new AccountState (account2);
155+ auto accountState1 = new AccountState (account1);
156+ auto accountState2 = new AccountState (account2);
157+ accountState1->setParent (this );
158+ accountState2->setParent (this );
160159
161160 AccountManager::instance ()->addAccount (account1);
162161 AccountManager::instance ()->addAccount (account2);
163162
164163 auto *manager = E2EFolderManager::instance ();
165164
166- QVERIFY (manager != nullptr );
165+ QVERIFY (manager);
167166 QCOMPARE (AccountManager::instance ()->accounts ().size (), 2 );
168167 }
169168
@@ -187,13 +186,14 @@ private slots:
187186 };
188187 account->setCapabilities (capabilities);
189188
190- [[maybe_unused]] auto accountState = new AccountState (account);
189+ auto accountState = new AccountState (account);
190+ accountState->setParent (this );
191191 AccountManager::instance ()->addAccount (account);
192192
193193 // E2EFolderManager connects to account's E2E signals in its constructor
194194 auto *manager = E2EFolderManager::instance ();
195195
196- QVERIFY (manager != nullptr );
196+ QVERIFY (manager);
197197 QCOMPARE (AccountManager::instance ()->accounts ().size (), 1 );
198198 }
199199
@@ -227,8 +227,10 @@ private slots:
227227 };
228228 account2->setCapabilities (capabilities2);
229229
230- [[maybe_unused]] auto accountState1 = new AccountState (account1);
231- [[maybe_unused]] auto accountState2 = new AccountState (account2);
230+ auto accountState1 = new AccountState (account1);
231+ auto accountState2 = new AccountState (account2);
232+ accountState1->setParent (this );
233+ accountState2->setParent (this );
232234
233235 AccountManager::instance ()->addAccount (account1);
234236 AccountManager::instance ()->addAccount (account2);
@@ -237,7 +239,7 @@ private slots:
237239 auto *manager = E2EFolderManager::instance ();
238240
239241 // Verify manager handles both accounts
240- QVERIFY (manager != nullptr );
242+ QVERIFY (manager);
241243 QCOMPARE (AccountManager::instance ()->accounts ().size (), 2 );
242244
243245 // Verify each account has its own E2E instance
@@ -248,7 +250,6 @@ private slots:
248250
249251 void testScenario1_FoldersRestoreAfterRestart ()
250252 {
251-
252253 // Verify E2E folders marked for restoration are processed when E2E initializes
253254 QTemporaryDir dir;
254255 ConfigFile::setConfDir (dir.path ());
@@ -265,7 +266,8 @@ private slots:
265266 };
266267 account->setCapabilities (capabilities);
267268
268- [[maybe_unused]] auto accountState = new AccountState (account);
269+ auto accountState = new AccountState (account);
270+ accountState->setParent (this );
269271 AccountManager::instance ()->addAccount (account);
270272
271273 // Simulate folders blacklisted during startup (before E2E initialized)
@@ -288,13 +290,12 @@ private slots:
288290
289291 // E2EFolderManager is ready to restore folders when E2E signal fires
290292 auto *manager = E2EFolderManager::instance ();
291- QVERIFY (manager != nullptr );
293+ QVERIFY (manager);
292294 QVERIFY (account->e2e ());
293295 }
294296
295297 void testScenario5_MultipleFoldersTrackedForRestoration ()
296298 {
297-
298299 // Verify multiple E2E folders can be tracked and restored
299300 QTemporaryDir dir;
300301 QString dbPath = dir.path () + " /.sync_test.db" ;
@@ -336,7 +337,6 @@ private slots:
336337
337338 void testScenario6_UserBlacklistPreserved ()
338339 {
339-
340340 // Verify user-blacklisted folders are NOT added to restoration list
341341 QTemporaryDir dir;
342342 QString dbPath = dir.path () + " /.sync_test.db" ;
0 commit comments