This commit is contained in:
2020-02-15 01:22:26 +00:00
parent 48d9040ec3
commit ad994a5869
2 changed files with 14 additions and 12 deletions

View File

@@ -34,10 +34,10 @@ namespace raven_integration
} }
/// <summary> /// <summary>
/// Return un - filtered/sorted fields test /// Return un - filtered/sorted fields and custom fields test
/// </summary> /// </summary>
[Fact] [Fact]
public async void DataListShouldReturnAllFieldsSpecifiedEvenIfUnsortedOrFiltered() public async void DataListShouldReturnAllFieldsSpecifiedEvenIfUnsortedOrFilteredAndCustomToo()
{ {
dynamic dListView = new JArray(); dynamic dListView = new JArray();

View File

@@ -61,7 +61,7 @@ namespace raven_integration
//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
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
//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"));
@@ -144,7 +144,6 @@ namespace raven_integration
dynamic dListView = 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
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
//SORT ORDER ################### //SORT ORDER ###################
// dynamic dsortarray = new JArray(); // dynamic dsortarray = new JArray();
@@ -152,7 +151,10 @@ namespace raven_integration
// dsort.fld = "widgetstartdate"; // dsort.fld = "widgetstartdate";
// dsort.dir = "+"; // dsort.dir = "+";
// dsortarray.Add(dsort); // dsortarray.Add(dsort);
dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetname", "+"));
//both conditions filter and sort here
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart, "+"));
//NOW FETCH WIDGET LIST WITH FILTER //NOW FETCH WIDGET LIST WITH FILTER
@@ -359,21 +361,21 @@ namespace raven_integration
dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
//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", "+")); 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", "-")); dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetcount", "-"));
//NOW FETCH WIDGET LIST WITH FILTER //NOW FETCH WIDGET LIST WITH FILTER