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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/projectwizardpage.cpp
	src/plugins/projectexplorer/xcodebuildparser.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp
	src/tools/clangbackend/ipcsource/translationunits.cpp

Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
This commit is contained in:
Eike Ziller
2016-05-03 11:49:01 +02:00
parent 5fa52d2ff9 9b69b789ab
commit 0f94aa3f4d
169 changed files with 4156 additions and 1867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/unit/unittest/translationunittest.cpp
View File

@@ -72,7 +72,7 @@ class TranslationUnit : public ::testing::Test
{
protected:
void SetUp() override;
::TranslationUnit createTemporaryTranslationUnit();
::TranslationUnit createTranslationUnitAndDeleteFile();
QByteArray readContentFromTranslationUnitFile() const;
protected:
@@ -92,6 +92,13 @@ TEST_F(TranslationUnit, DefaultTranslationUnitIsInvalid)
ASSERT_TRUE(translationUnit.isNull());
}
TEST_F(TranslationUnit, DefaultTranslationUnitIsNotIntact)
{
::TranslationUnit translationUnit;
ASSERT_FALSE(translationUnit.isIntact());
}
TEST_F(TranslationUnit, ThrowExceptionForNonExistingFilePath)
{
ASSERT_THROW(::TranslationUnit(Utf8StringLiteral("file.cpp"), projectPart, Utf8StringVector(), translationUnits),
@@ -193,7 +200,7 @@ TEST_F(TranslationUnit, DependedFilePaths)
TEST_F(TranslationUnit, DeletedFileShouldNotNeedReparsing)
{
auto translationUnit = createTemporaryTranslationUnit();
auto translationUnit = createTranslationUnitAndDeleteFile();
translationUnit.setDirtyIfDependencyIsMet(translationUnit.filePath());
@@ -244,6 +251,20 @@ TEST_F(TranslationUnit, NeedsNoReparsingAfterReparsing)
ASSERT_FALSE(translationUnit.isNeedingReparse());
}
TEST_F(TranslationUnit, IsIntactAfterCreation)
{
translationUnit.cxTranslationUnit();
ASSERT_TRUE(translationUnit.isIntact());
}
TEST_F(TranslationUnit, IsNotIntactForDeletedFile)
{
auto translationUnit = createTranslationUnitAndDeleteFile();
ASSERT_FALSE(translationUnit.isIntact());
}
TEST_F(TranslationUnit, HasNewDiagnosticsAfterCreation)
{
translationUnit.cxTranslationUnit();
@@ -364,7 +385,7 @@ void TranslationUnit::SetUp()
translationUnit = createdTranslationUnits.front();
}
::TranslationUnit TranslationUnit::createTemporaryTranslationUnit()
::TranslationUnit TranslationUnit::createTranslationUnitAndDeleteFile()
{
QTemporaryFile temporaryFile;
EXPECT_TRUE(temporaryFile.open());