Skip to content

Commit ac02c1a

Browse files
committed
adapt gtest testcases to 64bit
1 parent 3225389 commit ac02c1a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

PythonScript.Tests/tests/TestMenuManager.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class MenuManagerTest : public ::testing::Test {
5757
RegisterTestWindowClass();
5858
CreateTestMenu();
5959
CreateTestWindow();
60-
ASSERT_NE(0, (LONG)m_hWindow);
60+
ASSERT_NE(0, (LONG_PTR)m_hWindow);
6161
MenuManager::create(m_hWindow, reinterpret_cast<HINSTANCE>(m_hModule), NULL);
6262
m_menuManager = MenuManager::getInstance();
6363
}
@@ -198,7 +198,7 @@ struct MenuTestCase {
198198

199199
const TCHAR *menuName;
200200
const TCHAR *optionName;
201-
int expectedID;
201+
size_t expectedID;
202202
};
203203

204204

@@ -213,7 +213,7 @@ TEST_P(MenuManagerFindMenuCommandTest, testFindOptionFindsCorrectOption) {
213213
LONG_PTR windowWndProc = GetWindowLongPtr(m_hWindow, GWLP_WNDPROC);
214214
LONG_PTR dummyProc = reinterpret_cast<LONG_PTR>(&dummyWindowProc);
215215
ASSERT_EQ(windowWndProc, dummyProc);
216-
int foundMenuId = m_menuManager->findMenuCommand(m_hMenu, NULL, testCase.menuName, testCase.optionName);
216+
size_t foundMenuId = m_menuManager->findMenuCommand(m_hMenu, NULL, testCase.menuName, testCase.optionName);
217217
ASSERT_EQ(testCase.expectedID, foundMenuId);
218218
}
219219

@@ -240,7 +240,7 @@ class MenuManagerFindPluginCommandTest : public MenuManagerTest,
240240

241241
TEST_P(MenuManagerFindPluginCommandTest, testFindPluginCommand) {
242242
MenuTestCase testCase = GetParam();
243-
int foundMenuId = m_menuManager->findPluginCommand(testCase.menuName, testCase.optionName, false);
243+
size_t foundMenuId = m_menuManager->findPluginCommand(testCase.menuName, testCase.optionName, false);
244244
ASSERT_EQ(testCase.expectedID, foundMenuId);
245245
}
246246

0 commit comments

Comments
 (0)