Added default_encoding to tests, so that we can switch json/xml easy.

tests/testScenario.py

@@ -24,6 +24,7 @@
 #                                                                       #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
+import utils
 from utils import APIRequest
 
 import sys
@@ -358,6 +359,8 @@ def _test_layers(target, map_name):
 
 def test_scenario():
 
+    # utils.default_encoding = "xml"
+
     target = "http://localhost:8080"
     map_name = "tests"
 

tests/utils.py

@@ -31,6 +31,8 @@ import json
 
 import sys
 
+default_encoding = "json"
+
 def deduce_content_type(type):
     if type == "json":
         return "application/json"
@@ -38,7 +40,7 @@ def deduce_content_type(type):
         return "application/xml"
 
 
-def APIRequest(method, url, data=None, encode="json", decode="json", content_type=None, expected_type=None,
+def APIRequest(method, url, data=None, encode=default_encoding, decode=default_encoding, content_type=None, expected_type=None,
                get_response=False):
 
     if encode == "json":