fixing tests

MerginMaps · Nov 5, 2024 · b574a27 · b574a27
1 parent 78a5a00
commit b574a27
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/app/test/testmerginapi.cpp b/app/test/testmerginapi.cpp
@@ -2945,29 +2945,34 @@ void TestMerginApi::testParseVersion()
 
 void TestMerginApi::testDownloadWithNetworkError()
 {
-  // MockNetworkManager *mockManager = new MockNetworkManager( mApi );
-  // mApi->setNetworkManager( mockManager );
+    QString projectName = "testDownloadWithNetworkError";
+    QString projectNamespace = mWorkspaceName;
 
-  // QString projectName = "testDownloadWithNetworkError";
-  // QString projectNamespace = mWorkspaceName;
-  // createRemoteProject( mApiExtra, projectNamespace, projectName, mTestDataPath + "/" + TEST_PROJECT_NAME + "/" );
+    // Create a test project on server
+    createRemoteProject( mApiExtra, projectNamespace, projectName, mTestDataPath + "/" + TEST_PROJECT_NAME + "/" );
 
-  // mockManager->setShouldFail( true );
+    // Create mock network manager
+    MockNetworkManager *mockManager = new MockNetworkManager( mApi );
+    mApi->setNetworkManager( mockManager );
 
-  // QSignalSpy spy( mApi, &MerginApi::syncProjectFinished );
-  // QSignalSpy errorSpy( mApi, &MerginApi::networkErrorOccurred );
+    // Track retry signals
+    QSignalSpy retrySpy( mApi, &MerginApi::downloadItemRetried );
 
-  // mApi->pullProject( projectNamespace, projectName );
+    // Start download and make network fail after project info
+    mApi->pullProject( projectNamespace, projectName );
 
-  // QVERIFY( spy.wait( TestUtils::LONG_REPLY * 5 ) );
+    QSignalSpy pullStartedSpy( mApi, &MerginApi::pullFilesStarted );
+    QVERIFY( pullStartedSpy.wait( TestUtils::SHORT_REPLY ) );
+    mockManager->setShouldFail( true );
 
-  // QCOMPARE( spy.count(), 1 );
-  // QList<QVariant> arguments = spy.takeFirst();
-  // QVERIFY( !arguments.at( 1 ).toBool() );
+    // Wait for sync to finish
+    QSignalSpy syncFinishedSpy( mApi, &MerginApi::syncProjectFinished );
+    QVERIFY( syncFinishedSpy.wait( TestUtils::LONG_REPLY ) );
 
-  // QCOMPARE( errorSpy.count(), 1 );
+    // Verify we got retry signals
+    QVERIFY( retrySpy.count() > 0 );
 
-  // mApi->setNetworkManager( new QNetworkAccessManager( mApi ) );
-
-  // deleteRemoteProjectNow( mApi, projectNamespace, projectName );
+    // Cleanup
+    mApi->setNetworkManager( new QNetworkAccessManager( mApi ) );
+    deleteRemoteProjectNow( mApi, projectNamespace, projectName );
 }
diff --git a/core/merginapi.cpp b/core/merginapi.cpp
@@ -430,6 +430,8 @@ void MerginApi::downloadItemReplyFinished( DownloadQueueItem item )
     CoreUtils::log( "pull " + projectFullName, QStringLiteral( "Retrying download (attempt %1 of 5)" ).arg( transaction.retryCount ) );
 
     downloadNextItem( projectFullName );
+
+    emit downloadItemRetried( projectFullName, transaction.retryCount );
     transaction.replyPullItems.remove( r );
     r->deleteLater();
   }

diff --git a/core/merginapi.h b/core/merginapi.h
@@ -667,6 +667,8 @@ class MerginApi: public QObject
     void serverWasUpgraded();
     void networkManagerChanged();
 
+    void downloadItemRetried( const QString &projectFullName, int retryCount );
+
   private slots:
     void listProjectsReplyFinished( QString requestId );
     void listProjectsByNameReplyFinished( QString requestId );