From 0f1197ce8afdc2a869e4cc6f78122641df009e42 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki
Date: Mon, 19 Feb 2018 12:46:47 +0300
Subject: Rename file and move common code

* Rename the file to make it an importable module
* Refactor the test to move common code out to a super class.
---
 test/requests/test-registration.py | 59 --------------------------------------
 test/requests/test_registration.py | 41 ++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 59 deletions(-)
 delete mode 100644 test/requests/test-registration.py
 create mode 100644 test/requests/test_registration.py

(limited to 'test')

diff --git a/test/requests/test-registration.py b/test/requests/test-registration.py
deleted file mode 100644
index bcb1642f..00000000
--- a/test/requests/test-registration.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import sys
-import unittest
-import requests
-import logging
-from elasticsearch import Elasticsearch, TransportError
-#from utility.tools import ELASTICSEARCH_HOST, ELASTICSEARCH_PORT
-
-GN2_SERVER = None
-ES_SERVER = None
-
-class TestRegistration(unittest.TestCase):
-    
-
-    def setUp(self):
-        self.url = GN2_SERVER+"/n/register"
-        self.es = Elasticsearch([ES_SERVER])
-        self.es_cleanup = []
-
-        es_logger = logging.getLogger("elasticsearch")
-        es_logger.addHandler(
-            logging.FileHandler("/tmp/es_TestRegistrationInfo.log"))
-        es_trace_logger = logging.getLogger("elasticsearch.trace")
-        es_trace_logger.addHandler(
-            logging.FileHandler("/tmp/es_TestRegistrationTrace.log"))
-
-    def tearDown(self):
-        for item in self.es_cleanup:
-            self.es.delete(index="users", doc_type="local", id=item["_id"])
-
-    def testRegistrationPage(self):
-        if self.es.ping():
-            data = {
-                "email_address": "test@user.com",
-                "full_name": "Test User",
-                "organization": "Test Organisation",
-                "password": "test_password",
-                "password_confirm": "test_password"
-            }
-            requests.post(self.url, data)
-            response = self.es.search(
-                index="users"
-                , doc_type="local"
-                , body={
-                    "query": {"match": {"email_address": "test@user.com"}}})
-            self.assertEqual(len(response["hits"]["hits"]), 1)
-            self.es_cleanup.append(response["hits"]["hits"][0])
-        else:
-            self.skipTest("The elasticsearch server is down")
-
-def main():
-    suite = unittest.TestSuite()
-    suite.addTest(TestRegistration("testRegistrationPage"))
-    runner = unittest.TextTestRunner()
-    runner.run(suite)
-
-if __name__ == "__main__":
-    GN2_SERVER = sys.argv[1]
-    ES_SERVER = sys.argv[2]
-    main()
diff --git a/test/requests/test_registration.py b/test/requests/test_registration.py
new file mode 100644
index 00000000..0047e8a6
--- /dev/null
+++ b/test/requests/test_registration.py
@@ -0,0 +1,41 @@
+import sys
+import requests
+from parametrized_test import ParametrizedTest
+
+class TestRegistration(ParametrizedTest):
+
+    def tearDown(self):
+        for item in self.es_cleanup:
+            self.es.delete(index="users", doc_type="local", id=item["_id"])
+
+    def testRegistrationPage(self):
+        if self.es.ping():
+            data = {
+                "email_address": "test@user.com",
+                "full_name": "Test User",
+                "organization": "Test Organisation",
+                "password": "test_password",
+                "password_confirm": "test_password"
+            }
+            requests.post(self.gn2_url+"/n/register", data)
+            response = self.es.search(
+                index="users"
+                , doc_type="local"
+                , body={
+                    "query": {"match": {"email_address": "test@user.com"}}})
+            self.assertEqual(len(response["hits"]["hits"]), 1)
+        else:
+            self.skipTest("The elasticsearch server is down")
+
+def main(gn2, es):
+    import unittest
+    suite = unittest.TestSuite()
+    suite.addTest(TestRegistration(methodName="testRegistrationPage", gn2_url=gn2, es_url=es))
+    runner = unittest.TextTestRunner()
+    runner.run(suite)
+
+if __name__ == "__main__":
+    if len(sys.argv) < 3:
+        raise Exception("Required arguments missing")
+    else:
+        main(sys.argv[1], sys.argv[2])
-- 
cgit v1.2.3