diff --git a/DataList/DataListFiltering.cs b/DataList/DataListFiltering.cs index 54307a0..580d295 100644 --- a/DataList/DataListFiltering.cs +++ b/DataList/DataListFiltering.cs @@ -815,9 +815,9 @@ same as the server does but in a central location here for all tests to use. FilterItem.value = TokenYesterday; dfilter.Add(FilterItem); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json + - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); + a = await Util, await Util.GetTokenAsync("BizAdminFull"), d.ToString()); Util.ValidateDataReturnResponseOk(a); long DataFilterId = a.ObjectResponse["data"]["id"].Value(); @@ -944,12 +944,7 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "aardvark"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); @@ -1060,12 +1055,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "O'Flaherty's pub"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); @@ -1282,13 +1271,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = InclusiveTestString; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); Util.ValidateDataReturnResponseOk(a); @@ -1396,12 +1378,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "Aardvark"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); @@ -1510,13 +1486,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "Bjarn"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); Util.ValidateDataReturnResponseOk(a); @@ -1624,13 +1593,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "Celery"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); Util.ValidateDataReturnResponseOk(a); @@ -1738,12 +1700,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "Dusseldorf"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); @@ -1851,13 +1807,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "Elephant"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); Util.ValidateDataReturnResponseOk(a); @@ -1964,13 +1913,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "short"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); Util.ValidateDataReturnResponseOk(a); @@ -2182,12 +2124,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "Gra"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); @@ -2296,12 +2232,7 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = "vat"; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); @@ -3852,13 +3783,6 @@ same as the server does but in a central location here for all tests to use. DataFilterActive.value = FilterTagsArray; dfilter.Add(DataFilterActive); - d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - - a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString()); - Util.ValidateDataReturnResponseOk(a); - - 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)); Util.ValidateDataReturnResponseOk(a);