This commit is contained in:
@@ -20,7 +20,7 @@ namespace raven_integration
|
|||||||
public async void DataListReturnFormatShouldWorkAsExpected()
|
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.ValidateDataReturnResponseOk(a);
|
||||||
Util.ValidateHTTPStatusCode(a, 200);
|
Util.ValidateHTTPStatusCode(a, 200);
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace raven_integration
|
|||||||
"{\"error\":{\"code\":\"2004\",\"message\":\"User not authorized for this resource operation (insufficient rights)\"}}"
|
"{\"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.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);
|
Util.ValidateErrorCodeResponse(a, 2004, 403);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -56,20 +56,16 @@ namespace raven_integration
|
|||||||
|
|
||||||
//CREATE FILTER
|
//CREATE FILTER
|
||||||
|
|
||||||
dynamic dfilter = new JArray();
|
dynamic dListView = new JArray();
|
||||||
|
|
||||||
|
|
||||||
//name starts with filter to constrict to widgets that this test block created only
|
//name starts with filter to constrict to widgets that this test block created only
|
||||||
dynamic DataFilterNameStart = new JObject();
|
|
||||||
DataFilterNameStart.fld = "widgetname";
|
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
|
||||||
DataFilterNameStart.op = Util.OpStartsWith;
|
|
||||||
DataFilterNameStart.value = WidgetNameStart;
|
|
||||||
dfilter.Add(DataFilterNameStart);
|
|
||||||
|
|
||||||
|
|
||||||
//NOW FETCH WIDGET LIST WITH FILTER
|
//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.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.ValidateDataReturnResponseOk(a);
|
||||||
Util.ValidateHTTPStatusCode(a, 200);
|
Util.ValidateHTTPStatusCode(a, 200);
|
||||||
|
|
||||||
@@ -145,24 +141,22 @@ namespace raven_integration
|
|||||||
|
|
||||||
//CREATE FILTER
|
//CREATE FILTER
|
||||||
//FILTER IN BY NAME FOR TESTING THIS RUN ONLY
|
//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
|
//name starts with filter to constrict to widgets that this test block created only
|
||||||
dynamic DataFilterNameStart = new JObject();
|
|
||||||
DataFilterNameStart.fld = "widgetname";
|
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
|
||||||
DataFilterNameStart.op = Util.OpStartsWith;
|
|
||||||
DataFilterNameStart.value = WidgetNameStart;
|
|
||||||
dfilter.Add(DataFilterNameStart);
|
|
||||||
|
|
||||||
//SORT ORDER ###################
|
//SORT ORDER ###################
|
||||||
dynamic dsortarray = new JArray();
|
// dynamic dsortarray = new JArray();
|
||||||
dynamic dsort = new JObject();
|
// dynamic dsort = new JObject();
|
||||||
dsort.fld = "widgetstartdate";
|
// dsort.fld = "widgetstartdate";
|
||||||
dsort.dir = "+";
|
// dsort.dir = "+";
|
||||||
dsortarray.Add(dsort);
|
// dsortarray.Add(dsort);
|
||||||
|
dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetname", "+"));
|
||||||
|
|
||||||
|
|
||||||
//NOW FETCH WIDGET LIST WITH FILTER
|
//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.ValidateDataReturnResponseOk(a);
|
||||||
Util.ValidateHTTPStatusCode(a, 200);
|
Util.ValidateHTTPStatusCode(a, 200);
|
||||||
|
|
||||||
@@ -237,24 +231,21 @@ namespace raven_integration
|
|||||||
//CREATE FILTER
|
//CREATE FILTER
|
||||||
|
|
||||||
//FILTER IN BY NAME FOR TESTING THIS RUN ONLY
|
//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
|
//name starts with filter to constrict to widgets that this test block created only
|
||||||
dynamic DataFilterNameStart = new JObject();
|
|
||||||
DataFilterNameStart.fld = "widgetname";
|
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
|
||||||
DataFilterNameStart.op = Util.OpStartsWith;
|
|
||||||
DataFilterNameStart.value = WidgetNameStart;
|
|
||||||
dfilter.Add(DataFilterNameStart);
|
|
||||||
|
|
||||||
|
|
||||||
//SORT ORDER ###################
|
//SORT ORDER ###################
|
||||||
dynamic dsortarray = new JArray();
|
// dynamic dsortarray = new JArray();
|
||||||
dynamic dsort = new JObject();
|
// dynamic dsort = new JObject();
|
||||||
dsort.fld = "widgetcount";
|
// dsort.fld = "widgetcount";
|
||||||
dsort.dir = "-";
|
// dsort.dir = "-";
|
||||||
dsortarray.Add(dsort);
|
dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetcount", "-"));
|
||||||
|
|
||||||
//NOW FETCH WIDGET LIST WITH FILTER
|
//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.ValidateDataReturnResponseOk(a);
|
||||||
Util.ValidateHTTPStatusCode(a, 200);
|
Util.ValidateHTTPStatusCode(a, 200);
|
||||||
|
|
||||||
@@ -363,32 +354,30 @@ namespace raven_integration
|
|||||||
//CREATE FILTER
|
//CREATE FILTER
|
||||||
|
|
||||||
//FILTER IN BY NAME FOR TESTING THIS RUN ONLY
|
//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
|
//name starts with filter to constrict to widgets that this test block created only
|
||||||
dynamic DataFilterNameStart = new JObject();
|
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
|
||||||
DataFilterNameStart.fld = "widgetname";
|
|
||||||
DataFilterNameStart.op = Util.OpStartsWith;
|
|
||||||
DataFilterNameStart.value = WidgetNameStart;
|
|
||||||
dfilter.Add(DataFilterNameStart);
|
|
||||||
|
|
||||||
//SORT ORDER ###################
|
//SORT ORDER ###################
|
||||||
dynamic dsortarray = new JArray();
|
// dynamic dsortarray = new JArray();
|
||||||
|
|
||||||
//First column
|
//First column
|
||||||
dynamic dsort1 = new JObject();
|
// dynamic dsort1 = new JObject();
|
||||||
dsort1.fld = "widgetdollaramount";
|
// dsort1.fld = "widgetdollaramount";
|
||||||
dsort1.dir = "+";
|
// dsort1.dir = "+";
|
||||||
dsortarray.Add(dsort1);
|
// dsortarray.Add(dsort1);
|
||||||
|
dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetdollaramount", "+"));
|
||||||
|
|
||||||
//Second column
|
//Second column
|
||||||
dynamic dsort2 = new JObject();
|
// dynamic dsort2 = new JObject();
|
||||||
dsort2.fld = "widgetcount";
|
// dsort2.fld = "widgetcount";
|
||||||
dsort2.dir = "-";
|
// dsort2.dir = "-";
|
||||||
dsortarray.Add(dsort2);
|
// dsortarray.Add(dsort2);
|
||||||
|
dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetcount", "-"));
|
||||||
|
|
||||||
|
|
||||||
//NOW FETCH WIDGET LIST WITH FILTER
|
//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.ValidateDataReturnResponseOk(a);
|
||||||
Util.ValidateHTTPStatusCode(a, 200);
|
Util.ValidateHTTPStatusCode(a, 200);
|
||||||
|
|
||||||
|
|||||||
12
util.cs
12
util.cs
@@ -605,7 +605,17 @@ namespace raven_integration
|
|||||||
return d;
|
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")
|
// 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();
|
// throw new System.NotImplementedException();
|
||||||
|
|||||||
Reference in New Issue
Block a user