From 7b8b168f2e8f005f7e89e4e68012e5e7c0e85aa1 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Wed, 8 May 2013 19:21:12 -0400 Subject: [PATCH] Move the mockquerydict --- common/lib/xmodule/xmodule/tests/dummy_system.py | 14 +------------- .../xmodule/tests/test_combined_open_ended.py | 3 ++- .../xmodule/xmodule/tests/test_peer_grading.py | 3 ++- .../xmodule/tests/test_util_open_ended.py | 16 ++++++++++++++-- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/common/lib/xmodule/xmodule/tests/dummy_system.py b/common/lib/xmodule/xmodule/tests/dummy_system.py index d0b7513321..02fa0450f6 100644 --- a/common/lib/xmodule/xmodule/tests/dummy_system.py +++ b/common/lib/xmodule/xmodule/tests/dummy_system.py @@ -51,16 +51,4 @@ class DummySystemUser(object): if not isinstance(location, Location): location = Location(location) descriptor = self.modulestore.get_instance(course.id, location, depth=None) - return descriptor.xmodule(self.test_system) - -class MockQueryDict(dict): - """ - Mock a query set so that it can be used with default authorization - """ - def getlist(self, key, default=None): - try: - return super(MockQueryDict, self).__getitem__(key) - except KeyError: - if default is None: - return [] - return default \ No newline at end of file + return descriptor.xmodule(self.test_system) \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py index 665addefa2..157d403ffe 100644 --- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py @@ -2,7 +2,8 @@ import json from mock import Mock, MagicMock, ANY import unittest -from dummy_system import DummySystemUser, MockQueryDict +from dummy_system import DummySystemUser +from test_util_open_ended import MockQueryDict from xmodule.open_ended_grading_classes.openendedchild import OpenEndedChild from xmodule.open_ended_grading_classes.open_ended_module import OpenEndedModule diff --git a/common/lib/xmodule/xmodule/tests/test_peer_grading.py b/common/lib/xmodule/xmodule/tests/test_peer_grading.py index 3ecfc759e5..630f693333 100644 --- a/common/lib/xmodule/xmodule/tests/test_peer_grading.py +++ b/common/lib/xmodule/xmodule/tests/test_peer_grading.py @@ -4,7 +4,8 @@ import json from lxml import etree from mock import Mock from . import test_system -from dummy_system import DummySystem, DummySystemUser, MockQueryDict +from dummy_system import DummySystem, DummySystemUser +from test_util_open_ended import MockQueryDict from xmodule.peer_grading_module import PeerGradingModule, PeerGradingDescriptor from xmodule.open_ended_grading_classes.grading_service_module import GradingServiceError diff --git a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py index db580f1e0e..088a5af87d 100644 --- a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py @@ -1,5 +1,5 @@ OPEN_ENDED_GRADING_INTERFACE = { - 'url': 'http://127.0.0.1:3033/', + 'url': 'blah/', 'username': 'incorrect', 'password': 'incorrect', 'staff_grading': 'staff_grading', @@ -11,4 +11,16 @@ S3_INTERFACE = { 'aws_access_key': "", 'aws_secret_key': "", "aws_bucket_name": "", -} \ No newline at end of file +} + +class MockQueryDict(dict): + """ + Mock a query set so that it can be used with default authorization + """ + def getlist(self, key, default=None): + try: + return super(MockQueryDict, self).__getitem__(key) + except KeyError: + if default is None: + return [] + return default \ No newline at end of file