diff --git a/DataList/DataListFiltering.cs b/DataList/DataListFiltering.cs index 7177a76..b30807b 100644 --- a/DataList/DataListFiltering.cs +++ b/DataList/DataListFiltering.cs @@ -124,11 +124,7 @@ same as the server does but in a central location here for all tests to use. //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; - // dListView.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //## INCLUSIVE FILTER @@ -138,12 +134,10 @@ same as the server does but in a central location here for all tests to use. // FilterItem.value = new DateTime(1968, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); // dListView.Add(FilterItem); dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetstartdate", Util.OpEquality, new DateTime(1968, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime())); + - var ListRequest = Util.BuildDataListRequestEx(dListView); - - //NOW FETCH WIDGET LIST WITH FILTER - // a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), ListRequest); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -153,13 +147,7 @@ same as the server does but in a central location here for all tests to use. List IDInResultList = new List(); int InclusiveMatchCount = 0; int ExclusiveMatchCount = 0; - // foreach (JObject o in v) - // { - // if (IncludedWidgetId == o["id"].Value()) - // InclusiveMatchCount++; - // if (ExcludedWidgetId == o["id"].Value())//whups - // ExclusiveMatchCount++; - // } + foreach (JArray ja in v) { JObject o = ja[0] as JObject; @@ -221,25 +209,23 @@ same as the server does but in a central location here for all tests to use. ExcludedWidgetId = a.ObjectResponse["data"]["id"].Value(); //CREATE LISTVIEW - 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)); //## INCLUSIVE FILTER - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetstartdate"; - FilterItem.op = Util.OpGreaterThan; - FilterItem.value = new DateTime(1970, 3, 12, 9, 0, 0).ToOffsetAdjustedUniversalTime(); - dfilter.Add(FilterItem); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetstartdate"; + // FilterItem.op = Util.OpGreaterThan; + // FilterItem.value = new DateTime(1970, 3, 12, 9, 0, 0).ToOffsetAdjustedUniversalTime(); + // dListView.Add(FilterItem); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetstartdate", Util.OpGreaterThan, new DateTime(1970, 3, 12, 9, 0, 0).ToOffsetAdjustedUniversalTime())); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -311,26 +297,24 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //## INCLUSIVE FILTER - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetstartdate"; - FilterItem.op = Util.OpGreaterThanOrEqualTo; - FilterItem.value = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); - dfilter.Add(FilterItem); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetstartdate"; + // FilterItem.op = Util.OpGreaterThanOrEqualTo; + // FilterItem.value = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + // dListView.Add(FilterItem); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetstartdate", Util.OpGreaterThanOrEqualTo, new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime())); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -400,24 +384,20 @@ same as the server does but in a central location here for all tests to use. ExcludedWidgetId = a.ObjectResponse["data"]["id"].Value(); //CREATE LISTVIEW - 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)); //## INCLUSIVE FILTER dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpLessThan; FilterItem.value = new DateTime(1970, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime(); - dfilter.Add(FilterItem); + dListView.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -487,23 +467,19 @@ same as the server does but in a central location here for all tests to use. ExcludedWidgetId = a.ObjectResponse["data"]["id"].Value(); //CREATE LISTVIEW - 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)); //## INCLUSIVE FILTER dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpLessThanOrEqualTo; FilterItem.value = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); - dfilter.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(FilterItem); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -573,23 +549,19 @@ same as the server does but in a central location here for all tests to use. ExcludedWidgetId = a.ObjectResponse["data"]["id"].Value(); //CREATE LISTVIEW - 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)); //## INCLUSIVE FILTER dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpNotEqual; FilterItem.value = new DateTime(1970, 4, 10, 10, 0, 0).ToOffsetAdjustedUniversalTime(); - dfilter.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(FilterItem); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -660,33 +632,29 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //## INCLUSIVE FILTER dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpGreaterThanOrEqualTo; FilterItem.value = new DateTime(2019, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); - dfilter.Add(FilterItem); + dListView.Add(FilterItem); dynamic FilterItem2 = new JObject(); FilterItem2.fld = "widgetstartdate"; FilterItem2.op = Util.OpLessThanOrEqualTo; FilterItem2.value = new DateTime(2019, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime(); - dfilter.Add(FilterItem2); + dListView.Add(FilterItem2); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -804,21 +772,17 @@ same as the server does but in a central location here for all tests to use. d["public"] = true; d.listKey = "TestWidgetDataList"; - 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)); //## INCLUSIVE FILTER dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpEquality; FilterItem.value = TokenYesterday; - dfilter.Add(FilterItem); + dListView.Add(FilterItem); @@ -827,8 +791,8 @@ same as the server does but in a central location here for all tests to use. long DataFilterId = a.ObjectResponse["data"]["id"].Value(); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -888,7 +852,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TextOpEqualityFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -898,7 +862,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "aardvark"; w.usertype = 1; @@ -908,14 +872,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "zebra"; w.active = false; @@ -924,7 +888,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -933,26 +897,22 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpEquality; DataFilterActive.value = "aardvark"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -999,7 +959,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TextApostropheOpEqualityFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1009,7 +969,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "O'Flaherty's pub"; w.usertype = 1; @@ -1019,14 +979,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Outback steak house"; w.active = false; @@ -1035,7 +995,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -1044,25 +1004,20 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); - + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpEquality; DataFilterActive.value = "O'Flaherty's pub"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -1106,7 +1061,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TextAmpersandOpEqualityFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1116,7 +1071,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "Bill & Ted's excellent adventure"; w.usertype = 1; @@ -1126,14 +1081,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Strange things are afoot at the Circle-K"; w.active = false; @@ -1142,7 +1097,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -1151,23 +1106,19 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpEquality; DataFilterActive.value = "Bill & Ted's excellent adventure"; - dfilter.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(DataFilterActive); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -1214,7 +1165,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TextUnicodeOpEqualityFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1225,7 +1176,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget var InclusiveTestString = "Ādam Iñtërnâtiônàližætiøn"; dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = InclusiveTestString; w.usertype = 1; @@ -1235,14 +1186,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Adam Internationalization"; w.active = false; @@ -1251,7 +1202,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -1260,24 +1211,20 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpEquality; DataFilterActive.value = InclusiveTestString; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -1322,7 +1269,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TextOpGreaterThanFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1332,7 +1279,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "Alabama"; w.usertype = 1; @@ -1342,14 +1289,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Aardvark"; w.active = false; @@ -1358,7 +1305,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -1367,25 +1314,21 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpGreaterThan; DataFilterActive.value = "Aardvark"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -1430,7 +1373,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TextOpGreaterThanOrEqualToFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1440,7 +1383,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "Bjorn"; w.usertype = 1; @@ -1450,14 +1393,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Bing"; w.active = false; @@ -1466,7 +1409,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -1475,24 +1418,20 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpGreaterThanOrEqualTo; DataFilterActive.value = "Bjarn"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -1537,7 +1476,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TextOpLessThanFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1547,7 +1486,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "California"; w.usertype = 1; @@ -1557,14 +1496,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Cthulu"; w.active = false; @@ -1573,7 +1512,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -1582,24 +1521,20 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpLessThan; DataFilterActive.value = "Celery"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -1644,7 +1579,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TextOpLessThanOrEqualToFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1654,7 +1589,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "Donut"; w.usertype = 1; @@ -1664,14 +1599,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Duvet"; w.active = false; @@ -1680,7 +1615,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -1689,25 +1624,21 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpLessThanOrEqualTo; DataFilterActive.value = "Dusseldorf"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -1751,7 +1682,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TextOpNotEqualFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1761,7 +1692,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "Egg Salad Sandwich"; w.usertype = 1; @@ -1771,14 +1702,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Elephant"; w.active = false; @@ -1787,7 +1718,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -1796,24 +1727,20 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpNotEqual; DataFilterActive.value = "Elephant"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -1857,7 +1784,7 @@ same as the server does but in a central location here for all tests to use. public async void TextOpNotContainsFilterWorks() { var TestName = "TextOpNotContainsFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1867,7 +1794,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "Gray poupon"; w.usertype = 1; @@ -1877,14 +1804,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Get shorty"; w.active = false; @@ -1893,7 +1820,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -1902,24 +1829,20 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpNotContains; DataFilterActive.value = "short"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -1963,7 +1886,7 @@ same as the server does but in a central location here for all tests to use. public async void TextOpContainsFilterWorks() { var TestName = "TextOpContainsFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -1973,7 +1896,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "Fast Freddy Freak"; w.usertype = 1; @@ -1983,14 +1906,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Phineas Freak"; w.active = false; @@ -1999,7 +1922,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -2008,23 +1931,19 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpContains; DataFilterActive.value = "red"; - dfilter.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(DataFilterActive); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2068,7 +1987,7 @@ same as the server does but in a central location here for all tests to use. public async void TextOpStartsWithFilterWorks() { var TestName = "TextOpStartsWithFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -2078,7 +1997,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "Granular"; w.usertype = 1; @@ -2088,14 +2007,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Gus Grifferson"; w.active = false; @@ -2104,7 +2023,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -2113,25 +2032,21 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpStartsWith; DataFilterActive.value = "Gra"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2176,7 +2091,7 @@ same as the server does but in a central location here for all tests to use. public async void TextOpEndsWithFilterWorks() { var TestName = "TextOpEndsWithFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -2186,7 +2101,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "Bo Horvat"; w.usertype = 1; @@ -2196,14 +2111,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.notes = "Bo Duke"; w.active = false; @@ -2212,7 +2127,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -2221,26 +2136,22 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetnotes"; DataFilterActive.op = Util.OpEndsWith; DataFilterActive.value = "vat"; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2328,14 +2239,10 @@ same as the server does but in a central location here for all tests to use. ExcludedWidgetId = a.ObjectResponse["data"]["id"].Value(); //CREATE LISTVIEW - 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)); //inclusive test filter @@ -2343,10 +2250,10 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetcount"; FilterItem.op = Util.OpEquality; FilterItem.value = 5; - dfilter.Add(FilterItem); + dListView.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2413,14 +2320,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -2428,9 +2331,9 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetcount"; FilterItem.op = Util.OpGreaterThan; FilterItem.value = 54; - dfilter.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(FilterItem); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2497,14 +2400,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -2512,9 +2411,9 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetcount"; FilterItem.op = Util.OpGreaterThanOrEqualTo; FilterItem.value = 555; - dfilter.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(FilterItem); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2583,14 +2482,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -2598,9 +2493,9 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetcount"; FilterItem.op = Util.OpLessThan; FilterItem.value = 5555; - dfilter.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(FilterItem); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2668,14 +2563,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -2683,9 +2574,9 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetcount"; FilterItem.op = Util.OpLessThanOrEqualTo; FilterItem.value = -444; - dfilter.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(FilterItem); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2753,14 +2644,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -2768,9 +2655,9 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetcount"; FilterItem.op = Util.OpNotEqual; FilterItem.value = 223; - dfilter.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(FilterItem); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2864,25 +2751,21 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetactive"; DataFilterActive.op = Util.OpEquality; DataFilterActive.value = true; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -2978,26 +2861,22 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //active bool test filter dynamic DataFilterActive = new JObject(); DataFilterActive.fld = "widgetactive"; DataFilterActive.op = Util.OpNotEqual; DataFilterActive.value = true; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -3081,14 +2960,10 @@ same as the server does but in a central location here for all tests to use. ExcludedWidgetId = a.ObjectResponse["data"]["id"].Value(); //CREATE LISTVIEW - 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)); //inclusive test filter @@ -3096,9 +2971,9 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetdollaramount"; FilterItem.op = Util.OpEquality; FilterItem.value = 5.55; - dfilter.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(FilterItem); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -3165,14 +3040,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -3180,10 +3051,10 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetdollaramount"; FilterItem.op = Util.OpGreaterThan; FilterItem.value = 54.44; - dfilter.Add(FilterItem); + dListView.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -3250,14 +3121,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -3265,10 +3132,10 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetdollaramount"; FilterItem.op = Util.OpGreaterThanOrEqualTo; FilterItem.value = 555.55; - dfilter.Add(FilterItem); + dListView.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -3337,14 +3204,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -3352,10 +3215,10 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetdollaramount"; FilterItem.op = Util.OpLessThan; FilterItem.value = 5555.55; - dfilter.Add(FilterItem); + dListView.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -3423,14 +3286,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -3438,10 +3297,10 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetdollaramount"; FilterItem.op = Util.OpLessThanOrEqualTo; FilterItem.value = -444.44; - dfilter.Add(FilterItem); + dListView.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -3510,14 +3369,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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)); //inclusive test filter @@ -3525,10 +3380,10 @@ same as the server does but in a central location here for all tests to use. FilterItem.fld = "widgetdollaramount"; FilterItem.op = Util.OpNotEqual; FilterItem.value = 223.23; - dfilter.Add(FilterItem); + dListView.Add(FilterItem); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -3573,7 +3428,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "TagFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -3583,7 +3438,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "blah"; w.usertype = 1; @@ -3603,14 +3458,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); //Tags dynamic ExclusiveTagsArray = new JArray(); ExclusiveTagsArray.Add("crimson-tag-test"); @@ -3629,7 +3484,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3638,14 +3493,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active test filter dynamic DataFilterActive = new JObject(); @@ -3656,9 +3507,9 @@ same as the server does but in a central location here for all tests to use. FilterTagsArray.Add("green-tag-test");//green is the only one missing from the exclusive widget FilterTagsArray.Add("blue-tag-test"); DataFilterActive.value = FilterTagsArray; - dfilter.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + dListView.Add(DataFilterActive); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -3708,7 +3559,7 @@ same as the server does but in a central location here for all tests to use. { var TestName = "UnicodeTagFilterWorks"; - var WidgetRunNameStart = Util.Uniquify(TestName); + var WidgetNameStart = Util.Uniquify(TestName); List InclusiveWidgetIdList = new List(); List ExclusiveWidgetIdList = new List(); @@ -3718,7 +3569,7 @@ same as the server does but in a central location here for all tests to use. //first inclusive widget dynamic w = new JObject(); - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); w.notes = "blah"; w.usertype = 1; @@ -3734,14 +3585,14 @@ same as the server does but in a central location here for all tests to use. InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second inclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); InclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //first exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); //Tags dynamic ExclusiveTagsArray = new JArray(); ExclusiveTagsArray.Add("crimson-tag-test"); @@ -3760,7 +3611,7 @@ same as the server does but in a central location here for all tests to use. ExclusiveWidgetIdList.Add(a.ObjectResponse["data"]["id"].Value()); //second exclusive widget - w.name = Util.Uniquify(WidgetRunNameStart); + w.name = Util.Uniquify(WidgetNameStart); w.active = false; a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3769,14 +3620,10 @@ same as the server does but in a central location here for all tests to use. //CREATE LISTVIEW - 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 = WidgetRunNameStart; - dfilter.Add(DataFilterNameStart); + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active test filter dynamic DataFilterActive = new JObject(); @@ -3786,10 +3633,10 @@ same as the server does but in a central location here for all tests to use. FilterTagsArray.Add("red-tag-test"); FilterTagsArray.Add("Ādam Iñtërnâtiônàližætiøn"); DataFilterActive.value = FilterTagsArray; - dfilter.Add(DataFilterActive); + dListView.Add(DataFilterActive); - //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + //FETCH DATALIST + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200);