From ec9b3d67d2b2c9f13cd8e1cfd34f9e7276dd2c83 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 30 Aug 2013 17:08:53 +0300
Subject: [PATCH] updates for acceptance tests

---
 .../mock_lti_server/mock_lti_server.py        |  2 +-
 .../mock_lti_server/test_mock_lti_server.py   | 70 ++++++++++---------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py b/lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
index 2eb2d2e139..3f1b6e1249 100644
--- a/lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
+++ b/lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
@@ -52,7 +52,7 @@ class MockLTIRequestHandler(BaseHTTPRequestHandler):
             else:
                 params = {k: v for k, v in post_dict.items() if k != 'oauth_signature'}
                 if self.server.check_oauth_signature(params, post_dict['oauth_signature']):
-                    status_message = "This is LTI tool."
+                    status_message = "This is LTI tool. Success."
                 else:
                     status_message = "Wrong LTI signature"
         else:
diff --git a/lms/djangoapps/courseware/mock_lti_server/test_mock_lti_server.py b/lms/djangoapps/courseware/mock_lti_server/test_mock_lti_server.py
index 8d556286c3..0751bae1df 100644
--- a/lms/djangoapps/courseware/mock_lti_server/test_mock_lti_server.py
+++ b/lms/djangoapps/courseware/mock_lti_server/test_mock_lti_server.py
@@ -1,10 +1,10 @@
-import mock
+"""
+Test for Mock_LTI_Server
+"""
 import unittest
 import threading
-import json
 import urllib
-import time
-from mock_lti_server import MockLTIServer, MockLTIRequestHandler
+from mock_lti_server import MockLTIServer
 
 from nose.plugins.skip import SkipTest
 
@@ -26,9 +26,15 @@ class MockLTIServerTest(unittest.TestCase):
 
         # Create the server
         server_port = 8034
-        self.server_url = 'http://127.0.0.1:%d' % server_port
-        self.server = MockLTIServer(server_port, {'client_key': '', 'client_secret': ''})
-
+        server_host = '127.0.0.1'
+        address = (server_host, server_port)
+        self.server = MockLTIServer(address)
+        self.server.oauth_settings = {
+            'client_key': 'test_client_key',
+            'client_secret': 'test_client_secret',
+            'lti_base':  'http://{}:{}/'.format(server_host, server_port),
+            'lti_endpoint': 'correct_lti_endpoint'
+        }
         # Start the server in a separate daemon thread
         server_thread = threading.Thread(target=self.server.serve_forever)
         server_thread.daemon = True
@@ -39,34 +45,30 @@ class MockLTIServerTest(unittest.TestCase):
         # Stop the server, freeing up the port
         self.server.shutdown()
 
-    def test_oauth_request(self):
-
-        # Send a grade request
-        header = {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            u'Authorization': u'OAuth oauth_nonce="151177408427657509491377691584", \
-oauth_timestamp="1377691584", oauth_version="1.0", \
-oauth_signature_method="HMAC-SHA1", oauth_consumer_key="", \
-oauth_signature="wc1unKXxsX5e4HXJu%2FuiQ1KbrVo%3D"',
-            'launch_presentation_return_url': '',
-            'user_id': 'default_user_id',
-            'lis_result_sourcedid': '',
-            'lti_version': 'LTI-1p0',
-            'lis_outcome_service_url': '',
-            'lti_message_type': 'basic-lti-launch-request',
-            'oauth_callback': 'about:blank'
-        }
-        body = {}
+    def test_request(self):
+        """
+        Tests that LTI server processes request with right program
+        path,  and responses with incorrect signature.
+        """
         request = {
-            'header': json.dumps(header),
-            'body': json.dumps(body)}
+            'user_id': 'default_user_id',
+            'oauth_nonce': '',
+            'oauth_timestamp': '',
+            'oauth_consumer_key': 'client_key',
+            'lti_version': 'LTI-1p0',
+            'oauth_signature_method': 'HMAC-SHA1',
+            'oauth_version': '1.0',
+            'oauth_signature': '',
+            'lti_message_type': 'basic-lti-launch-request',
+            'oauth_callback': 'about:blank',
+            'launch_presentation_return_url': '',
+            'lis_outcome_service_url': '',
+            'lis_result_sourcedid': ''
+        }
+
         response_handle = urllib.urlopen(
-            self.server_url + '/correct_lti_endpoint',
+            self.server.oauth_settings['lti_base'] + self.server.oauth_settings['lti_endpoint'],
             urllib.urlencode(request)
         )
-
-        response_dict = json.loads(response_handle.read())
-        # Expect that the response is success
-        self.assertEqual(response_dict['return_code'], 0)
-        # self.assertEqual(response_dict['return_code'], 0)
-
+        response = response_handle.read()
+        self.assertTrue('Wrong LTI signature' in response)