This commit is contained in:
2020-02-14 16:38:26 +00:00
parent c2148e9340
commit 1cb3af8d22
4 changed files with 51 additions and 52 deletions

View File

@@ -20,7 +20,7 @@ namespace raven_integration
public async void DataListReturnFormatShouldWorkAsExpected()
{
ApiResponse a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(null, null, 3, 2));
ApiResponse a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(null, 3, 2));
Util.ValidateDataReturnResponseOk(a);
Util.ValidateHTTPStatusCode(a, 200);

View File

@@ -20,7 +20,7 @@ namespace raven_integration
"{\"error\":{\"code\":\"2004\",\"message\":\"User not authorized for this resource operation (insufficient rights)\"}}"
*/
//ApiResponse a = await Util.GetAsync("DataList/list?DataListKey=TestWidgetDataList&Offset=0&Limit=3", await Util.GetTokenAsync("CustomerLimited"));
ApiResponse a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("CustomerLimited"), Util.BuildDataListRequest());
ApiResponse a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("CustomerLimited"), Util.BuildDataListRequestEx());
Util.ValidateErrorCodeResponse(a, 2004, 403);
}

View File

@@ -56,20 +56,16 @@ namespace raven_integration
//CREATE FILTER
dynamic dfilter = new JArray();
dynamic dListView = new JArray();
//name starts with filter to constrict to widgets that this test block created only
dynamic DataFilterNameStart = new JObject();
DataFilterNameStart.fld = "widgetname";
DataFilterNameStart.op = Util.OpStartsWith;
DataFilterNameStart.value = WidgetNameStart;
dfilter.Add(DataFilterNameStart);
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
//NOW FETCH WIDGET LIST WITH FILTER
// a = await Util.GetAsync($"DataList/list?DataListKey=TestWidgetDataList&Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in"));
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter));
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
Util.ValidateDataReturnResponseOk(a);
Util.ValidateHTTPStatusCode(a, 200);
@@ -145,24 +141,22 @@ namespace raven_integration
//CREATE FILTER
//FILTER IN BY NAME FOR TESTING THIS RUN ONLY
dynamic dfilter = new JArray();
dynamic dListView = new JArray();
//name starts with filter to constrict to widgets that this test block created only
dynamic DataFilterNameStart = new JObject();
DataFilterNameStart.fld = "widgetname";
DataFilterNameStart.op = Util.OpStartsWith;
DataFilterNameStart.value = WidgetNameStart;
dfilter.Add(DataFilterNameStart);
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
//SORT ORDER ###################
dynamic dsortarray = new JArray();
dynamic dsort = new JObject();
dsort.fld = "widgetstartdate";
dsort.dir = "+";
dsortarray.Add(dsort);
// dynamic dsortarray = new JArray();
// dynamic dsort = new JObject();
// dsort.fld = "widgetstartdate";
// dsort.dir = "+";
// dsortarray.Add(dsort);
dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetname", "+"));
//NOW FETCH WIDGET LIST WITH FILTER
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter, dsortarray));
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
Util.ValidateDataReturnResponseOk(a);
Util.ValidateHTTPStatusCode(a, 200);
@@ -237,24 +231,21 @@ namespace raven_integration
//CREATE FILTER
//FILTER IN BY NAME FOR TESTING THIS RUN ONLY
dynamic dfilter = new JArray();
dynamic dListView = new JArray();
//name starts with filter to constrict to widgets that this test block created only
dynamic DataFilterNameStart = new JObject();
DataFilterNameStart.fld = "widgetname";
DataFilterNameStart.op = Util.OpStartsWith;
DataFilterNameStart.value = WidgetNameStart;
dfilter.Add(DataFilterNameStart);
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
//SORT ORDER ###################
dynamic dsortarray = new JArray();
dynamic dsort = new JObject();
dsort.fld = "widgetcount";
dsort.dir = "-";
dsortarray.Add(dsort);
// dynamic dsortarray = new JArray();
// dynamic dsort = new JObject();
// dsort.fld = "widgetcount";
// dsort.dir = "-";
dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetcount", "-"));
//NOW FETCH WIDGET LIST WITH FILTER
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter, dsortarray));
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
Util.ValidateDataReturnResponseOk(a);
Util.ValidateHTTPStatusCode(a, 200);
@@ -363,32 +354,30 @@ namespace raven_integration
//CREATE FILTER
//FILTER IN BY NAME FOR TESTING THIS RUN ONLY
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
dynamic DataFilterNameStart = new JObject();
DataFilterNameStart.fld = "widgetname";
DataFilterNameStart.op = Util.OpStartsWith;
DataFilterNameStart.value = WidgetNameStart;
dfilter.Add(DataFilterNameStart);
dynamic dListView = new JArray();
//name starts with filter to constrict to widgets that this test block created only
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
//SORT ORDER ###################
dynamic dsortarray = new JArray();
// dynamic dsortarray = new JArray();
//First column
dynamic dsort1 = new JObject();
dsort1.fld = "widgetdollaramount";
dsort1.dir = "+";
dsortarray.Add(dsort1);
// dynamic dsort1 = new JObject();
// dsort1.fld = "widgetdollaramount";
// dsort1.dir = "+";
// dsortarray.Add(dsort1);
dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetdollaramount", "+"));
//Second column
dynamic dsort2 = new JObject();
dsort2.fld = "widgetcount";
dsort2.dir = "-";
dsortarray.Add(dsort2);
// dynamic dsort2 = new JObject();
// dsort2.fld = "widgetcount";
// dsort2.dir = "-";
// dsortarray.Add(dsort2);
dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetcount", "-"));
//NOW FETCH WIDGET LIST WITH FILTER
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter, dsortarray));
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
Util.ValidateDataReturnResponseOk(a);
Util.ValidateHTTPStatusCode(a, 200);

12
util.cs
View File

@@ -605,7 +605,17 @@ namespace raven_integration
return d;
}
//t(dfilter, dsortarray, 999, 0, false, "UserDataList"));
public static object BuildSimpleSortDataListViewColumn(string fieldKey, string sort)
{
dynamic d = new JObject();
d.fld = fieldKey;
d.sort = sort;
return d;
}
//t(dfilter, dsortarray, 999, 0, false, "UserDataList"));
// public static string BuildDataListRequest(object p = null, object o = null, int limit = 999, int offset = 0, bool bWhatever=false, string dataListKey = "TestWidgetDataList")
// {
// throw new System.NotImplementedException();