aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/QtVsTools.sln2
-rw-r--r--src/tests/CoreFeatures/Macros.qrc9
-rw-r--r--src/tests/SampleTest/Macros.qrc9
-rw-r--r--src/tests/SampleTest/SampleTest.pro10
-rw-r--r--src/tests/SampleTest/SampleTest.sln25
-rw-r--r--src/tests/SampleTest/SampleTest.vcxproj (renamed from src/tests/CoreFeatures/CoreFeatures.vcxproj)38
-rw-r--r--src/tests/SampleTest/SampleTest.vcxproj.filters (renamed from src/tests/CoreFeatures/CoreFeatures.vcxproj.filters)10
-rw-r--r--src/tests/SampleTest/Test_CreateGuiApp.csmacro (renamed from src/tests/macros/Test_CreateGuiApp.csmacro)0
-rw-r--r--src/tests/SampleTest/Test_DebugGuiApp.csmacro (renamed from src/tests/macros/Test_DebugGuiApp.csmacro)0
-rw-r--r--src/tests/SampleTest/Test_ImportProFile.csmacro (renamed from src/tests/macros/Test_ImportProFile.csmacro)0
-rw-r--r--src/tests/SampleTest/Test_QtVsToolsLoaded.csmacro (renamed from src/tests/macros/Test_QtVsToolsLoaded.csmacro)0
-rw-r--r--src/tests/SampleTest/Test_RebuildSolution.csmacro (renamed from src/tests/macros/Test_RebuildSolution.csmacro)0
-rw-r--r--src/tests/SampleTest/main.cpp (renamed from src/tests/CoreFeatures/main.cpp)28
13 files changed, 94 insertions, 37 deletions
diff --git a/src/QtVsTools.sln b/src/QtVsTools.sln
index b68548c1..0cd1df0f 100644
--- a/src/QtVsTools.sln
+++ b/src/QtVsTools.sln
@@ -92,7 +92,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QtVsTest", "QtVsTest\QtVsTe
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{06C8A2E6-A894-4DBA-9DFD-B8E5CB8A2B4F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoreFeatures", "tests\CoreFeatures\CoreFeatures.vcxproj", "{12857847-9877-466C-B056-DD286A219093}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleTest", "tests\SampleTest\SampleTest.vcxproj", "{12857847-9877-466C-B056-DD286A219093}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{E5CE38AA-4083-438E-B1F7-DD2F0BDEBE47}"
EndProject
diff --git a/src/tests/CoreFeatures/Macros.qrc b/src/tests/CoreFeatures/Macros.qrc
deleted file mode 100644
index c40bfffb..00000000
--- a/src/tests/CoreFeatures/Macros.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file alias="QtVsToolsLoaded">../macros/Test_QtVsToolsLoaded.csmacro</file>
- <file alias="CreateGuiApp" >../macros/Test_CreateGuiApp.csmacro</file>
- <file alias="RebuildSolution">../macros/Test_RebuildSolution.csmacro</file>
- <file alias="DebugGuiApp" >../macros/Test_DebugGuiApp.csmacro</file>
- <file alias="ImportProFile" >../macros/Test_ImportProFile.csmacro</file>
- </qresource>
-</RCC>
diff --git a/src/tests/SampleTest/Macros.qrc b/src/tests/SampleTest/Macros.qrc
new file mode 100644
index 00000000..f4b95f6d
--- /dev/null
+++ b/src/tests/SampleTest/Macros.qrc
@@ -0,0 +1,9 @@
+<RCC>
+ <qresource prefix="/">
+ <file alias="QtVsToolsLoaded">Test_QtVsToolsLoaded.csmacro</file>
+ <file alias="CreateGuiApp" >Test_CreateGuiApp.csmacro</file>
+ <file alias="RebuildSolution">Test_RebuildSolution.csmacro</file>
+ <file alias="DebugGuiApp" >Test_DebugGuiApp.csmacro</file>
+ <file alias="ImportProFile" >Test_ImportProFile.csmacro</file>
+ </qresource>
+</RCC>
diff --git a/src/tests/SampleTest/SampleTest.pro b/src/tests/SampleTest/SampleTest.pro
new file mode 100644
index 00000000..94954cbe
--- /dev/null
+++ b/src/tests/SampleTest/SampleTest.pro
@@ -0,0 +1,10 @@
+QT += network testlib
+
+INCLUDEPATH += $(LOCALAPPDATA)\qtvstest
+DEFINES += "\"QT_CONF_PATH=\\\"$$QMAKESPEC/qt.conf\\\"\""
+
+RESOURCES += \
+ Macros.qrc
+
+SOURCES += \
+ main.cpp
diff --git a/src/tests/SampleTest/SampleTest.sln b/src/tests/SampleTest/SampleTest.sln
new file mode 100644
index 00000000..95f0dfa9
--- /dev/null
+++ b/src/tests/SampleTest/SampleTest.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31229.387
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleTest", "SampleTest.vcxproj", "{12857847-9877-466C-B056-DD286A219093}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {12857847-9877-466C-B056-DD286A219093}.Debug|x64.ActiveCfg = Debug|x64
+ {12857847-9877-466C-B056-DD286A219093}.Debug|x64.Build.0 = Debug|x64
+ {12857847-9877-466C-B056-DD286A219093}.Release|x64.ActiveCfg = Release|x64
+ {12857847-9877-466C-B056-DD286A219093}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {0994645B-44BE-41F8-BE79-993936518575}
+ EndGlobalSection
+EndGlobal
diff --git a/src/tests/CoreFeatures/CoreFeatures.vcxproj b/src/tests/SampleTest/SampleTest.vcxproj
index 2e24409f..57c67f5c 100644
--- a/src/tests/CoreFeatures/CoreFeatures.vcxproj
+++ b/src/tests/SampleTest/SampleTest.vcxproj
@@ -18,7 +18,8 @@
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0'">8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='15.0'">10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
- <QtMsBuild>$(SolutionDir)\qtmsbuild\QtMsBuild</QtMsBuild>
+ <QtMsBuild Condition="Exists('..\..\qtmsbuild\QtMsBuild')">..\..\qtmsbuild\QtMsBuild</QtMsBuild>
+ <ProjectName>SampleTest</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(VisualStudioVersion)'=='12.0' and '$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -108,12 +109,19 @@
<QtRcc>
</QtRcc>
<QtMoc>
- <OverrideClCompile>extend</OverrideClCompile>
<AdditionalIncludeDirectories>$(IntDir)\moc\%(RelativeDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>QT_CONF_PATH=R"__($(QtToolsPath)\qt.conf)__"</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir)\moc\%(RelativeDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>QT_CONF_PATH=R"__($(QtToolsPath)\qt.conf)__"</PreprocessorDefinitions>
+ <PreprocessorDefinitions>QT_CONF_PATH="$(QMake_QT_INSTALL_PREFIX_)/mkspecs/$(QMake_QMAKE_SPEC_)/qt.conf"</PreprocessorDefinitions>
+ <OverrideClCompile>extend</OverrideClCompile>
+ <AdditionalCppOptions>/Zc:referenceBinding</AdditionalCppOptions>
</QtMoc>
+ <QtRcc>
+ <OverrideClCompile>extend</OverrideClCompile>
+ </QtRcc>
+ <QtRcc>
+ <AdditionalCppOptions>/Zc:referenceBinding</AdditionalCppOptions>
+ </QtRcc>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@@ -133,12 +141,19 @@
<QtRcc>
</QtRcc>
<QtMoc>
- <OverrideClCompile>extend</OverrideClCompile>
<AdditionalIncludeDirectories>$(IntDir)\moc\%(RelativeDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>QT_CONF_PATH=R"__($(QtToolsPath)\qt.conf)__"</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir)\moc\%(RelativeDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>QT_CONF_PATH=R"__($(QtToolsPath)\qt.conf)__"</PreprocessorDefinitions>
+ <PreprocessorDefinitions>QT_CONF_PATH="$(QMake_QT_INSTALL_PREFIX_)/mkspecs/$(QMake_QMAKE_SPEC_)/qt.conf"</PreprocessorDefinitions>
+ <OverrideClCompile>extend</OverrideClCompile>
+ <AdditionalCppOptions>/Zc:referenceBinding</AdditionalCppOptions>
</QtMoc>
+ <QtRcc>
+ <OverrideClCompile>extend</OverrideClCompile>
+ </QtRcc>
+ <QtRcc>
+ <AdditionalCppOptions>/Zc:referenceBinding</AdditionalCppOptions>
+ </QtRcc>
</ItemDefinitionGroup>
<ItemGroup>
<QtMoc Include="main.cpp">
@@ -149,7 +164,7 @@
</QtMoc>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\qtvstest\MacroClient.h" />
+ <ClInclude Include="$(LocalAppData)\qtvstest\MacroClient.h" />
</ItemGroup>
<ItemGroup>
<QtRcc Include="Macros.qrc">
@@ -157,14 +172,13 @@
</QtRcc>
</ItemGroup>
<ItemGroup>
- <None Include="..\macros\Test_CreateGuiApp.csmacro"/>
- <None Include="..\macros\Test_DebugGuiApp.csmacro"/>
- <None Include="..\macros\Test_QtVsToolsLoaded.csmacro"/>
- <None Include="..\macros\Test_RebuildSolution.csmacro"/>
- <None Include="..\macros\Test_ImportProFile.csmacro" />
+ <None Include="Test_CreateGuiApp.csmacro" />
+ <None Include="Test_DebugGuiApp.csmacro" />
+ <None Include="Test_QtVsToolsLoaded.csmacro" />
+ <None Include="Test_RebuildSolution.csmacro" />
+ <None Include="Test_ImportProFile.csmacro" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Import Project="$(SolutionDir)\transform.targets" />
<ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
<Import Project="$(QtMsBuild)\qt.targets" />
</ImportGroup>
diff --git a/src/tests/CoreFeatures/CoreFeatures.vcxproj.filters b/src/tests/SampleTest/SampleTest.vcxproj.filters
index 9cc2504c..e78eb319 100644
--- a/src/tests/CoreFeatures/CoreFeatures.vcxproj.filters
+++ b/src/tests/SampleTest/SampleTest.vcxproj.filters
@@ -36,19 +36,19 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="..\macros\Test_QtVsToolsLoaded.csmacro">
+ <None Include="Test_QtVsToolsLoaded.csmacro">
<Filter>Resource Files</Filter>
</None>
- <None Include="..\macros\Test_CreateGuiApp.csmacro">
+ <None Include="Test_CreateGuiApp.csmacro">
<Filter>Resource Files</Filter>
</None>
- <None Include="..\macros\Test_RebuildSolution.csmacro">
+ <None Include="Test_RebuildSolution.csmacro">
<Filter>Resource Files</Filter>
</None>
- <None Include="..\macros\Test_DebugGuiApp.csmacro">
+ <None Include="Test_DebugGuiApp.csmacro">
<Filter>Resource Files</Filter>
</None>
- <None Include="..\macros\Test_ImportProFile.csmacro">
+ <None Include="Test_ImportProFile.csmacro">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
diff --git a/src/tests/macros/Test_CreateGuiApp.csmacro b/src/tests/SampleTest/Test_CreateGuiApp.csmacro
index 4c717f85..4c717f85 100644
--- a/src/tests/macros/Test_CreateGuiApp.csmacro
+++ b/src/tests/SampleTest/Test_CreateGuiApp.csmacro
diff --git a/src/tests/macros/Test_DebugGuiApp.csmacro b/src/tests/SampleTest/Test_DebugGuiApp.csmacro
index bd8e72a6..bd8e72a6 100644
--- a/src/tests/macros/Test_DebugGuiApp.csmacro
+++ b/src/tests/SampleTest/Test_DebugGuiApp.csmacro
diff --git a/src/tests/macros/Test_ImportProFile.csmacro b/src/tests/SampleTest/Test_ImportProFile.csmacro
index 49e71306..49e71306 100644
--- a/src/tests/macros/Test_ImportProFile.csmacro
+++ b/src/tests/SampleTest/Test_ImportProFile.csmacro
diff --git a/src/tests/macros/Test_QtVsToolsLoaded.csmacro b/src/tests/SampleTest/Test_QtVsToolsLoaded.csmacro
index f4a1aaab..f4a1aaab 100644
--- a/src/tests/macros/Test_QtVsToolsLoaded.csmacro
+++ b/src/tests/SampleTest/Test_QtVsToolsLoaded.csmacro
diff --git a/src/tests/macros/Test_RebuildSolution.csmacro b/src/tests/SampleTest/Test_RebuildSolution.csmacro
index 005cabba..005cabba 100644
--- a/src/tests/macros/Test_RebuildSolution.csmacro
+++ b/src/tests/SampleTest/Test_RebuildSolution.csmacro
diff --git a/src/tests/CoreFeatures/main.cpp b/src/tests/SampleTest/main.cpp
index 462e74e3..efc7bd78 100644
--- a/src/tests/CoreFeatures/main.cpp
+++ b/src/tests/SampleTest/main.cpp
@@ -27,10 +27,9 @@
****************************************************************************/
#include <QtTest>
-
#include <MacroClient.h>
-class TestCoreFeatures : public QObject
+class TestSample : public QObject
{
Q_OBJECT
@@ -42,8 +41,11 @@ private slots:
{
qint64 pid = 0;
QVERIFY(client.connect(&pid));
+
client.runMacro(QString() % "//# var QtConfPath => @\"" % QT_CONF_PATH % "\"");
- QCOMPARE(client.runMacro(QFile(":/QtVsToolsLoaded")), MACRO_OK);
+
+ QFile macroQtVsToolsLoaded(":/QtVsToolsLoaded");
+ QCOMPARE(client.runMacro(macroQtVsToolsLoaded), MACRO_OK);
}
void tutorial01TestCase()
@@ -100,9 +102,12 @@ private slots:
void guiAppCreate_Rebuild_Debug()
{
client.runMacro("//# wait 5000 => !Dte.Solution.IsOpen");
- QCOMPARE(client.runMacro(QFile(":/CreateGuiApp")), MACRO_OK);
- QCOMPARE(client.runMacro(QFile(":/RebuildSolution")), MACRO_OK);
- QCOMPARE(client.runMacro(QFile(":/DebugGuiApp")), MACRO_OK);
+ QFile macroCreateGuiApp(":/CreateGuiApp"),
+ macroRebuildSolution(":/RebuildSolution"),
+ macroDebugGuiApp(":/DebugGuiApp");
+ QCOMPARE(client.runMacro(macroCreateGuiApp), MACRO_OK);
+ QCOMPARE(client.runMacro(macroRebuildSolution), MACRO_OK);
+ QCOMPARE(client.runMacro(macroDebugGuiApp), MACRO_OK);
client.runMacro(
"Dte.Solution.Close(false);" "\r\n"
"//# wait 15000 => !Dte.Solution.IsOpen" "\r\n");
@@ -111,9 +116,12 @@ private slots:
void importProFile_Rebuild_Debug()
{
QSKIP("foo");
- QCOMPARE(client.runMacro(QFile(":/ImportProFile")), MACRO_OK);
- QCOMPARE(client.runMacro(QFile(":/RebuildSolution")), MACRO_OK);
- QCOMPARE(client.runMacro(QFile(":/DebugGuiApp")), MACRO_OK);
+ QFile macroImportProFile(":/ImportProFile"),
+ macroRebuildSolution(":/RebuildSolution"),
+ macroDebugGuiApp(":/DebugGuiApp");
+ QCOMPARE(client.runMacro(macroImportProFile), MACRO_OK);
+ QCOMPARE(client.runMacro(macroRebuildSolution), MACRO_OK);
+ QCOMPARE(client.runMacro(macroDebugGuiApp), MACRO_OK);
client.runMacro(
"Dte.Solution.Close(false);" "\r\n"
"//# wait 15000 => !Dte.Solution.IsOpen" "\r\n");
@@ -128,5 +136,5 @@ private slots:
}
};
-QTEST_MAIN(TestCoreFeatures)
+QTEST_MAIN(TestSample)
#include "main.moc"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 12:42:50 +0000