Skip to content

refactor: migrate RoleModel and related tests to use System.Text.Json for serialization #190

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

Merged
reeshika-h merged 3 commits into from
Jun 3, 2026
Merged

refactor: migrate RoleModel and related tests to use System.Text.Json for serialization #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e6352a
refactor: migrate RoleModel and related tests to use System.Text.Json…
reeshika-h Jun 2, 2026
979d93b
Merge branch 'enhc/beta' into enh/DX-7308-role-migration
reeshika-h Jun 2, 2026
9cf9907
refactor: update Role method signature and re-enable Role.cs for STJ …
reeshika-h Jun 2, 2026
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
1 change: 0 additions & 1 deletion Contentstack.Management.Core.Tests/Contentstack.Management.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,5 @@
<!-- Contentstack020_WorkflowTest.cs - RE-ENABLED for Workflow module STJ migration -->
<Compile Remove="IntegrationTest\Contentstack012b_ContentTypeExpandedIntegrationTest.cs" />

<Compile Remove="IntegrationTest\Contentstack019_RoleTest.cs" />
</ItemGroup>
</Project>
42 changes: 21 additions & 21 deletions Contentstack.Management.Core.Tests/IntegrationTest/Contentstack019_RoleTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Contentstack.Management.Core.Tests.Helpers;
using Contentstack.Management.Core.Tests.Model;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json.Linq;
using System.Text.Json.Nodes;

namespace Contentstack.Management.Core.Tests.IntegrationTest
{
Expand Down Expand Up @@ -66,7 +66,7 @@ private static RoleModel BuildMinimalRoleModel(string uniqueName)

private static string ParseRoleUid(ContentstackResponse response)
{
var jo = response.OpenJObjectResponse();
var jo = response.OpenJsonObjectResponse();
return jo?["role"]?["uid"]?.ToString();
}

Expand All @@ -87,7 +87,7 @@ private void SafeDelete(string roleUid)
}
}

private static bool RolesArrayContainsUid(JArray roles, string uid)
private static bool RolesArrayContainsUid(JsonArray roles, string uid)
{
if (roles == null || string.IsNullOrEmpty(uid))
{
Expand Down Expand Up @@ -324,7 +324,7 @@ public void Test001_Should_Create_Role_Sync()
roleUid = ParseRoleUid(response);
AssertLogger.IsNotNull(roleUid, "role uid");

var jo = response.OpenJObjectResponse();
var jo = response.OpenJsonObjectResponse();
AssertLogger.AreEqual(name, jo["role"]?["name"]?.ToString(), "Response name should match", "RoleName");
}
finally
Expand All @@ -349,7 +349,7 @@ public void Test002_Should_Fetch_Role_Sync()
ContentstackResponse fetchResponse = _stack.Role(roleUid).Fetch();
AssertLogger.IsTrue(fetchResponse.IsSuccessStatusCode, "Fetch should succeed", "FetchSyncSuccess");

var role = fetchResponse.OpenJObjectResponse()?["role"];
var role = fetchResponse.OpenJsonObjectResponse()?["role"];
AssertLogger.AreEqual(name, role?["name"]?.ToString(), "Fetched name should match", "FetchedName");
AssertLogger.AreEqual(roleUid, role?["uid"]?.ToString(), "Fetched uid should match", "FetchedUid");
}
Expand All @@ -375,7 +375,7 @@ public void Test003_Should_Query_Roles_Sync()
ContentstackResponse queryResponse = _stack.Role().Query().Find();
AssertLogger.IsTrue(queryResponse.IsSuccessStatusCode, "Query Find should succeed", "QueryFindSuccess");

var roles = queryResponse.OpenJObjectResponse()?["roles"] as JArray;
var roles = queryResponse.OpenJsonObjectResponse()?["roles"] as JsonArray;
AssertLogger.IsNotNull(roles, "roles array");
AssertLogger.IsTrue(
RolesArrayContainsUid(roles, roleUid),
Expand Down Expand Up @@ -408,7 +408,7 @@ public void Test004_Should_Update_Role_Sync()

ContentstackResponse fetchResponse = _stack.Role(roleUid).Fetch();
AssertLogger.IsTrue(fetchResponse.IsSuccessStatusCode, "Fetch after update should succeed", "FetchAfterUpdate");
var role = fetchResponse.OpenJObjectResponse()?["role"];
var role = fetchResponse.OpenJsonObjectResponse()?["role"];
AssertLogger.AreEqual(updatedName, role?["name"]?.ToString(), "Name should reflect update", "UpdatedName");
}
finally
Expand Down Expand Up @@ -466,7 +466,7 @@ public async Task Test006_Should_Create_Role_Async()
roleUid = ParseRoleUid(response);
AssertLogger.IsNotNull(roleUid, "role uid");

var jo = response.OpenJObjectResponse();
var jo = response.OpenJsonObjectResponse();
AssertLogger.AreEqual(name, jo["role"]?["name"]?.ToString(), "Response name should match", "RoleName");
}
finally
Expand All @@ -491,7 +491,7 @@ public async Task Test007_Should_Fetch_Role_Async()
ContentstackResponse fetchResponse = await _stack.Role(roleUid).FetchAsync();
AssertLogger.IsTrue(fetchResponse.IsSuccessStatusCode, "FetchAsync should succeed", "FetchAsyncSuccess");

var role = fetchResponse.OpenJObjectResponse()?["role"];
var role = fetchResponse.OpenJsonObjectResponse()?["role"];
AssertLogger.AreEqual(name, role?["name"]?.ToString(), "Fetched name should match", "FetchedName");
AssertLogger.AreEqual(roleUid, role?["uid"]?.ToString(), "Fetched uid should match", "FetchedUid");
}
Expand All @@ -517,7 +517,7 @@ public async Task Test008_Should_Query_Roles_Async()
ContentstackResponse queryResponse = await _stack.Role().Query().FindAsync();
AssertLogger.IsTrue(queryResponse.IsSuccessStatusCode, "Query FindAsync should succeed", "QueryFindAsyncSuccess");

var roles = queryResponse.OpenJObjectResponse()?["roles"] as JArray;
var roles = queryResponse.OpenJsonObjectResponse()?["roles"] as JsonArray;
AssertLogger.IsNotNull(roles, "roles array");
AssertLogger.IsTrue(
RolesArrayContainsUid(roles, roleUid),
Expand Down Expand Up @@ -550,7 +550,7 @@ public async Task Test009_Should_Update_Role_Async()

ContentstackResponse fetchResponse = await _stack.Role(roleUid).FetchAsync();
AssertLogger.IsTrue(fetchResponse.IsSuccessStatusCode, "FetchAsync after update should succeed", "FetchAsyncAfterUpdate");
var role = fetchResponse.OpenJObjectResponse()?["role"];
var role = fetchResponse.OpenJsonObjectResponse()?["role"];
AssertLogger.AreEqual(updatedName, role?["name"]?.ToString(), "Name should reflect update", "UpdatedName");
}
finally
Expand Down Expand Up @@ -888,11 +888,11 @@ public void Test023_Should_Accept_Create_Role_With_Null_Rules_Sync()
AssertLogger.IsNotNull(roleUid, "NullRulesAccepted");

// Verify API accepted the request - detailed rule validation is optional
var responseContent = response.OpenJObjectResponse();
var responseContent = response.OpenJsonObjectResponse();
if (responseContent?["role"] != null)
{
var role = responseContent["role"];
var rules = role["rules"] as JArray;
var rules = role["rules"] as JsonArray;
if (rules != null && rules.Count > 0)
{
AssertLogger.IsTrue(true, "DefaultRulesAdded");
Expand Down Expand Up @@ -941,7 +941,7 @@ public void Test024_Should_Accept_Create_Role_With_Empty_Rules_Sync()
AssertLogger.IsNotNull(roleUid, "EmptyRulesAccepted");

// Verify API accepted the request - detailed rule validation is optional
var responseContent = response.OpenJObjectResponse();
var responseContent = response.OpenJsonObjectResponse();
if (responseContent?["role"] != null)
{
AssertLogger.IsTrue(true, "EmptyRulesHandledByAPI");
Expand Down Expand Up @@ -985,7 +985,7 @@ public void Test025_Should_Accept_Create_Role_With_Empty_Branches_Sync()
AssertLogger.IsNotNull(roleUid, "EmptyBranchesAccepted");

// Verify API accepted the request - detailed branch validation is optional
var responseContent = response.OpenJObjectResponse();
var responseContent = response.OpenJsonObjectResponse();
if (responseContent?["role"] != null)
{
AssertLogger.IsTrue(true, "EmptyBranchesHandledByAPI");
Expand Down Expand Up @@ -1029,7 +1029,7 @@ public void Test026_Should_Accept_Create_Role_With_Nonexistent_Branch_Sync()
AssertLogger.IsNotNull(roleUid, "NonexistentBranchAccepted");

// Verify API accepted the request - detailed branch validation is optional
var responseContent = response.OpenJObjectResponse();
var responseContent = response.OpenJsonObjectResponse();
if (responseContent?["role"] != null)
{
AssertLogger.IsTrue(true, "NonexistentBranchHandledByAPI");
Expand Down Expand Up @@ -1144,7 +1144,7 @@ public void Test029_Should_Accept_Update_Role_With_Empty_Name_Sync()
AssertLogger.IsTrue(true, "EmptyNameUpdateAccepted");

// Verify API preserved original name when empty name provided
var role = updateResponse.OpenJObjectResponse()?["role"];
var role = updateResponse.OpenJsonObjectResponse()?["role"];
var currentName = role?["name"]?.ToString();
AssertLogger.AreEqual(originalName, currentName, "OriginalNamePreserved");
AssertLogger.IsTrue(!string.IsNullOrEmpty(currentName), "NameNotEmpty");
Expand Down Expand Up @@ -1401,7 +1401,7 @@ public async Task Test035_Should_Accept_Update_Role_With_Empty_Name_Async()
AssertLogger.IsTrue(true, "EmptyNameUpdateAcceptedAsync");

// Verify API preserved original name when empty name provided
var role = updateResponse.OpenJObjectResponse()?["role"];
var role = updateResponse.OpenJsonObjectResponse()?["role"];
var currentName = role?["name"]?.ToString();
AssertLogger.AreEqual(originalName, currentName, "OriginalNamePreservedAsync");
AssertLogger.IsTrue(!string.IsNullOrEmpty(currentName), "NameNotEmptyAsync");
Expand Down Expand Up @@ -2264,7 +2264,7 @@ public void Test054_Should_Handle_Unicode_Characters_In_Role_Name_Sync()
ContentstackResponse fetchResponse = _stack.Role(roleUid).Fetch();
if (fetchResponse.IsSuccessStatusCode)
{
var role = fetchResponse.OpenJObjectResponse()?["role"];
var role = fetchResponse.OpenJsonObjectResponse()?["role"];
var fetchedName = role?["name"]?.ToString();
AssertLogger.AreEqual(unicodeName, fetchedName, "Unicode name should be preserved", "UnicodePreserved");
}
Expand Down Expand Up @@ -2360,7 +2360,7 @@ public void Test056_Should_Handle_Stack_Role_Limits_Sync()
else if (response.StatusCode == (HttpStatusCode)422) // Unprocessable Entity
{
// Check for role limit error (Error Code 157)
var errorContent = response.OpenJObjectResponse();
var errorContent = response.OpenJsonObjectResponse();
var errorCode = errorContent?["error_code"]?.ToString();

if (errorCode == "157")
Expand Down Expand Up @@ -2574,7 +2574,7 @@ public void Test059_Should_Handle_Concurrent_Role_Modifications_Sync()
ContentstackResponse fetchResponse = _stack.Role(roleUid).Fetch();
if (fetchResponse.IsSuccessStatusCode)
{
var role = fetchResponse.OpenJObjectResponse()?["role"];
var role = fetchResponse.OpenJsonObjectResponse()?["role"];
AssertLogger.IsNotNull(role, "ConcurrentFinalState");
}

Expand Down
24 changes: 12 additions & 12 deletions Contentstack.Management.Core.Unit.Tests/Models/RoleTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void Should_Create_Role()
ContentstackResponse response = _stack.Role().Create(_fixture.Create<RoleModel>());

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -68,7 +68,7 @@ public async System.Threading.Tasks.Task Should_Create_Role_Async()
ContentstackResponse response = await _stack.Role().CreateAsync(_fixture.Create<RoleModel>());

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -77,7 +77,7 @@ public void Should_Query_Role()
ContentstackResponse response = _stack.Role().Query().Find();

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -86,7 +86,7 @@ public async System.Threading.Tasks.Task Should_Query_Role_Async()
ContentstackResponse response = await _stack.Role().Query().FindAsync();

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -95,7 +95,7 @@ public void Should_Fetch_Role()
ContentstackResponse response = _stack.Role(_fixture.Create<string>()).Fetch();

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -104,7 +104,7 @@ public async System.Threading.Tasks.Task Should_Find_Role_Async()
ContentstackResponse response = await _stack.Role(_fixture.Create<string>()).FetchAsync();

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -113,7 +113,7 @@ public void Should_Update_Role()
ContentstackResponse response = _stack.Role(_fixture.Create<string>()).Update(_fixture.Create<RoleModel>());

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -122,7 +122,7 @@ public async System.Threading.Tasks.Task Should_Update_Role_Async()
ContentstackResponse response = await _stack.Role(_fixture.Create<string>()).UpdateAsync(_fixture.Create<RoleModel>());

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -131,7 +131,7 @@ public void Should_Delete_Role()
ContentstackResponse response = _stack.Role(_fixture.Create<string>()).Delete();

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -140,7 +140,7 @@ public async System.Threading.Tasks.Task Should_Delete_Role_Async()
ContentstackResponse response = await _stack.Role(_fixture.Create<string>()).DeleteAsync();

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -149,7 +149,7 @@ public void Should_Create_Role_With_Taxonomy_Permissions()
ContentstackResponse response = _stack.Role().Create(_fixture.Create<RoleModel>());

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}

[TestMethod]
Expand All @@ -158,7 +158,7 @@ public void Should_Update_Role_With_Taxonomy_Permissions()
ContentstackResponse response = _stack.Role(_fixture.Create<string>()).Update(_fixture.Create<RoleModel>());

Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
}
}
}
Loading
Loading