Skip to content

Commit ecdf171

Browse files
OMpawar-21OMpawar-21
authored
Merge branch 'enhc/beta' into enhc/DX-7303
2 parents af9a7dd + 673b7c7 commit ecdf171

7 files changed

Lines changed: 178 additions & 180 deletions

File tree

‎Contentstack.Management.Core.Tests/IntegrationTest/Contentstack020_WorkflowTest.cs‎

Lines changed: 84 additions & 85 deletions
Large diffs are not rendered by default.

‎Contentstack.Management.Core.Unit.Tests/Core/Services/Stack/BulkWorkflowUpdateServiceTest.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,10 @@ public void Should_Verify_Service_Properties_Are_Set()
224224
public void Should_Verify_Service_Can_Be_Instantiated_With_Different_Serializers()
225225
{
226226
var updateBody = new BulkWorkflowUpdateBody();
227-
var customSerializer = new JsonSerializerOptions { DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull };
227+
var customSerializer = new JsonSerializerOptions
228+
{
229+
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
230+
};
228231

229232
var service = new BulkWorkflowUpdateService(customSerializer, new Management.Core.Models.Stack(null), updateBody);
230233

‎Contentstack.Management.Core.Unit.Tests/Models/WebhookTest.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void Should_Create_Webhook()
6464
ContentstackResponse response = _stack.Webhook().Create(_fixture.Create<WebhookModel>());
6565

6666
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
67-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
67+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
6868
}
6969

7070
[TestMethod]
@@ -73,7 +73,7 @@ public async System.Threading.Tasks.Task Should_Create_Webhook_Async()
7373
ContentstackResponse response = await _stack.Webhook().CreateAsync(_fixture.Create<WebhookModel>());
7474

7575
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
76-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
76+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
7777
}
7878

7979
[TestMethod]
@@ -82,7 +82,7 @@ public void Should_Query_Webhook()
8282
ContentstackResponse response = _stack.Webhook().Query().Find();
8383

8484
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
85-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
85+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
8686
}
8787

8888
[TestMethod]
@@ -91,7 +91,7 @@ public async System.Threading.Tasks.Task Should_Query_Webhook_Async()
9191
ContentstackResponse response = await _stack.Webhook().Query().FindAsync();
9292

9393
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
94-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
94+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
9595
}
9696

9797
[TestMethod]
@@ -100,7 +100,7 @@ public void Should_Fetch_Webhook()
100100
ContentstackResponse response = _stack.Webhook(_fixture.Create<string>()).Fetch();
101101

102102
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
103-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
103+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
104104
}
105105

106106
[TestMethod]
@@ -109,7 +109,7 @@ public async System.Threading.Tasks.Task Should_Find_Webhook_Async()
109109
ContentstackResponse response = await _stack.Webhook(_fixture.Create<string>()).FetchAsync();
110110

111111
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
112-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
112+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
113113
}
114114

115115
[TestMethod]
@@ -118,7 +118,7 @@ public void Should_Update_Webhook()
118118
ContentstackResponse response = _stack.Webhook(_fixture.Create<string>()).Update(_fixture.Create<WebhookModel>());
119119

120120
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
121-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
121+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
122122
}
123123

124124
[TestMethod]
@@ -127,7 +127,7 @@ public async System.Threading.Tasks.Task Should_Update_Webhook_Async()
127127
ContentstackResponse response = await _stack.Webhook(_fixture.Create<string>()).UpdateAsync(_fixture.Create<WebhookModel>());
128128

129129
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
130-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
130+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
131131
}
132132

133133
[TestMethod]
@@ -136,7 +136,7 @@ public void Should_Delete_Webhook()
136136
ContentstackResponse response = _stack.Webhook(_fixture.Create<string>()).Delete();
137137

138138
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
139-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
139+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
140140
}
141141

142142
[TestMethod]
@@ -145,7 +145,7 @@ public async System.Threading.Tasks.Task Should_Delete_Webhook_Async()
145145
ContentstackResponse response = await _stack.Webhook(_fixture.Create<string>()).DeleteAsync();
146146

147147
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
148-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
148+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
149149
}
150150

151151
[TestMethod]
@@ -154,7 +154,7 @@ public void Should_Executions_Webhook()
154154
ContentstackResponse response = _stack.Webhook(_fixture.Create<string>()).Executions();
155155

156156
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
157-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
157+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
158158
}
159159

160160
[TestMethod]
@@ -163,7 +163,7 @@ public async System.Threading.Tasks.Task Should_Executions_Webhook_Async()
163163
ContentstackResponse response = await _stack.Webhook(_fixture.Create<string>()).ExecutionsAsync();
164164

165165
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
166-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
166+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
167167
}
168168

169169
[TestMethod]
@@ -172,7 +172,7 @@ public void Should_Retry_Webhook()
172172
ContentstackResponse response = _stack.Webhook(_fixture.Create<string>()).Retry(_fixture.Create<string>());
173173

174174
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
175-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
175+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
176176
}
177177

178178
[TestMethod]
@@ -181,7 +181,7 @@ public async System.Threading.Tasks.Task Should_Retry_Webhook_Async()
181181
ContentstackResponse response = await _stack.Webhook(_fixture.Create<string>()).RetryAsync(_fixture.Create<string>());
182182

183183
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
184-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
184+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
185185
}
186186

187187
[TestMethod]
@@ -190,7 +190,7 @@ public void Should_Logs_Webhook()
190190
ContentstackResponse response = _stack.Webhook(_fixture.Create<string>()).Logs(_fixture.Create<string>());
191191

192192
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
193-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
193+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
194194
}
195195

196196
[TestMethod]
@@ -199,7 +199,7 @@ public async System.Threading.Tasks.Task Should_Logs_Webhook_Async()
199199
ContentstackResponse response = await _stack.Webhook(_fixture.Create<string>()).LogsAsync(_fixture.Create<string>());
200200

201201
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
202-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
202+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
203203
}
204204
}
205205
}

‎Contentstack.Management.Core.Unit.Tests/Models/WorkflowTest.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void Should_Create_Workflow()
6666
ContentstackResponse response = _stack.Workflow().Create(new WorkflowModel());
6767

6868
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
69-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
69+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
7070
}
7171

7272
[TestMethod]
@@ -75,7 +75,7 @@ public async System.Threading.Tasks.Task Should_Create_Workflow_Async()
7575
ContentstackResponse response = await _stack.Workflow().CreateAsync(new WorkflowModel());
7676

7777
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
78-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
78+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
7979
}
8080

8181
[TestMethod]
@@ -84,7 +84,7 @@ public void Should_Find_All_Workflow()
8484
ContentstackResponse response = _stack.Workflow().FindAll();
8585

8686
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
87-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
87+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
8888
}
8989

9090
[TestMethod]
@@ -93,7 +93,7 @@ public async System.Threading.Tasks.Task Should_Find_All_Workflow_Async()
9393
ContentstackResponse response = await _stack.Workflow().FindAllAsync();
9494

9595
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
96-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
96+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
9797
}
9898

9999
[TestMethod]
@@ -102,7 +102,7 @@ public void Should_Fetch_Workflow()
102102
ContentstackResponse response = _stack.Workflow(_fixture.Create<string>()).Fetch();
103103

104104
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
105-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
105+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
106106
}
107107

108108
[TestMethod]
@@ -111,7 +111,7 @@ public async System.Threading.Tasks.Task Should_Find_Workflow_Async()
111111
ContentstackResponse response = await _stack.Workflow(_fixture.Create<string>()).FetchAsync();
112112

113113
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
114-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
114+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
115115
}
116116

117117
[TestMethod]
@@ -120,7 +120,7 @@ public void Should_Update_Workflow()
120120
ContentstackResponse response = _stack.Workflow(_fixture.Create<string>()).Update(new WorkflowModel());
121121

122122
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
123-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
123+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
124124
}
125125

126126
[TestMethod]
@@ -129,7 +129,7 @@ public async System.Threading.Tasks.Task Should_Update_Workflow_Async()
129129
ContentstackResponse response = await _stack.Workflow(_fixture.Create<string>()).UpdateAsync(new WorkflowModel());
130130

131131
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
132-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
132+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
133133
}
134134

135135
[TestMethod]
@@ -138,7 +138,7 @@ public void Should_Delete_Workflow()
138138
ContentstackResponse response = _stack.Workflow(_fixture.Create<string>()).Delete();
139139

140140
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
141-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
141+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
142142
}
143143

144144
[TestMethod]
@@ -147,7 +147,7 @@ public async System.Threading.Tasks.Task Should_Delete_Workflow_Async()
147147
ContentstackResponse response = await _stack.Workflow(_fixture.Create<string>()).DeleteAsync();
148148

149149
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
150-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
150+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
151151
}
152152

153153
[TestMethod]
@@ -156,7 +156,7 @@ public void Should_Disable_Workflow()
156156
ContentstackResponse response = _stack.Workflow(_fixture.Create<string>()).Disable();
157157

158158
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
159-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
159+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
160160
}
161161

162162
[TestMethod]
@@ -165,7 +165,7 @@ public async System.Threading.Tasks.Task Should_Disable_Workflow_Async()
165165
ContentstackResponse response = await _stack.Workflow(_fixture.Create<string>()).DisableAsync();
166166

167167
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
168-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
168+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
169169
}
170170

171171
[TestMethod]
@@ -174,7 +174,7 @@ public void Should_Enable_Workflow()
174174
ContentstackResponse response = _stack.Workflow(_fixture.Create<string>()).Enable();
175175

176176
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
177-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
177+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
178178
}
179179

180180
[TestMethod]
@@ -183,7 +183,7 @@ public async System.Threading.Tasks.Task Should_Enable_Workflow_Async()
183183
ContentstackResponse response = await _stack.Workflow(_fixture.Create<string>()).EnableAsync();
184184

185185
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
186-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
186+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
187187
}
188188

189189
[TestMethod]
@@ -192,7 +192,7 @@ public void Should_Get_Publish_Rule_ContentType()
192192
ContentstackResponse response = _stack.Workflow(_fixture.Create<string>()).GetPublishRule(_fixture.Create<string>(), null);
193193

194194
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
195-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
195+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
196196
}
197197

198198
[TestMethod]
@@ -201,7 +201,7 @@ public async System.Threading.Tasks.Task Should_Get_Publish_Rule_ContentType_Asy
201201
ContentstackResponse response = await _stack.Workflow(_fixture.Create<string>()).GetPublishRuleAsync(_fixture.Create<string>(), null);
202202

203203
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
204-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
204+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
205205
}
206206
}
207207
}

0 commit comments

Comments
 (0)