diff --git a/DataList/DataListFiltering.cs b/DataList/DataListFiltering.cs index b42a6ea..b88390c 100644 --- a/DataList/DataListFiltering.cs +++ b/DataList/DataListFiltering.cs @@ -2246,11 +2246,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetcount"; - FilterItem.op = Util.OpEquality; - FilterItem.value = 5; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetcount"; + // FilterItem.op = Util.OpEquality; + // FilterItem.value = 5; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetcount", Util.OpEquality, 5)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); @@ -2327,11 +2327,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetcount"; - FilterItem.op = Util.OpGreaterThan; - FilterItem.value = 54; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetcount"; + // FilterItem.op = Util.OpGreaterThan; + // FilterItem.value = 54; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetcount", Util.OpGreaterThan, 54)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); @@ -2407,11 +2407,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetcount"; - FilterItem.op = Util.OpGreaterThanOrEqualTo; - FilterItem.value = 555; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetcount"; + // FilterItem.op = Util.OpGreaterThanOrEqualTo; + // FilterItem.value = 555; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetcount", Util.OpGreaterThanOrEqualTo, 555)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); @@ -2489,11 +2489,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetcount"; - FilterItem.op = Util.OpLessThan; - FilterItem.value = 5555; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetcount"; + // FilterItem.op = Util.OpLessThan; + // FilterItem.value = 5555; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetcount", Util.OpLessThan, 5555)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); @@ -2570,11 +2570,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetcount"; - FilterItem.op = Util.OpLessThanOrEqualTo; - FilterItem.value = -444; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetcount"; + // FilterItem.op = Util.OpLessThanOrEqualTo; + // FilterItem.value = -444; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetcount", Util.OpLessThanOrEqualTo, -444)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); @@ -2651,11 +2651,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetcount"; - FilterItem.op = Util.OpNotEqual; - FilterItem.value = 223; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetcount"; + // FilterItem.op = Util.OpNotEqual; + // FilterItem.value = 223; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetcount", Util.OpNotEqual, 223)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); @@ -2757,11 +2757,11 @@ same as the server does but in a central location here for all tests to use. dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //FILTER - dynamic DataFilterActive = new JObject(); - DataFilterActive.fld = "widgetactive"; - DataFilterActive.op = Util.OpEquality; - DataFilterActive.value = true; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic DataFilterActive = new JObject(); + // DataFilterActive.fld = "widgetactive"; + // DataFilterActive.op = Util.OpEquality; + // DataFilterActive.value = true; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetactive", Util.OpEquality, true)); //FETCH DATALIST @@ -2867,11 +2867,11 @@ same as the server does but in a central location here for all tests to use. dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //FILTER - dynamic DataFilterActive = new JObject(); - DataFilterActive.fld = "widgetactive"; - DataFilterActive.op = Util.OpNotEqual; - DataFilterActive.value = true; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic DataFilterActive = new JObject(); + // DataFilterActive.fld = "widgetactive"; + // DataFilterActive.op = Util.OpNotEqual; + // DataFilterActive.value = true; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetactive", Util.OpNotEqual, true)); @@ -2967,11 +2967,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetdollaramount"; - FilterItem.op = Util.OpEquality; - FilterItem.value = 5.55; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetdollaramount"; + // FilterItem.op = Util.OpEquality; + // FilterItem.value = 5.55; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetdollaramount", Util.OpEquality, 5.55)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); @@ -3047,11 +3047,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetdollaramount"; - FilterItem.op = Util.OpGreaterThan; - FilterItem.value = 54.44; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetdollaramount"; + // FilterItem.op = Util.OpGreaterThan; + // FilterItem.value = 54.44; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetdollaramount", Util.OpGreaterThan, 54.44)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); @@ -3128,11 +3128,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetdollaramount"; - FilterItem.op = Util.OpGreaterThanOrEqualTo; - FilterItem.value = 555.55; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetdollaramount"; + // FilterItem.op = Util.OpGreaterThanOrEqualTo; + // FilterItem.value = 555.55; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetdollaramount", Util.OpGreaterThanOrEqualTo, 555.55)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); @@ -3211,11 +3211,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetdollaramount"; - FilterItem.op = Util.OpLessThan; - FilterItem.value = 5555.55; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetdollaramount"; + // FilterItem.op = Util.OpLessThan; + // FilterItem.value = 5555.55; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetdollaramount", Util.OpLessThan, 5555.55)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); @@ -3293,11 +3293,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetdollaramount"; - FilterItem.op = Util.OpLessThanOrEqualTo; - FilterItem.value = -444.44; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetdollaramount"; + // FilterItem.op = Util.OpLessThanOrEqualTo; + // FilterItem.value = -444.44; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetdollaramount", Util.OpLessThanOrEqualTo, -444.44)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); @@ -3376,11 +3376,11 @@ same as the server does but in a central location here for all tests to use. //inclusive test filter - dynamic FilterItem = new JObject(); - FilterItem.fld = "widgetdollaramount"; - FilterItem.op = Util.OpNotEqual; - FilterItem.value = 223.23; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // dynamic FilterItem = new JObject(); + // FilterItem.fld = "widgetdollaramount"; + // FilterItem.op = Util.OpNotEqual; + // FilterItem.value = 223.23; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetdollaramount", Util.OpNotEqual, 223.23)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); @@ -3499,15 +3499,17 @@ same as the server does but in a central location here for all tests to use. dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active test filter - dynamic DataFilterActive = new JObject(); - DataFilterActive.fld = "widgettags"; - DataFilterActive.op = Util.OpEquality; + // dynamic DataFilterActive = new JObject(); + // DataFilterActive.fld = "widgettags"; + // DataFilterActive.op = Util.OpEquality; dynamic FilterTagsArray = new JArray(); FilterTagsArray.Add("red-tag-test"); FilterTagsArray.Add("green-tag-test");//green is the only one missing from the exclusive widget FilterTagsArray.Add("blue-tag-test"); - DataFilterActive.value = FilterTagsArray; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // DataFilterActive.value = FilterTagsArray; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgettags", Util.OpEquality, FilterTagsArray)); + + //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); @@ -3626,14 +3628,14 @@ same as the server does but in a central location here for all tests to use. dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //active test filter - dynamic DataFilterActive = new JObject(); - DataFilterActive.fld = "widgettags"; - DataFilterActive.op = Util.OpEquality; + // dynamic DataFilterActive = new JObject(); + // DataFilterActive.fld = "widgettags"; + // DataFilterActive.op = Util.OpEquality; dynamic FilterTagsArray = new JArray(); FilterTagsArray.Add("red-tag-test"); FilterTagsArray.Add("Ādam Iñtërnâtiônàližætiøn"); - DataFilterActive.value = FilterTagsArray; - dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX)); + // DataFilterActive.value = FilterTagsArray; + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgettags", Util.OpEquality, FilterTagsArray)); //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); diff --git a/util.cs b/util.cs index 01ef165..0a4942b 100644 --- a/util.cs +++ b/util.cs @@ -606,10 +606,10 @@ namespace raven_integration } //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(); - } + // 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(); + // } public static string BuildDataListRequestEx(dynamic dListView = null, int limit = 999, int offset = 0, string dataListKey = "TestWidgetDataList") {