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

Refactoring PushNotification unit tests #2389

Merged
merged 16 commits into from
Apr 20, 2022
Merged

Refactoring PushNotification unit tests #2389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
45d6a34
Work in progress
pmpurifoy Apr 7, 2022
310f7dc
Push tests working individually
pmpurifoy Apr 11, 2022
ccaaf7b
Adding LRP to singleton, nits
pmpurifoy Apr 13, 2022
ec7a981
Update PowerNotifications.vcxproj
pmpurifoy Apr 13, 2022
99fa965
Condensed packaged/unpackaged self contained tests
pmpurifoy Apr 13, 2022
c382214
Used IsSupported flag instead
pmpurifoy Apr 14, 2022
b833a49
Working on it
pmpurifoy Apr 14, 2022
e82b459
BaseTestSuite working
pmpurifoy Apr 15, 2022
ce4c63a
Removed unused namespaces
pmpurifoy Apr 15, 2022
e6fe544
Addressing nits
pmpurifoy Apr 18, 2022
5a6f6a4
Use verify instead of throw
pmpurifoy Apr 18, 2022
3329bec
rename m_registered -> m_unregisteredFully
pmpurifoy Apr 18, 2022
cade72f
Ignored failing tests
pmpurifoy Apr 18, 2022
a8749c4
Fix build issues
pmpurifoy Apr 19, 2022
0a23873
Update PushNotificationTests.vcxproj
pmpurifoy Apr 19, 2022
6d29c56
Update AppNotification-Test-Constants.h
pmpurifoy Apr 19, 2022
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
18 changes: 9 additions & 9 deletions test/PushNotificationTests/UnpackagedTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace Test::PushNotifications

void UnpackagedTests::ChannelRequestUsingNullRemoteId()
{
if (!m_isSelfContained)
if (PushNotificationManager::Default().IsSupported())
{
VERIFY_THROWS_HR(PushNotificationManager::Default().CreateChannelAsync(winrt::guid()).get(), E_INVALIDARG);
}
Expand All @@ -56,7 +56,7 @@ namespace Test::PushNotifications

void UnpackagedTests::ChannelRequestUsingRemoteId()
{
if (!m_isSelfContained)
if (PushNotificationManager::Default().IsSupported())
{
auto channelOperation{ PushNotificationManager::Default().CreateChannelAsync(c_azureRemoteId) };
VERIFY_SUCCEEDED(ChannelRequestHelper(channelOperation));
Expand Down Expand Up @@ -95,7 +95,7 @@ namespace Test::PushNotifications

void UnpackagedTests::VerifyUnregisterFails()
{
if (!m_isSelfContained)
if (PushNotificationManager::Default().IsSupported())
{
VERIFY_THROWS_HR(PushNotificationManager::Default().Unregister(), E_UNEXPECTED);
}
Expand All @@ -107,7 +107,7 @@ namespace Test::PushNotifications

void UnpackagedTests::VerifyUnregisterAllFails()
{
if (!m_isSelfContained)
if (PushNotificationManager::Default().IsSupported())
{
VERIFY_THROWS_HR(PushNotificationManager::Default().UnregisterAll(), E_UNEXPECTED);
}
Expand All @@ -131,7 +131,7 @@ namespace Test::PushNotifications
PushNotificationManager::Default().Register();
m_registered = true;

if (!m_isSelfContained)
if (PushNotificationManager::Default().IsSupported())
{
VERIFY_THROWS_HR(PushNotificationManager::Default().Register(), HRESULT_FROM_WIN32(ERROR_ALREADY_REGISTERED));
}
Expand All @@ -148,7 +148,7 @@ namespace Test::PushNotifications

PushNotificationManager::Default().Unregister();

if (!m_isSelfContained)
if (PushNotificationManager::Default().IsSupported())
{
VERIFY_THROWS_HR(PushNotificationManager::Default().Register(), HRESULT_FROM_WIN32(ERROR_ALREADY_REGISTERED));
}
Expand Down Expand Up @@ -179,7 +179,7 @@ namespace Test::PushNotifications
m_registered = true;

PushNotificationManager::Default().Unregister();
if (!m_isSelfContained)
if (PushNotificationManager::Default().IsSupported())
{
VERIFY_THROWS_HR(PushNotificationManager::Default().Unregister(), E_UNEXPECTED);
}
Expand All @@ -197,7 +197,7 @@ namespace Test::PushNotifications
PushNotificationManager::Default().UnregisterAll();
m_registered = false;

if (!m_isSelfContained)
if (PushNotificationManager::Default().IsSupported())
{
VERIFY_THROWS_HR(PushNotificationManager::Default().UnregisterAll(), E_UNEXPECTED);
}
Expand Down Expand Up @@ -229,7 +229,7 @@ namespace Test::PushNotifications
PushNotificationManager::Default().Register();
m_registered = true;

if (!m_isSelfContained)
if (PushNotificationManager::Default().IsSupported())
{
VERIFY_THROWS_HR(PushNotificationManager::Default().PushReceived([](const auto&, PushNotificationReceivedEventArgs const& /* args */) {}), HRESULT_FROM_WIN32(ERROR_NOT_FOUND));
}
Expand Down
6 changes: 3 additions & 3 deletions test/PushNotificationTests/UnpackagedTests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ namespace Test::PushNotifications
HRESULT ChannelRequestHelper(IAsyncOperationWithProgress<PushNotificationCreateChannelResult, PushNotificationCreateChannelStatus> const& channelOperation);

bool m_registered{ false };
bool m_isSelfContained{ false };
public:
BEGIN_TEST_CLASS(UnpackagedTests)
TEST_CLASS_PROPERTY(L"Description", L"Windows App SDK Push Notifications test")
Expand All @@ -38,9 +37,10 @@ namespace Test::PushNotifications
TEST_CLASS_SETUP(ClassInit)
{
::Test::Bootstrap::Setup();
if (SUCCEEDED(TestData::TryGetValue(L"SelfContained", m_isSelfContained)))
bool isSelfContained{ false };
if (SUCCEEDED(TestData::TryGetValue(L"SelfContained", isSelfContained)))
{
if (!m_isSelfContained)
if (!isSelfContained)
{
::WindowsAppRuntime::SelfContained::TestInitialize(::Test::Bootstrap::TP::WindowsAppRuntimeFramework::c_PackageFamilyName);
}
Expand Down