Changeset 402

Timestamp:

09/14/08 23:19:03 (4 months ago)

Author:

johnbywater

Message:

Additions to dictionary (words for apache options) and view tests (esp. context values).

Files:

• trunk/src/dm/dictionary.py (modified) (1 diff)
• trunk/src/dm/dictionarywords.py (modified) (1 diff)
• trunk/src/dm/exceptions.py (modified) (1 diff)
• trunk/src/dm/view/basetest.py (modified) (3 diffs)
• trunk/src/dm/view/manipulator.py (modified) (1 diff)

trunk/src/dm/dictionary.py

@@ -53 +53 @@
-        self[LOG_LEVEL]           = 'INFO'
-        self[WWW_PORT]            = '80'
+        self[NO_APACHE_RELOAD]    = '1'
+        self[APACHE_RELOAD_CMD]   = 'sudo /etc/init.d/apache2 reload'
+        self[APACHE_CONFIGTEST_CMD] = 'sudo /etc/init.d/apache2 configtest'
-        self[URI_PREFIX]          = ''
-        self[MEDIA_ROOT]          = ''

trunk/src/dm/dictionarywords.py

@@ -32 +32 @@
-NO_APACHE_RELOAD = 'www.no_reload_apache'
-APACHE_RELOAD_CMD = 'www.reload_apache'
+APACHE_CONFIGTEST_CMD = 'www.apache_configtest'
-URI_PREFIX = 'www.uri_prefix'
-MEDIA_ROOT = 'www.media_root'

trunk/src/dm/exceptions.py

@@ -65 +65 @@
-    "Missing plugin class exception class."
-
+
+

trunk/src/dm/view/basetest.py

@@ -73 +73 @@
-    viewClass = None
-    requestPath = ''
+    requiredViewContext = None
-    requiredResponseClassName = 'HttpResponse'
-    requiredResponseContent = None
@@ -156 +157 @@
-            )
-            self.checkResponseContent()
+            self.checkViewContext()
-
-    def checkResponseContent(self):
@@ -165 +167 @@
-            self.failUnlessEqual(self.response.content, requiredContent)
-
+    def checkViewContext(self):
+        self.failUnlessViewContext()
+
+    def failUnlessViewContext(self):
+        for (name, value) in self.getRequiredViewContext().items():
+            self.failUnless(self.view.context.has_key(name), "Name '%s' not in context: %s" % (name, self.view.context))
+            contextValue = self.view.context[name]
+            self.failUnlessEqual(value, contextValue)
+
+    def getRequiredViewContext(self):
+        return {}
-
-class TestSessionView(ViewTestCase):

trunk/src/dm/view/manipulator.py

@@ -2 +2 @@
-from dm.exceptions import KforgeCommandError
-from dm.dictionarywords import WEBKIT_NAME
+from dm.webkit import ValidationError
-from dm.webkit import Manipulator
-from dm.webkit import htmlescape