You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/03/29 16:48:39 UTC

svn commit: r928792 - /myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java

Author: werpu
Date: Mon Mar 29 14:48:39 2010
New Revision: 928792

URL: http://svn.apache.org/viewvc?rev=928792&view=rev
Log:
http://issues.apache.org/jira/browse/EXTSCRIPT-109

Modified:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java?rev=928792&r1=928791&r2=928792&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java Mon Mar 29 14:48:39 2010
@@ -46,12 +46,15 @@ public class FailedStartupTestCase {
     ServletContext context;
     TestcaseLoggingHandler handler;
     Logger logger;
+    private static final String MSG_DISABLED = "Scripting must be disabled";
+    private static final String VALID_PATH = "../../src/test/resources/brokenwebapp";
+    private static final String INVALID_PATH = "../../src/test/resources/brokenwebapp2";
 
     @Before
     public void init() {
         logger = Logger.getLogger(WeavingContextInitializer.class.getName());
         handler = new TestcaseLoggingHandler();
-       /*
+        /*
         * we suppress the original handlers because we do not
         * want unwanted messages in our console
         */
@@ -62,17 +65,17 @@ public class FailedStartupTestCase {
 
     @Test
     public void testStartup() {
-        context = new MockServletContext("../../src/test/resources/brokenwebapp");
+        context = new MockServletContext(VALID_PATH);
         WeavingContextInitializer.initWeavingContext(context);
-        assertFalse("Scripting must be disabled", WeavingContext.isScriptingEnabled());
+        assertFalse(MSG_DISABLED, WeavingContext.isScriptingEnabled());
         assertTrue(handler.getOutput().toString().contains(ScriptingConst.ERR_SERVLET_FILTER));
     }
 
     @Test
     public void testWebxmlMissing() {
-        context = new MockServletContext("../../src/test/resources/brokenwebapp2");
+        context = new MockServletContext(INVALID_PATH);
         WeavingContextInitializer.initWeavingContext(context);
-        assertFalse("Scripting must be disabled", WeavingContext.isScriptingEnabled());
+        assertFalse(MSG_DISABLED, WeavingContext.isScriptingEnabled());
         assertTrue(handler.getOutput().toString().contains(ScriptingConst.ERR_SERVLET_FILTER));
     }
 }