From ac741ce6b306d1e4309fd59b67c41c496e62f2c4 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 4 Dec 2018 15:27:09 +0000
Subject: [PATCH]

---
 .../DataFilter/DataFilterFilteringLists.cs    | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/test/raven-integration/DataFilter/DataFilterFilteringLists.cs b/test/raven-integration/DataFilter/DataFilterFilteringLists.cs
index 83d9612c..ab92df19 100644
--- a/test/raven-integration/DataFilter/DataFilterFilteringLists.cs
+++ b/test/raven-integration/DataFilter/DataFilterFilteringLists.cs
@@ -163,34 +163,31 @@ namespace raven_integration
                 if (NotActiveWidgetIdList.Contains(o["id"].Value<long>()))
                     nInactiveMatches++;
             }
-            
+
             nActiveMatches.Should().Be(ActiveWidgetIdList.Count);
             nInactiveMatches.Should().Be(0);
 
-          
+            //DELETE WIDGETS
+            foreach (long l in ActiveWidgetIdList)
+            {
+                a = await Util.DeleteAsync("Widget/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+                Util.ValidateHTTPStatusCode(a, 204);
+            }
 
-            //TODO: //UPDATE FILTER TO LIMIT TO INACTIVE BY FLIPPING THE OP TO NOTEQUAL 
-            //SAVE AS ANOTHER FILTER (or possibly modify the original one) AND RETEST
+            foreach (long l in NotActiveWidgetIdList)
+            {
+                a = await Util.DeleteAsync("Widget/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+                Util.ValidateHTTPStatusCode(a, 204);
+            }
 
-
-            // //PUT, make private
-            // d["public"] = false;
-            // d.name = Util.Uniquify("Put - Test DataFilter (privatized)");
-            // d.concurrencyToken = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
-            // a = await Util.PutAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"), d.ToString());
-            // Util.ValidateHTTPStatusCode(a, 200);
-
-
-            //TODO: Re-run search and compare active v inactive opposite of above
-
-//TODO: Delete filter and widgets
-
-            // // //DELETE
-            // ApiResponse DELETETestResponse = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            // Util.ValidateHTTPStatusCode(DELETETestResponse, 204);
+            //DELETE DATAFILTER
+            a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateHTTPStatusCode(a, 204);
 
         }
-
+        //TODO: Re-run search and compare active v inactive opposite of above
+        //TODO: //UPDATE FILTER TO LIMIT TO INACTIVE BY FLIPPING THE OP TO NOTEQUAL 
+        //SAVE AS ANOTHER FILTER (or possibly modify the original one) AND RETEST
 
 
         ///////////////////////