This commit is contained in:
2020-02-12 00:15:31 +00:00
parent 3347f93b63
commit d2bdcd6ee1

View File

@@ -928,12 +928,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -992,10 +986,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -1054,12 +1044,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -1118,10 +1102,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
/// <summary>
@@ -1177,12 +1157,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -1198,14 +1172,6 @@ same as the server does but in a central location here for all tests to use.
DataFilterActive.op = Util.OpEquality;
DataFilterActive.value = "Bill & Ted's excellent adventure";
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<long>();
//NOW FETCH WIDGET LIST WITH FILTER
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter));
Util.ValidateDataReturnResponseOk(a);
@@ -1217,13 +1183,7 @@ same as the server does but in a central location here for all tests to use.
List<long> IDInResultList = new List<long>();
int InclusiveMatchCount = 0;
int ExclusiveMatchCount = 0;
// foreach (JObject o in v)
// {
// if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
// InclusiveMatchCount++;
// if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
// ExclusiveMatchCount++;
// }
foreach (JArray ja in v)
{
@@ -1250,10 +1210,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
/// <summary>
@@ -1310,12 +1266,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -1374,10 +1324,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -1434,12 +1380,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -1498,10 +1438,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -1558,12 +1494,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -1622,10 +1552,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -1682,12 +1608,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -1746,10 +1666,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -1806,12 +1722,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -1870,10 +1780,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
/// <summary>
@@ -1929,12 +1835,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -1993,10 +1893,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -2052,12 +1948,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -2116,10 +2006,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -2175,12 +2061,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -2196,14 +2076,6 @@ same as the server does but in a central location here for all tests to use.
DataFilterActive.op = Util.OpContains;
DataFilterActive.value = "red";
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<long>();
//NOW FETCH WIDGET LIST WITH FILTER
a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter));
Util.ValidateDataReturnResponseOk(a);
@@ -2239,10 +2111,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -2298,12 +2166,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -2363,10 +2225,6 @@ same as the server does but in a central location here for all tests to use.
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -2422,12 +2280,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -2487,10 +2339,6 @@ same as the server does but in a central location here for all tests to use.
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
@@ -3985,12 +3833,6 @@ same as the server does but in a central location here for all tests to use.
//CREATE FILTER
dynamic d = new JObject();
d.name = Util.Uniquify(WidgetRunNameStart);
d["public"] = true;
d.listKey = "TestWidgetDataList";
dynamic dfilter = new JArray();
//name starts with filter to constrict to widgets that this test block created only
@@ -4052,10 +3894,6 @@ same as the server does but in a central location here for all tests to use.
a = await Util.DeleteAsync("Widget/" + l.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}
//DELETE DATAFILTER
a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(a, 204);
}