Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unit-tests fixes #1265

Merged
merged 2 commits into from
Feb 11, 2020
Merged

Unit-tests fixes #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
953d081
fixed typecast warnings
SeraphimaZykova Feb 11, 2020
9358119
removed unneded tests
SeraphimaZykova Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions src/modules/fancyzones/tests/UnitTests/FancyZones.Spec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand Down Expand Up @@ -448,6 +430,7 @@ namespace FancyZonesUnitTests
}
}

#if 0
TEST_METHOD(OnKeyDownWinPressedOverride)
{
sendKeyboardInput(VK_LWIN);
Expand All @@ -471,5 +454,6 @@ namespace FancyZonesUnitTests
Assert::IsTrue(m_fzCallback->OnKeyDown(&input));
}
}
#endif
};
}
12 changes: 6 additions & 6 deletions src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -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));
Expand All @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions src/modules/fancyzones/tests/UnitTests/ZoneSet.Spec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
{
Expand Down