admin/raven-test-integration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shorten concurrencytoken to concurrency

Browse Source
This commit is contained in:
John Cardinal
2020-05-13 19:57:01 +00:00
parent 8f75d03404
commit 743a9ebd78
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DataList/DataListViewCrud.cs
View File

@@ -58,7 +58,7 @@ namespace raven_integration
//PUT, make private
d["public"] = false;
d.name = Util.Uniquify("Put - Test DataListView (privatized)");
d.concurrencyToken = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
d.concurrency = a.ObjectResponse["data"]["concurrency"].Value<uint>();
a = await Util.PutAsync("DataListView/" + Id.ToString(), await Util.GetTokenAsync("BizAdminFull"), d.ToString());
Util.ValidateHTTPStatusCode(a, 200);

4
EventLog/EventLog.cs
View File

@@ -71,7 +71,7 @@ namespace raven_integration
//update w2id
w.name = Util.Uniquify("UPDATED VIA PUT EVENTLOG TEST WIDGET");
w.UserId = 1;
w.concurrencyToken = r2.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
w.concurrency = r2.ObjectResponse["data"]["concurrency"].Value<uint>();
ApiResponse PUTTestResponse = await Util.PutAsync("Widget/" + w2Id.ToString(), await Util.GetTokenAsync("InventoryFull"), w.ToString());
Util.ValidateHTTPStatusCode(PUTTestResponse, 200);
@@ -80,7 +80,7 @@ namespace raven_integration
ApiResponse checkPUTWorked = await Util.GetAsync("Widget/" + w2Id.ToString(), await Util.GetTokenAsync("InventoryFull"));
Util.ValidateNoErrorInResponse(checkPUTWorked);
checkPUTWorked.ObjectResponse["data"]["name"].Value<string>().Should().Be(w.name.ToString());
uint concurrencyToken = PUTTestResponse.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint concurrency = PUTTestResponse.ObjectResponse["data"]["concurrency"].Value<uint>();
EventLogResponse = await Util.GetAsync($"EventLog/ObjectLog?AyType=2&AyId={w2Id}", await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(EventLogResponse, 200);

10
FormCustom/FormCustom.cs
View File

@@ -72,20 +72,20 @@ namespace raven_integration
ApiResponse a = await Util.GetAsync("FormCustom/User", await Util.GetTokenAsync("BizAdminFull"));
//Update
d.concurrencyToken = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
d.concurrency = a.ObjectResponse["data"]["concurrency"].Value<uint>();
a = await Util.PutAsync("FormCustom/User", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
Util.ValidateHTTPStatusCode(a, 200);
//check the concurrency token cache scheme
uint token = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint token = a.ObjectResponse["data"]["concurrency"].Value<uint>();
//This should return a 304 not modified
a = await Util.GetAsync($"FormCustom/User?concurrencyToken={token}", await Util.GetTokenAsync("BizAdminFull"));
a = await Util.GetAsync($"FormCustom/User?concurrency={token}", await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 304);
//and this should return the whole object
token--;//make the token not match
//This should return a 200 and the whole object
a = await Util.GetAsync($"FormCustom/User?concurrencyToken={token}", await Util.GetTokenAsync("BizAdminFull"));
a = await Util.GetAsync($"FormCustom/User?concurrency={token}", await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateDataReturnResponseOk(a);
}
@@ -156,7 +156,7 @@ namespace raven_integration
ApiResponse a = await Util.GetAsync("FormCustom/User", await Util.GetTokenAsync("BizAdminFull"));
//Update
d.concurrencyToken = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
d.concurrency = a.ObjectResponse["data"]["concurrency"].Value<uint>();
a = await Util.PutAsync("FormCustom/User", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
Util.ValidateHTTPStatusCode(a, 400);
Util.ShouldContainValidationError(a, "Template", "2201", "Template array item 0, \"fld\" property exists but is empty, a value is required");

4
Tags/TagOps.cs
View File

@@ -65,7 +65,7 @@ namespace raven_integration
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
long WidgetId = a.ObjectResponse["data"]["id"].Value<long>();
uint ConcurrencyToken = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint Concurrency = a.ObjectResponse["data"]["concurrency"].Value<uint>();
//validate the repository LIST ROUTE of tags contains the ones above
a = await Util.GetAsync($"TagList/List?query={TagNameStart}", await Util.GetTokenAsync("manager", "l3tm3in"));
@@ -83,7 +83,7 @@ namespace raven_integration
UpdateTags.Add(s);
}
//update Widget and put to server
w.concurrencyToken = ConcurrencyToken;
w.concurrency = Concurrency;
w.tags = UpdateTags;
ApiResponse PUTTestResponse = await Util.PutAsync("Widget/" + WidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateHTTPStatusCode(PUTTestResponse, 200);

12
Translation/Translation.cs
View File

@@ -78,7 +78,7 @@ namespace raven_integration
a.ObjectResponse["data"]["name"].Value<string>().Should().Be(d.name.ToString());
a.ObjectResponse["data"]["stock"].Value<bool>().Should().Be(false);
a.ObjectResponse["data"]["id"].Value<long>().Should().BeGreaterThan(4);
a.ObjectResponse["data"]["concurrencyToken"].Value<uint>().Should().BeGreaterThan(0);
a.ObjectResponse["data"]["concurrency"].Value<uint>().Should().BeGreaterThan(0);
((JArray)a.ObjectResponse["data"]["translationItems"]).Count.Should().BeGreaterThan(0);
long NewId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -89,7 +89,7 @@ namespace raven_integration
dynamic d2 = new JObject();
d2.id = NewId;
d2.newText = Util.Uniquify("INTEGRATION-TEST-LOCALE NAME UPDATE");
d2.concurrencyToken = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
d2.concurrency = a.ObjectResponse["data"]["concurrency"].Value<uint>();
ApiResponse PUTTestResponse = await Util.PutAsync("Translation/UpdateTranslationName", await Util.GetTokenAsync("BizAdminFull"), d2.ToString());
Util.ValidateHTTPStatusCode(PUTTestResponse, 200);
@@ -97,7 +97,7 @@ namespace raven_integration
ApiResponse checkPUTWorked = await Util.GetAsync("Translation/" + NewId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateNoErrorInResponse(checkPUTWorked);
checkPUTWorked.ObjectResponse["data"]["name"].Value<string>().Should().Be(d2.newText.ToString());
//uint concurrencyToken = PUTTestResponse.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
//uint concurrency = PUTTestResponse.ObjectResponse["data"]["concurrency"].Value<uint>();
//Update translation key
@@ -105,7 +105,7 @@ namespace raven_integration
long UpdatedTranslationKeyId = FirstTranslationKey["id"].Value<long>();
d2.id = UpdatedTranslationKeyId;
d2.newText = Util.Uniquify("INTEGRATION-TEST-LOCALEITEM DISPLAY UPDATE");
d2.concurrencyToken = FirstTranslationKey["concurrencyToken"].Value<uint>();
d2.concurrency = FirstTranslationKey["concurrency"].Value<uint>();
string UpdatedTranslationKey = FirstTranslationKey["key"].Value<string>();
@@ -137,7 +137,7 @@ namespace raven_integration
Util.ValidateDataReturnResponseOk(R);
//ensure the default value is set
R.ObjectResponse["data"]["uiColor"].Value<string>().Should().Be("#000000");
uint concurrencyToken = R.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint concurrency = R.ObjectResponse["data"]["concurrency"].Value<uint>();
//UPDATE
@@ -145,7 +145,7 @@ namespace raven_integration
dynamic D2 = new JObject();
D2.translationId = NewId;
D2.concurrencyToken = concurrencyToken;
D2.concurrency = concurrency;
PUTTestResponse = await Util.PutAsync("UserOptions/" + DUSERID.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"), D2.ToString());
Util.ValidateHTTPStatusCode(PUTTestResponse, 200);

10
User/UserCrud.cs
View File

@@ -67,7 +67,7 @@ namespace raven_integration
//update w2id
D2.name = Util.Uniquify("UPDATED VIA PUT SECOND TEST User");
D2.concurrencyToken = R2.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
D2.concurrency = R2.ObjectResponse["data"]["concurrency"].Value<uint>();
ApiResponse PUTTestResponse = await Util.PutAsync("User/" + d2Id.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"), D2.ToString());
Util.ValidateHTTPStatusCode(PUTTestResponse, 200);
@@ -75,7 +75,7 @@ namespace raven_integration
ApiResponse checkPUTWorked = await Util.GetAsync("User/" + d2Id.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
Util.ValidateNoErrorInResponse(checkPUTWorked);
checkPUTWorked.ObjectResponse["data"]["name"].Value<string>().Should().Be(D2.name.ToString());
uint concurrencyToken = PUTTestResponse.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint concurrency = PUTTestResponse.ObjectResponse["data"]["concurrency"].Value<uint>();
//DELETE
ApiResponse DELETETestResponse = await Util.DeleteAsync("User/" + d2Id.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
@@ -141,14 +141,14 @@ namespace raven_integration
ApiResponse R = await Util.PostAsync("User", await Util.GetTokenAsync("manager", "l3tm3in"), D.ToString());
Util.ValidateDataReturnResponseOk(R);
long D1Id = R.ObjectResponse["data"]["id"].Value<long>();
uint OriginalConcurrencyToken = R.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint OriginalConcurrencyToken = R.ObjectResponse["data"]["concurrency"].Value<uint>();
//UPDATE
//PUT
D.name = Util.Uniquify("PutConcurrencyViolationShouldFail UPDATE VIA PUT ");
D.concurrencyToken = OriginalConcurrencyToken - 1;//bad token
D.concurrency = OriginalConcurrencyToken - 1;//bad token
ApiResponse PUTTestResponse = await Util.PutAsync("User/" + D1Id.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"), D.ToString());
Util.ValidateConcurrencyError(PUTTestResponse);
}
@@ -178,7 +178,7 @@ namespace raven_integration
ApiResponse a = await Util.PostAsync("User", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
Util.ValidateDataReturnResponseOk(a);
long UserId = a.ObjectResponse["data"]["id"].Value<long>();
uint OriginalConcurrencyToken = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint OriginalConcurrencyToken = a.ObjectResponse["data"]["concurrency"].Value<uint>();
//Test can login
dynamic DCreds = new JObject();

8
User/UserOptions.cs
View File

@@ -39,7 +39,7 @@ namespace raven_integration
Util.ValidateDataReturnResponseOk(R);
//ensure the default value is set
R.ObjectResponse["data"]["uiColor"].Value<string>().Should().Be("#000000");
uint concurrencyToken = R.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint concurrency = R.ObjectResponse["data"]["concurrency"].Value<uint>();
//UPDATE
@@ -52,7 +52,7 @@ namespace raven_integration
D2.currencyName = "EUR";
D2.hour12 = false;
D2.uiColor = "#ffaaff";
D2.concurrencyToken = concurrencyToken;
D2.concurrency = concurrency;
ApiResponse PUTTestResponse = await Util.PutAsync("UserOptions/" + UserId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"), D2.ToString());
Util.ValidateHTTPStatusCode(PUTTestResponse, 200);
@@ -61,7 +61,7 @@ namespace raven_integration
Util.ValidateDataReturnResponseOk(R);
//ensure the default value is set
/*
"{\"data\":{\"id\":44,\"concurrencyToken\":7144348,\"emailAddress\":null,\"uiColor\":0,\"languageOverride\":null,\"timeZoneOverride\":null,\"currencyName\":\"USD\",\"hour12\":true,\"userId\":44}}"
"{\"data\":{\"id\":44,\"concurrency\":7144348,\"emailAddress\":null,\"uiColor\":0,\"languageOverride\":null,\"timeZoneOverride\":null,\"currencyName\":\"USD\",\"hour12\":true,\"userId\":44}}"
*/
R.ObjectResponse["data"]["emailAddress"].Value<string>().Should().Be(D2.emailAddress.ToString());
R.ObjectResponse["data"]["languageOverride"].Value<string>().Should().Be(D2.languageOverride.ToString());
@@ -70,7 +70,7 @@ namespace raven_integration
R.ObjectResponse["data"]["hour12"].Value<bool>().Should().Be((bool)D2.hour12);
R.ObjectResponse["data"]["uiColor"].Value<string>().Should().Be(D2.uiColor.ToString());
R.ObjectResponse["data"]["translationId"].Value<long>().Should().Be((long)D2.translationId);
concurrencyToken = R.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
concurrency = R.ObjectResponse["data"]["concurrency"].Value<uint>();
//DELETE USER

8
Widget/WidgetCrud.cs
View File

@@ -86,7 +86,7 @@ namespace raven_integration
//update w2id
w2.name = Util.Uniquify("UPDATED VIA PUT SECOND TEST WIDGET");
w2.concurrencyToken = r2.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
w2.concurrency = r2.ObjectResponse["data"]["concurrency"].Value<uint>();
ApiResponse PUTTestResponse = await Util.PutAsync("Widget/" + w2Id.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"), w2.ToString());
Util.ValidateHTTPStatusCode(PUTTestResponse, 200);
@@ -94,7 +94,7 @@ namespace raven_integration
ApiResponse checkPUTWorked = await Util.GetAsync("Widget/" + w2Id.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
Util.ValidateNoErrorInResponse(checkPUTWorked);
checkPUTWorked.ObjectResponse["data"]["name"].Value<string>().Should().Be(w2.name.ToString());
uint concurrencyToken = PUTTestResponse.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint concurrency = PUTTestResponse.ObjectResponse["data"]["concurrency"].Value<uint>();
//DELETE
ApiResponse DELETETestResponse = await Util.DeleteAsync("Widget/" + w2Id.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
@@ -182,7 +182,7 @@ namespace raven_integration
ApiResponse r2 = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w2.ToString());
Util.ValidateDataReturnResponseOk(r2);
long w2Id = r2.ObjectResponse["data"]["id"].Value<long>();
uint OriginalConcurrencyToken = r2.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
uint OriginalConcurrencyToken = r2.ObjectResponse["data"]["concurrency"].Value<uint>();
@@ -191,7 +191,7 @@ namespace raven_integration
w2.name = Util.Uniquify("PutConcurrencyViolationShouldFail UPDATE VIA PUT ");
w2.concurrencyToken = OriginalConcurrencyToken - 1;//bad token
w2.concurrency = OriginalConcurrencyToken - 1;//bad token
ApiResponse PUTTestResponse = await Util.PutAsync("Widget/" + w2Id.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"), w2.ToString());
Util.ValidateConcurrencyError(PUTTestResponse);