Skip to content

Commit c0ab566

Browse files
brudersteinbruderstein
committed
Add stub for menu manager tests
1 parent dfc7019 commit c0ab566

5 files changed

Lines changed: 77 additions & 11 deletions

File tree

‎PythonScript.Tests/PythonScript.Tests.vcxproj‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@
5454
<PropertyGroup Label="UserMacros" />
5555
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5656
<LinkIncremental>true</LinkIncremental>
57-
<IncludePath>$(BoostBase);$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
57+
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include</IncludePath>
5858
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">
6161
<LinkIncremental>true</LinkIncremental>
62-
<IncludePath>$(BoostBase);$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
62+
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include</IncludePath>
6363
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
6464
</PropertyGroup>
6565
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6666
<LinkIncremental>false</LinkIncremental>
67-
<IncludePath>$(BoostBase);$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
67+
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include</IncludePath>
6868
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
6969
</PropertyGroup>
7070
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -79,7 +79,7 @@
7979
<Link>
8080
<SubSystem>Console</SubSystem>
8181
<GenerateDebugInformation>true</GenerateDebugInformation>
82-
<AdditionalDependencies>bin\$(Configuration)\gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
82+
<AdditionalDependencies>bin\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
8383
<AdditionalLibraryDirectories>
8484
</AdditionalLibraryDirectories>
8585
</Link>
@@ -99,7 +99,7 @@
9999
<Link>
100100
<SubSystem>Console</SubSystem>
101101
<GenerateDebugInformation>true</GenerateDebugInformation>
102-
<AdditionalDependencies>bin\$(Configuration)\gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
102+
<AdditionalDependencies>bin\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
103103
<AdditionalLibraryDirectories>
104104
</AdditionalLibraryDirectories>
105105
</Link>
@@ -123,7 +123,7 @@
123123
<GenerateDebugInformation>true</GenerateDebugInformation>
124124
<EnableCOMDATFolding>true</EnableCOMDATFolding>
125125
<OptimizeReferences>true</OptimizeReferences>
126-
<AdditionalDependencies>bin\$(Configuration)\gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
126+
<AdditionalDependencies>bin\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
127127
</Link>
128128
</ItemDefinitionGroup>
129129
<ItemGroup>
@@ -134,17 +134,24 @@
134134
<ClInclude Include="targetver.h" />
135135
</ItemGroup>
136136
<ItemGroup>
137+
<ClCompile Include="..\PythonScript\src\ConfigFile.cpp" />
137138
<ClCompile Include="..\PythonScript\src\DepthCounter.cpp" />
139+
<ClCompile Include="..\PythonScript\src\DynamicIDManager.cpp" />
140+
<ClCompile Include="..\PythonScript\src\MenuManager.cpp" />
141+
<ClCompile Include="..\PythonScript\src\NppAllocator.cpp" />
138142
<ClCompile Include="..\PythonScript\src\Replacer.cpp" />
143+
<ClCompile Include="..\PythonScript\src\StaticIDAllocator.cpp" />
139144
<ClCompile Include="..\PythonScript\src\UTF8Iterator.cpp" />
140145
<ClCompile Include="..\PythonScript\src\UtfConversion.cpp" />
146+
<ClCompile Include="..\PythonScript\src\WcharMbcsConverter.cpp" />
141147
<ClCompile Include="TestRunner.cpp" />
142148
<ClCompile Include="stdafx.cpp">
143149
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
144150
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">Create</PrecompiledHeader>
145151
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
146152
</ClCompile>
147153
<ClCompile Include="tests\TestDepthCounter.cpp" />
154+
<ClCompile Include="tests\TestMenuManager.cpp" />
148155
<ClCompile Include="tests\TestReplacer.cpp" />
149156
</ItemGroup>
150157
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎PythonScript.Tests/PythonScript.Tests.vcxproj.filters‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,26 @@
5656
<ClCompile Include="tests\TestDepthCounter.cpp">
5757
<Filter>Source Files\tests</Filter>
5858
</ClCompile>
59+
<ClCompile Include="..\PythonScript\src\MenuManager.cpp">
60+
<Filter>Source Files\linkedCode</Filter>
61+
</ClCompile>
62+
<ClCompile Include="tests\TestMenuManager.cpp">
63+
<Filter>Source Files\tests</Filter>
64+
</ClCompile>
65+
<ClCompile Include="..\PythonScript\src\WcharMbcsConverter.cpp">
66+
<Filter>Source Files\linkedCode</Filter>
67+
</ClCompile>
68+
<ClCompile Include="..\PythonScript\src\DynamicIDManager.cpp">
69+
<Filter>Source Files\linkedCode</Filter>
70+
</ClCompile>
71+
<ClCompile Include="..\PythonScript\src\StaticIDAllocator.cpp">
72+
<Filter>Source Files\linkedCode</Filter>
73+
</ClCompile>
74+
<ClCompile Include="..\PythonScript\src\ConfigFile.cpp">
75+
<Filter>Source Files\linkedCode</Filter>
76+
</ClCompile>
77+
<ClCompile Include="..\PythonScript\src\NppAllocator.cpp">
78+
<Filter>Source Files\linkedCode</Filter>
79+
</ClCompile>
5980
</ItemGroup>
6081
</Project>

‎PythonScript.Tests/stdafx.h‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111
#include <tchar.h>
1212

1313
#include <list>
14+
#include <set>
15+
16+
#include <exception>
17+
#include <stdlib.h>
18+
#include <iterator>
19+
#include <algorithm>
20+
#include <fstream>
21+
1422
#include <boost/regex.hpp>
1523
#include <boost/python.hpp>
1624

@@ -37,12 +45,9 @@
3745
#define NOMINMAX
3846
// Windows Header Files:
3947
#include <windows.h>
48+
#include <shlwapi.h>
4049

4150

42-
#include <exception>
43-
#include <stdlib.h>
44-
#include <iterator>
45-
#include <algorithm>
4651

4752
#ifdef _DEBUG
4853
#define _CRTDBG_MAP_ALLOC
@@ -53,3 +58,16 @@
5358
#endif
5459

5560
#endif
61+
62+
63+
typedef std::basic_string<TCHAR> tstring;
64+
// Index type
65+
typedef size_t idx_t;
66+
67+
// Offset type
68+
typedef int offset_t;
69+
70+
#define IDX_MAX SIZE_MAX
71+
72+
#define OFF_MIN INT_MIN
73+
#define OFF_MAX INT_MAX

‎PythonScript.Tests/tests/TestMenuManager.cpp‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#include "stdafx.h"
2+
3+
4+
#include <gtest/gtest.h>
5+
#include "MenuManager.h"
6+
7+
namespace NppPythonScript
8+
{
9+
10+
class MenuManagerTest : public ::testing::Test {
11+
virtual void SetUp() {
12+
13+
}
14+
};
15+
16+
TEST_F(MenuManagerTest, testDummy) {
17+
ASSERT_EQ(0, 0);
18+
}
19+
20+
}

‎PythonScript/src/MenuManager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "stdafx.h"
2-
#include "keys.h"
2+
#include <keys.h>
33
#include "MenuManager.h"
44
#include "WcharMbcsConverter.h"
55
#include "ConfigFile.h"

0 commit comments

Comments
 (0)