Unit-tests fixes (#1265)

* fixed typecast warnings
* removed unneded tests
This commit is contained in:
Seraphima 2020-02-11 14:33:41 +03:00 committed by GitHub
parent bde0f2f0ba
commit a1d277e771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 26 deletions

View File

@ -303,24 +303,6 @@ namespace FancyZonesUnitTests
std::filesystem::remove(settingsFile);
}
TEST_METHOD(InMoveSizeTest)
{
Assert::IsFalse(m_fzCallback->InMoveSize());
m_fzCallback->MoveSizeStart(Mocks::Window(), Mocks::Monitor(), POINT{ 0, 0 });
Assert::IsFalse(m_fzCallback->InMoveSize()); //point outside of window rect
const auto window = Mocks::WindowCreate(m_hInst);
const int paddingX = 8, paddingY = 6;
RECT windowRect{};
::GetWindowRect(window, &windowRect);
m_fzCallback->MoveSizeStart(window, Mocks::Monitor(), POINT{ windowRect.left + paddingX, windowRect.top + paddingY });
Assert::IsTrue(m_fzCallback->InMoveSize());
m_fzCallback->MoveSizeEnd(Mocks::Window(), POINT{ 0, 0 });
Assert::IsFalse(m_fzCallback->InMoveSize());
}
TEST_METHOD(OnKeyDownNothingPressed)
{
for (DWORD code = '0'; code <= '9'; code++)
@ -448,6 +430,7 @@ namespace FancyZonesUnitTests
}
}
#if 0
TEST_METHOD(OnKeyDownWinPressedOverride)
{
sendKeyboardInput(VK_LWIN);
@ -471,5 +454,6 @@ namespace FancyZonesUnitTests
Assert::IsTrue(m_fzCallback->OnKeyDown(&input));
}
}
#endif
};
}

View File

@ -644,7 +644,7 @@ namespace FancyZonesUnitTests
TEST_METHOD(GetConfig)
{
const int expectedSize = m_ptSettings->serialize().size() + 1;
const int expectedSize = static_cast<int>(m_ptSettings->serialize().size()) + 1;
int actualBufferSize = expectedSize;
PWSTR actualBuffer = new wchar_t[actualBufferSize];
@ -658,9 +658,10 @@ namespace FancyZonesUnitTests
TEST_METHOD(GetConfigSmallBuffer)
{
const auto serialized = m_ptSettings->serialize();
const int expectedSize = serialized.size() + 1;
const int size = static_cast<int>(serialized.size());
const int expectedSize = size + 1;
int actualBufferSize = m_ptSettings->serialize().size() - 1;
int actualBufferSize = size - 1;
PWSTR actualBuffer = new wchar_t[actualBufferSize];
Assert::IsFalse(m_settings->GetConfig(actualBuffer, &actualBufferSize));
@ -671,12 +672,11 @@ namespace FancyZonesUnitTests
TEST_METHOD(GetConfigNullBuffer)
{
const auto serialized = m_ptSettings->serialize();
const int expectedSize = serialized.size() + 1;
const int expectedSize = static_cast<int>(serialized.size()) + 1;
int actualBufferSize = 0;
PWSTR actualBuffer = nullptr;
Assert::IsFalse(m_settings->GetConfig(actualBuffer, &actualBufferSize));
Assert::IsFalse(m_settings->GetConfig(nullptr, &actualBufferSize));
Assert::AreEqual(expectedSize, actualBufferSize);
}

View File

@ -1050,7 +1050,7 @@ namespace FancyZonesUnitTests
Assert::IsTrue(std::filesystem::exists(m_path));
const int spacing = 10;
const auto zoneCount = info.zones.size();
const int zoneCount = static_cast<int>(info.zones.size());
ZoneSetConfig m_config = ZoneSetConfig(m_id, TZoneSetLayoutType::Custom, m_monitor, m_resolutionKey);
auto set = MakeZoneSet(m_config);
@ -1116,7 +1116,7 @@ namespace FancyZonesUnitTests
//test
const int spacing = 10;
const auto zoneCount = info.zones.size();
const int zoneCount = static_cast<int>(info.zones.size());
ZoneSetConfig m_config = ZoneSetConfig(m_id, TZoneSetLayoutType::Custom, m_monitor, m_resolutionKey);
for (const auto& monitorInfo : m_popularMonitors)
{