feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Vcs: Fix some of the clear case tests

Browse Source 
We get the updates now delayed, so wait for them.

Change-Id: I53ad5ec5d881bbc87ca8c6becceda6fd9e1e3c43
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2024-11-01 12:00:09 +01:00
parent a57b8f493e
commit 1ccaafb93e
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -65,6 +65,7 @@
#include <QMetaObject> #include <QMetaObject>
#include <QMutex> #include <QMutex>
#include <QRegularExpression> #include <QRegularExpression>
#include <QSignalSpy>
#include <QTextCodec> #include <QTextCodec>
#include <QUuid> #include <QUuid>
#include <QVBoxLayout> #include <QVBoxLayout>
@@ -2673,10 +2674,12 @@ void ClearCaseTest::testStatusActions()
QFETCH(int, status); QFETCH(int, status);
auto tempStatus = static_cast<FileStatus::Status>(status); auto tempStatus = static_cast<FileStatus::Status>(status);
QSignalSpy spy(dd, &VcsBase::VersionControlBase::slotStateChangedDone);
// special case: file should appear as "Unknown" since there is no entry in the index // special case: file should appear as "Unknown" since there is no entry in the index
// and we don't want to explicitly set the status for this test case // and we don't want to explicitly set the status for this test case
if (tempStatus != FileStatus::Unknown) if (tempStatus != FileStatus::Unknown)
dd->setStatus(fileName, tempStatus, true); dd->setStatus(fileName, tempStatus, true);
QVERIFY(spy.wait(1000));
QFETCH(bool, checkOutAction); QFETCH(bool, checkOutAction);
QFETCH(bool, undoCheckOutAction); QFETCH(bool, undoCheckOutAction);
@@ -2712,7 +2715,6 @@ void ClearCaseTest::testVcsStatusDynamicReadonlyNotManaged()
dd->m_viewData = testCase.dummyViewData(); dd->m_viewData = testCase.dummyViewData();
dd->m_viewData.isDynamic = true; dd->m_viewData.isDynamic = true;
QCOMPARE(dd->vcsStatus(fileName).status, FileStatus::NotManaged); QCOMPARE(dd->vcsStatus(fileName).status, FileStatus::NotManaged);
} }

3
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -552,6 +552,9 @@ void VersionControlBase::slotStateChanged(const Internal::State &newInternalStat
} }
ICore::removeAdditionalContext(m_context); ICore::removeAdditionalContext(m_context);
} }
#ifdef WITH_TESTS
emit slotStateChangedDone();
#endif
} }
const VcsBasePluginState &VersionControlBase::currentState() const const VcsBasePluginState &VersionControlBase::currentState() const

5
src/plugins/vcsbase/vcsbaseplugin.h
View File

@@ -176,6 +176,11 @@ protected:
// Returns whether actions should be set up further. // Returns whether actions should be set up further.
bool enableMenuAction(ActionState as, QAction *in) const; bool enableMenuAction(ActionState as, QAction *in) const;
#if WITH_TESTS
signals:
void slotStateChangedDone();
#endif
private: private:
void slotStateChanged(const Internal::State &s, Core::IVersionControl *vc); void slotStateChanged(const Internal::State &s, Core::IVersionControl *vc);