summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@theqtcompany.com>2015-05-13 13:38:04 +0200
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-05-21 11:24:42 +0000
commit42aea59f3070b34ebf3458b41bf796e758f8dd26 (patch)
treee3b5dcd30d43fc3c4e40c1b7785a1a8b568fd3d9
parent6f92ff2317c3f68becea8c644b3953bb4f5e1a48 (diff)
downloadqt-creator-42aea59f3070b34ebf3458b41bf796e758f8dd26.tar.gz
make test dir absolute
Change-Id: I0f1263edfac5a1fcc85596617a01cd314b1871e8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
-rw-r--r--tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp4
-rw-r--r--tests/unit/codemodelbackend/unittest/clangipcservertest.cpp10
-rw-r--r--tests/unit/codemodelbackend/unittest/clientserverinprocesstest.cpp8
-rw-r--r--tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp4
-rw-r--r--tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp28
-rw-r--r--tests/unit/codemodelbackend/unittest/codecompletiontest.cpp4
-rw-r--r--tests/unit/codemodelbackend/unittest/translationunitstest.cpp2
-rw-r--r--tests/unit/codemodelbackend/unittest/translationunittest.cpp12
-rw-r--r--tests/unit/codemodelbackend/unittest/unittest.pro5
9 files changed, 37 insertions, 40 deletions
diff --git a/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp b/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp
index 98278fa976..ee8b5b1f6f 100644
--- a/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp
+++ b/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp
@@ -51,7 +51,7 @@ TEST(ClangCodeCompleteResults, GetData)
{
ProjectPart projectPart(Utf8StringLiteral("projectPartId"));
UnsavedFiles unsavedFiles;
- TranslationUnit translationUnit(Utf8StringLiteral("data/complete_testfile_1.cpp"), unsavedFiles, projectPart);
+ TranslationUnit translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp"), unsavedFiles, projectPart);
CXCodeCompleteResults *cxCodeCompleteResults = clang_codeCompleteAt(translationUnit.cxTranslationUnit(), translationUnit.filePath().constData(), 49, 1, 0, 0, 0);
ClangCodeCompleteResults codeCompleteResults(cxCodeCompleteResults);
@@ -72,7 +72,7 @@ TEST(ClangCodeCompleteResults, MoveClangCodeCompleteResults)
{
ProjectPart projectPart(Utf8StringLiteral("projectPartId"));
UnsavedFiles unsavedFiles;
- TranslationUnit translationUnit(Utf8StringLiteral("data/complete_testfile_1.cpp"), unsavedFiles, projectPart);
+ TranslationUnit translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp"), unsavedFiles, projectPart);
CXCodeCompleteResults *cxCodeCompleteResults = clang_codeCompleteAt(translationUnit.cxTranslationUnit(), translationUnit.filePath().constData(), 49, 1, 0, 0, 0);
ClangCodeCompleteResults codeCompleteResults(cxCodeCompleteResults);
diff --git a/tests/unit/codemodelbackend/unittest/clangipcservertest.cpp b/tests/unit/codemodelbackend/unittest/clangipcservertest.cpp
index 396b4fe8c8..8d83d2fe8c 100644
--- a/tests/unit/codemodelbackend/unittest/clangipcservertest.cpp
+++ b/tests/unit/codemodelbackend/unittest/clangipcservertest.cpp
@@ -90,11 +90,11 @@ protected:
MockIpcClient mockIpcClient;
CodeModelBackEnd::ClangIpcServer clangServer;
const Utf8String projectPartId = Utf8StringLiteral("pathToProjectPart.pro");
- const Utf8String functionTestFilePath = Utf8StringLiteral("data/complete_extractor_function.cpp");
- const Utf8String variableTestFilePath = Utf8StringLiteral("data/complete_extractor_variable.cpp");
- const QString unsavedTestFilePath = QStringLiteral("data/complete_extractor_function_unsaved.cpp");
- const QString updatedUnsavedTestFilePath = QStringLiteral("data/complete_extractor_function_unsaved_2.cpp");
- const Utf8String parseErrorTestFilePath = Utf8StringLiteral("data/complete_translationunit_parse_error.cpp");
+ const Utf8String functionTestFilePath = Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp");
+ const Utf8String variableTestFilePath = Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_variable.cpp");
+ const QString unsavedTestFilePath = QStringLiteral(TESTDATA_DIR"/complete_extractor_function_unsaved.cpp");
+ const QString updatedUnsavedTestFilePath = QStringLiteral(TESTDATA_DIR"/complete_extractor_function_unsaved_2.cpp");
+ const Utf8String parseErrorTestFilePath = Utf8StringLiteral(TESTDATA_DIR"/complete_translationunit_parse_error.cpp");
};
diff --git a/tests/unit/codemodelbackend/unittest/clientserverinprocesstest.cpp b/tests/unit/codemodelbackend/unittest/clientserverinprocesstest.cpp
index 78837a75c8..1c3b78dd59 100644
--- a/tests/unit/codemodelbackend/unittest/clientserverinprocesstest.cpp
+++ b/tests/unit/codemodelbackend/unittest/clientserverinprocesstest.cpp
@@ -108,7 +108,7 @@ TEST_F(ClientServerInProcess, SendAliveCommand)
TEST_F(ClientServerInProcess, SendRegisterTranslationUnitForCodeCompletionCommand)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral("data/complete_extractor_function.cpp"),
+ CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp"),
Utf8StringLiteral("pathToProjectPart.pro"));
CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand command({fileContainer});
@@ -156,7 +156,7 @@ TEST_F(ClientServerInProcess, SendCodeCompletedCommand)
TEST_F(ClientServerInProcess, SendRegisterProjectPartsForCodeCompletionCommand)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("data/complete.pro"));
+ CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral(TESTDATA_DIR"/complete.pro"));
CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand command({projectContainer});
EXPECT_CALL(mockIpcServer, registerProjectPartsForCodeCompletion(command))
@@ -168,7 +168,7 @@ TEST_F(ClientServerInProcess, SendRegisterProjectPartsForCodeCompletionCommand)
TEST_F(ClientServerInProcess, SendUnregisterProjectPartsForCodeCompletionCommand)
{
- CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand command({Utf8StringLiteral("data/complete.pro")});
+ CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand command({Utf8StringLiteral(TESTDATA_DIR"/complete.pro")});
EXPECT_CALL(mockIpcServer, unregisterProjectPartsForCodeCompletion(command))
.Times(1);
@@ -179,7 +179,7 @@ TEST_F(ClientServerInProcess, SendUnregisterProjectPartsForCodeCompletionCommand
TEST_F(ClientServerInProcess, SendTranslationUnitDoesNotExistCommand)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral("data/complete_extractor_function.cpp"),
+ CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp"),
Utf8StringLiteral("pathToProjectPart.pro"));
CodeModelBackEnd::TranslationUnitDoesNotExistCommand command(fileContainer);
diff --git a/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp b/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp
index a732a4c454..6ab95e7c64 100644
--- a/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp
+++ b/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp
@@ -136,7 +136,7 @@ TEST_F(ClientServerOutsideProcess, SendCompleteCodeCommand)
TEST_F(ClientServerOutsideProcess, SendRegisterProjectPartsForCodeCompletionCommand)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("data/complete.pro"));
+ CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral(TESTDATA_DIR"/complete.pro"));
CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand registerProjectPartsForCodeCompletionCommand({projectContainer});
EchoCommand echoCommand(QVariant::fromValue(registerProjectPartsForCodeCompletionCommand));
@@ -149,7 +149,7 @@ TEST_F(ClientServerOutsideProcess, SendRegisterProjectPartsForCodeCompletionComm
TEST_F(ClientServerOutsideProcess, SendUnregisterProjectPartsForCodeCompletionCommand)
{
- CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand unregisterProjectPartsForCodeCompletionCommand({Utf8StringLiteral("data/complete.pro")});
+ CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand unregisterProjectPartsForCodeCompletionCommand({Utf8StringLiteral(TESTDATA_DIR"/complete.pro")});
EchoCommand echoCommand(QVariant::fromValue(unregisterProjectPartsForCodeCompletionCommand));
EXPECT_CALL(mockIpcClient, echo(echoCommand))
diff --git a/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp b/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp
index cc007f3319..8108c39900 100644
--- a/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp
+++ b/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp
@@ -150,12 +150,12 @@ protected:
CodeModelBackEnd::ProjectPart CodeCompletionsExtractor::project(Utf8StringLiteral("/path/to/projectfile"));
CodeModelBackEnd::UnsavedFiles CodeCompletionsExtractor::unsavedFiles;
-TranslationUnit CodeCompletionsExtractor::functionTranslationUnit(Utf8StringLiteral("data/complete_extractor_function.cpp"), unsavedFiles, project);
-TranslationUnit CodeCompletionsExtractor::variableTranslationUnit(Utf8StringLiteral("data/complete_extractor_variable.cpp"), unsavedFiles, project);
-TranslationUnit CodeCompletionsExtractor::classTranslationUnit(Utf8StringLiteral("data/complete_extractor_class.cpp"), unsavedFiles, project);
-TranslationUnit CodeCompletionsExtractor::namespaceTranslationUnit(Utf8StringLiteral("data/complete_extractor_namespace.cpp"), unsavedFiles, project);
-TranslationUnit CodeCompletionsExtractor::enumerationTranslationUnit(Utf8StringLiteral("data/complete_extractor_enumeration.cpp"), unsavedFiles, project);
-TranslationUnit CodeCompletionsExtractor::constructorTranslationUnit(Utf8StringLiteral("data/complete_extractor_constructor.cpp"), unsavedFiles, project);
+TranslationUnit CodeCompletionsExtractor::functionTranslationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp"), unsavedFiles, project);
+TranslationUnit CodeCompletionsExtractor::variableTranslationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_variable.cpp"), unsavedFiles, project);
+TranslationUnit CodeCompletionsExtractor::classTranslationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_class.cpp"), unsavedFiles, project);
+TranslationUnit CodeCompletionsExtractor::namespaceTranslationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_namespace.cpp"), unsavedFiles, project);
+TranslationUnit CodeCompletionsExtractor::enumerationTranslationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_enumeration.cpp"), unsavedFiles, project);
+TranslationUnit CodeCompletionsExtractor::constructorTranslationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_constructor.cpp"), unsavedFiles, project);
void CodeCompletionsExtractor::TearDownTestCase()
{
@@ -527,9 +527,9 @@ TEST_F(CodeCompletionsExtractor, UnsavedFile)
{
CodeModelBackEnd::UnsavedFiles unsavedFiles;
CodeModelBackEnd::ProjectPart project(Utf8StringLiteral("/path/to/projectfile"));
- TranslationUnit translationUnit(Utf8String::fromUtf8("data/complete_extractor_function.cpp"), unsavedFiles, project);
- unsavedFiles.createOrUpdate({unsavedDataFileContainer("data/complete_extractor_function.cpp",
- "data/complete_extractor_function_unsaved.cpp")});
+ TranslationUnit translationUnit(Utf8String::fromUtf8(TESTDATA_DIR"/complete_extractor_function.cpp"), unsavedFiles, project);
+ unsavedFiles.createOrUpdate({unsavedDataFileContainer(TESTDATA_DIR"/complete_extractor_function.cpp",
+ TESTDATA_DIR"/complete_extractor_function_unsaved.cpp")});
ClangCodeCompleteResults completeResults(getResults(translationUnit, 20));
::CodeCompletionsExtractor extractor(completeResults.data());
@@ -543,12 +543,12 @@ TEST_F(CodeCompletionsExtractor, ChangeUnsavedFile)
{
CodeModelBackEnd::UnsavedFiles unsavedFiles;
CodeModelBackEnd::ProjectPart project(Utf8StringLiteral("/path/to/projectfile"));
- TranslationUnit translationUnit(Utf8String::fromUtf8("data/complete_extractor_function.cpp"), unsavedFiles, project);
- unsavedFiles.createOrUpdate({unsavedDataFileContainer("data/complete_extractor_function.cpp",
- "data/complete_extractor_function_unsaved.cpp")});
+ TranslationUnit translationUnit(Utf8String::fromUtf8(TESTDATA_DIR"/complete_extractor_function.cpp"), unsavedFiles, project);
+ unsavedFiles.createOrUpdate({unsavedDataFileContainer(TESTDATA_DIR"/complete_extractor_function.cpp",
+ TESTDATA_DIR"/complete_extractor_function_unsaved.cpp")});
ClangCodeCompleteResults completeResults(getResults(translationUnit, 20));
- unsavedFiles.createOrUpdate({unsavedDataFileContainer("data/complete_extractor_function.cpp",
- "data/complete_extractor_function_unsaved_2.cpp")});
+ unsavedFiles.createOrUpdate({unsavedDataFileContainer(TESTDATA_DIR"/complete_extractor_function.cpp",
+ TESTDATA_DIR"/complete_extractor_function_unsaved_2.cpp")});
completeResults = getResults(translationUnit, 20);
::CodeCompletionsExtractor extractor(completeResults.data());
diff --git a/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp b/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp
index c07e3b648d..72c688341f 100644
--- a/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp
+++ b/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp
@@ -66,12 +66,12 @@ protected:
CodeModelBackEnd::ProjectPart CodeCompleter::projectPart(Utf8StringLiteral("projectPartId"));
CodeModelBackEnd::UnsavedFiles CodeCompleter::unsavedFiles;
-CodeModelBackEnd::TranslationUnit CodeCompleter::translationUnit(Utf8StringLiteral("data/complete_completer.cpp"), unsavedFiles, projectPart);
+CodeModelBackEnd::TranslationUnit CodeCompleter::translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_completer.cpp"), unsavedFiles, projectPart);
CodeModelBackEnd::CodeCompleter CodeCompleter::completer = translationUnit;
void CodeCompleter::SetUpTestCase()
{
- QFile unsavedFileContentFile(QStringLiteral("data/complete_completer_unsaved.cpp"));
+ QFile unsavedFileContentFile(QStringLiteral(TESTDATA_DIR"/complete_completer_unsaved.cpp"));
unsavedFileContentFile.open(QIODevice::ReadOnly);
const Utf8String unsavedFileContent = Utf8String::fromByteArray(unsavedFileContentFile.readAll());
diff --git a/tests/unit/codemodelbackend/unittest/translationunitstest.cpp b/tests/unit/codemodelbackend/unittest/translationunitstest.cpp
index e6e3e18cd6..4262112b66 100644
--- a/tests/unit/codemodelbackend/unittest/translationunitstest.cpp
+++ b/tests/unit/codemodelbackend/unittest/translationunitstest.cpp
@@ -87,7 +87,7 @@ protected:
CodeModelBackEnd::ProjectParts projects;
CodeModelBackEnd::UnsavedFiles unsavedFiles;
CodeModelBackEnd::TranslationUnits translationUnits = CodeModelBackEnd::TranslationUnits(projects, unsavedFiles);
- const Utf8String filePath = Utf8StringLiteral("data/complete_testfile_1.cpp");
+ const Utf8String filePath = Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp");
const Utf8String projectPartId = Utf8StringLiteral("/path/to/projectfile");
};
diff --git a/tests/unit/codemodelbackend/unittest/translationunittest.cpp b/tests/unit/codemodelbackend/unittest/translationunittest.cpp
index 38abfc1f0a..3aa4d749d1 100644
--- a/tests/unit/codemodelbackend/unittest/translationunittest.cpp
+++ b/tests/unit/codemodelbackend/unittest/translationunittest.cpp
@@ -70,7 +70,7 @@ TEST(TranslationUnit, ThrowExceptionForNonExistingFilePath)
TEST(TranslationUnit, TranslationUnitIsValid)
{
- TranslationUnit translationUnit(Utf8StringLiteral("data/complete_testfile_1.cpp"), UnsavedFiles(), ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
+ TranslationUnit translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp"), UnsavedFiles(), ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
ASSERT_FALSE(translationUnit.isNull());
}
@@ -85,7 +85,7 @@ TEST(TranslationUnit, ThrowExceptionForGettingIndexForInvalidUnit)
TEST(TranslationUnit, IndexGetterIsNonNullForValidUnit)
{
- TranslationUnit translationUnit(Utf8StringLiteral("data/complete_testfile_1.cpp"), UnsavedFiles(), ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
+ TranslationUnit translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp"), UnsavedFiles(), ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
ASSERT_THAT(translationUnit.index(), NotNull());
}
@@ -100,7 +100,7 @@ TEST(TranslationUnit, ThrowExceptionForGettingCxTranslationUnitForInvalidUnit)
TEST(TranslationUnit, CxTranslationUnitGetterIsNonNullForValidUnit)
{
UnsavedFiles unsavedFiles;
- TranslationUnit translationUnit(Utf8StringLiteral("data/complete_testfile_1.cpp"), unsavedFiles, ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
+ TranslationUnit translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp"), unsavedFiles, ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
ASSERT_THAT(translationUnit.cxTranslationUnit(), NotNull());
}
@@ -114,7 +114,7 @@ TEST(TranslationUnit, ThrowExceptionIfGettingFilePathForNullUnit)
TEST(TranslationUnit, ResetedTranslationUnitIsNull)
{
- TranslationUnit translationUnit(Utf8StringLiteral("data/complete_testfile_1.cpp"), UnsavedFiles(), ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
+ TranslationUnit translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp"), UnsavedFiles(), ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
translationUnit.reset();
@@ -123,7 +123,7 @@ TEST(TranslationUnit, ResetedTranslationUnitIsNull)
TEST(TranslationUnit, TimeStampIsUpdatedAsNewCxTranslationUnitIsGenerated)
{
- TranslationUnit translationUnit(Utf8StringLiteral("data/complete_testfile_1.cpp"), UnsavedFiles(), ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
+ TranslationUnit translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp"), UnsavedFiles(), ProjectPart(Utf8StringLiteral("/path/to/projectfile")));
auto lastChangeTimePoint = translationUnit.lastChangeTimePoint();
translationUnit.cxTranslationUnit();
@@ -136,7 +136,7 @@ TEST(TranslationUnit, TimeStampIsUpdatedAsNewCxTranslationUnitIsGenerated)
//{
// ProjectPart project(Utf8StringLiteral("/path/to/projectfile"));
// project.setArguments({Utf8StringLiteral("-fblah")});
-// TranslationUnit translationUnit(Utf8StringLiteral("data/complete_testfile_1.cpp"), UnsavedFiles(), project);
+// TranslationUnit translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp"), UnsavedFiles(), project);
// ASSERT_THROW(translationUnit.cxTranslationUnit(), CodeModelBackEnd::TranslationUnitParseErrorException);
//}
diff --git a/tests/unit/codemodelbackend/unittest/unittest.pro b/tests/unit/codemodelbackend/unittest/unittest.pro
index f96c85fcf1..b2296edd45 100644
--- a/tests/unit/codemodelbackend/unittest/unittest.pro
+++ b/tests/unit/codemodelbackend/unittest/unittest.pro
@@ -87,7 +87,4 @@ DEFINES += CODEMODELBACKEND_TESTS
DEFINES += DONT_CHECK_COMMAND_COUNTER
DEFINES += GTEST_HAS_STD_INITIALIZER_LIST_ GTEST_LANG_CXX11
-copydata.commands = $(COPY_DIR) $$shell_quote($$shell_path($$PWD/data)) $$shell_quote($$shell_path($$OUT_PWD/data))
-first.depends += copydata
-QMAKE_EXTRA_TARGETS += first copydata
-
+DEFINES += TESTDATA_DIR=$$shell_quote($$shell_path(\"$$PWD/data\"))