Skip to content

refactor: Test execution optimisation #236

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

Closed
wants to merge 11 commits into from
Closed

refactor: Test execution optimisation #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4e3bb3f
refactor tests grant calls overlapping
Feb 4, 2025
428a290
test:fix: authToken for grantToken init()
Feb 4, 2025
0c6b3af
test:fix:grantToken
Feb 4, 2025
da77793
test:fix:channelNames correction for message count tests
Feb 4, 2025
90fad0a
test:fix:channel Names in subscribe tests
Feb 5, 2025
5b6b7af
* workflow change to prevent test running on each push.
Feb 6, 2025
cf4c503
Update run-tests.yml
mohitpubnub Feb 6, 2025
a986caf
update workflow to run tests on any non draft PR
Feb 6, 2025
a1839f2
test:fix: subscribe tests grant token access
Feb 7, 2025
678f12a
workflow update for tests on ready PR only.
Feb 7, 2025
838738a
Reverted changes at run-tests.yml to master
mohitpubnub Feb 24, 2025
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
2 changes: 2 additions & 0 deletions src/UnitTests/PubnubApi.Tests/PubnubCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public static class PubnubCommon

public static readonly string StubOrign = "localhost:9191";
public static readonly string EncodedSDK = "PubNubCSharp";

public static string GrantToken = "";

static PubnubCommon()
{
Expand Down
89 changes: 89 additions & 0 deletions src/UnitTests/PubnubApi.Tests/TestHarness.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
using PubnubApi;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using NUnit.Framework;

namespace PubNubMessaging.Tests
{
Expand Down Expand Up @@ -37,5 +40,91 @@ protected static Pubnub createPubNubInstance(PNConfiguration pnConfiguration, st
}
return pubnub;
}

public static async Task GenerateTestGrantToken(Pubnub pubnub, string presenceTestChannel = "presenceTestChannel")
{
string channel = "hello_my_channel";
string channel1 = "hello_my_channel_1";
string channel2 = "hello_my_channel_2";
string channel3 = "hello_my_channel_3";
string channel4 = "hello_my_channel_4";
string group = "hello_my_group";
string channelPattern = "foo.*";

var fullAccess = new PNTokenAuthValues()
{
Read = true,
Write = true,
Create = true,
Get = true,
Delete = true,
Join = true,
Update = true,
Manage = true
};
var grantResult = await pubnub.GrantToken().TTL(30).AuthorizedUuid(pubnub.PNConfig.UserId).Resources(
new PNTokenResources()
{
Channels = new Dictionary<string, PNTokenAuthValues>()
{
{
channel, fullAccess
},
{
channel+"-pnpres", fullAccess
},
{
channel1, fullAccess
},
{
channel1+"-pnpres", fullAccess
},
{
channel2, fullAccess
},
{
channel2+"-pnpres", fullAccess
},
{
channel3, fullAccess
},
{
channel3+"-pnpres", fullAccess
},
{
channel4, fullAccess
},
{
channel4+"-pnpres", fullAccess
},
{
presenceTestChannel, fullAccess
},
{
$"{presenceTestChannel}{Constants.Pnpres}", fullAccess
},
},
ChannelGroups = new Dictionary<string, PNTokenAuthValues>()
{
{group, fullAccess},
{group+"-pnpres", fullAccess}
}
})
.Patterns(new PNTokenPatterns()
{
Channels = new Dictionary<string, PNTokenAuthValues>()
{
{ channelPattern, fullAccess },
{ channelPattern+"-pnpres", fullAccess }
}
})
.ExecuteAsync();

await Task.Delay(4000);

PubnubCommon.GrantToken = grantResult.Result?.Token;
Assert.IsTrue(grantResult.Status.Error == false && grantResult.Result != null,
"GrantToken() failed.");
}
}
}
67 changes: 6 additions & 61 deletions src/UnitTests/PubnubApi.Tests/WhenAClientIsPresented.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,71 +71,16 @@ public static async Task Init()
.WithPath(string.Format("/v2/auth/grant/sub-key/{0}", PubnubCommon.SubscribeKey))
.WithResponse(expected)
.WithStatusCode(System.Net.HttpStatusCode.OK));

var fullAccess = new PNTokenAuthValues()
{
Read = true,
Write = true,
Create = true,
Get = true,
Delete = true,
Join = true,
Update = true,
Manage = true
};
var grantResult = await pubnub.GrantToken().TTL(20).AuthorizedUuid(config.UserId).Resources(
new PNTokenResources()
{
Channels = new Dictionary<string, PNTokenAuthValues>()
{
{
channel, fullAccess
},
{
channel+"-pnpres", fullAccess
},
{
channel1, fullAccess
},
{
channel1+"-pnpres", fullAccess
},
{
channel2, fullAccess
},
{
channel2+"-pnpres", fullAccess
},
{
channel3, fullAccess
},
{
channel3+"-pnpres", fullAccess
},
{
channel4, fullAccess
},
{
channel4+"-pnpres", fullAccess
},
{
presenceTestChannel, fullAccess
},
{
$"{presenceTestChannel}{Constants.Pnpres}", fullAccess
},
},
}).ExecuteAsync();

await Task.Delay(4000);

authToken = grantResult.Result?.Token;

if (string.IsNullOrEmpty(PubnubCommon.GrantToken))
{
await GenerateTestGrantToken(pubnub, presenceTestChannel);
}
authToken = PubnubCommon.GrantToken;

pubnub.Destroy();
pubnub.PubnubUnitTest = null;
pubnub = null;
Assert.IsTrue(grantResult.Status.Error == false && grantResult.Result != null,
"WhenAClientIsPresent Grant access failed.");
}

[TearDown]
Expand Down
Loading
Loading