Issue 395 - Filter hits statistics backend

sitescripts/filterhits/test/api_tests.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 66 matching lines @@
     self.assertResponse(submit_handler, "400 Processing Error",
                         REQUEST_METHOD="POST", body="")
     self.assertResponse(submit_handler, "400 Processing Error",
                         REQUEST_METHOD="POST", body="Oops...")
     self.assertResponse(submit_handler, "400 Processing Error",
                         REQUEST_METHOD="POST", body="{123:]")
     self.assertResponse(submit_handler, "400 Processing Error",
                         REQUEST_METHOD="POST", body="1")
     self.assertEqual(len(db.query(self.db, "SELECT * FROM frequencies")), 0)
     self.assertEqual(len(db.query(self.db, "SELECT * FROM filters")), 0)
-    # Ensure even an empty object, or one with the wrong fields returns OK
-    self.assertResponse(submit_handler, "200 OK",
+    # Ensure even an empty object, or one with the wrong fields returns successfully
+    self.assertResponse(submit_handler, "204 No Content",
                         REQUEST_METHOD="POST", body="{}")
-    self.assertResponse(submit_handler, "200 OK",
+    self.assertResponse(submit_handler, "204 No Content",
                         REQUEST_METHOD="POST", body="{\"hello\": \"world\"}")
     self.assertEqual(len(db.query(self.db, "SELECT * FROM frequencies")), 0)
     self.assertEqual(len(db.query(self.db, "SELECT * FROM filters")), 0)
     # Now some actually valid data
-    self.assertResponse(submit_handler, "200 OK",
+    self.assertResponse(submit_handler, "204 No Content",
                         REQUEST_METHOD="POST", body=valid_data)
     self.assertEqual(len(db.query(self.db, "SELECT * FROM frequencies")), 2)
     self.assertEqual(len(db.query(self.db, "SELECT * FROM filters")), 1)
     # Now make sure apparently valid data with timestamps that cause geometrical
     # mean calculations to fail with MySQL errors return OK but don't change DB
     invalid_data = json.loads(valid_data)
     invalid_data["filters"]["||example.com^"]["firstParty"]["example.com"]["latest"] = 3
     invalid_data = json.dumps(invalid_data)
-    self.assertResponse(submit_handler, "200 OK",
+    self.assertResponse(submit_handler, "204 No Content",
                         REQUEST_METHOD="POST", body=invalid_data)
     self.assertEqual(len(db.query(self.db, "SELECT * FROM frequencies")), 2)
     self.assertEqual(len(db.query(self.db, "SELECT * FROM filters")), 1)
 
   def test_query(self):
-    # Basic query with no data, should return OK
+    # Basic query with no data, should return successfully
     self.assertResponse(query_handler, "200 OK", {"count": 0, "total": 0, "results": [], "echo": 0})
     # If echo parameter is passed and is integer it should be returned
     self.assertResponse(query_handler, "200 OK", {"count": 0, "total": 0, "results": [], "echo": 1337},
                         get_params={ "echo": 1337 })
     self.assertResponse(query_handler, "200 OK", {"count": 0, "total": 0, "results": [], "echo": 0},
                         get_params={ "echo": "naughty" })
     # Now let's submit some data so we can query it back out
     test_data = [json.loads(valid_data), json.loads(valid_data), json.loads(valid_data)]
     test_data[1]["filters"]["##Second-Filter|"] = test_data[1]["filters"].pop("||example.com^")
     test_data[2]["filters"]["##Third-Filter|"] = test_data[2]["filters"].pop("||example.com^")
     for data in test_data:
-      self.assertResponse(submit_handler, "200 OK",
+      self.assertResponse(submit_handler, "204 No Content",
                           REQUEST_METHOD="POST", body=json.dumps(data))
     # Ordering parameters should be respected
     self.assertResponse(query_handler, "200 OK", {"count": 1, "total": 6,
                                                   "results": [{"domain": "example.com",
                                                                "filter": "||example.com^",
                                                                "frequency": 0}], "echo": 0},
                         get_params={ "order_by": "filter", "order": "desc", "take": "1" })
     self.assertResponse(query_handler, "200 OK", {"count": 1, "total": 6,
                                                   "results": [{"domain": "example.com",
                                                                "filter": "##Second-Filter|",
@@ skipping 29 matching lines @@
                                                   "results": [{"domain": "example.org",
                                                                "filter": "##Second-Filter|",
                                                                "frequency": 4},
                                                               {"domain": "example.com",
                                                                "filter": "##Third-Filter|",
                                                                "frequency": 0}], "echo": 0},
                         get_params={ "skip": "2", "take": "2" })
 
 if __name__ == "__main__":
   unittest.main()