r1315 - in xwiki/trunk/src: main/java/com/xpn/xwiki test/cactus/com/xpn/xwiki/test

[Phung Hai Nam]

Author: namphunghai
Date: 2006-09-14 06:12:02 +0200 (Thu, 14 Sep 2006)
New Revision: 1315

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
   xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ServletCaptchaTest.java
Log:
Update ServletCaptchaTest.java

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-13 10:47:57 UTC (rev 1314)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-14 04:12:02 UTC (rev 1315)
@@ -1865,11 +1865,11 @@
         needsUpdate |= bclass.addTextField("macros_wiki", "Macros for the Wiki Parser", 60);
         needsUpdate |= bclass.addTextAreaField("macros_mapping", "Macros Mapping", 60, 15);
 
-        needsUpdate |= bclass.addStaticListField("registration_anonymous", "Anonymous", "Image|Text|---");
+        needsUpdate |= bclass.addStaticListField("registration_anonymous", "Anonymous", "---|Image|Text");
         needsUpdate |= bclass.addStaticListField("registration_registered", "Registered", "---|Image|Text");
-        needsUpdate |= bclass.addStaticListField("edit_anonymous", "Anonymous", "Image|Text|---");
+        needsUpdate |= bclass.addStaticListField("edit_anonymous", "Anonymous", "---|Image|Text");
         needsUpdate |= bclass.addStaticListField("edit_registered", "Registered", "---|Image|Text");
-        needsUpdate |= bclass.addStaticListField("comment_anonymous", "Anonymous", "Image|Text|---");
+        needsUpdate |= bclass.addStaticListField("comment_anonymous", "Anonymous", "---|Image|Text");
         needsUpdate |= bclass.addStaticListField("comment_registered", "Registered", "---|Image|Text");
 
         needsUpdate |= bclass.addTextField("notification_pages", "Notification Pages", 60);

Modified: xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ServletCaptchaTest.java
===================================================================
--- xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ServletCaptchaTest.java	2006-09-13 10:47:57 UTC (rev 1314)
+++ xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ServletCaptchaTest.java	2006-09-14 04:12:02 UTC (rev 1315)
@@ -49,10 +49,10 @@
 
         Utils.setStringValue("XWiki.XWikiPreferences", "edit_anonymous", "Image", context);
         Utils.createDoc(xwiki.getStore(), "Main", "WebHome", context);
-        setUrl(webRequest, "edit", "Main", "WebHome", "");
+        setUrl(webRequest, "edit", "WebHome", "");
     }
 
-    public void endShowCaptchaImageForAnonymousEdit(WebResponse webResponse) throws HibernateException {
+    public void endShowCaptchaImageForAnonymousEdit(WebResponse webResponse) throws HibernateException, XWikiException {
         try {
             String result = webResponse.getText();
             assertTrue("Could not find captcha image : " + result, result.indexOf("<input type=\"text\" name=\"jcaptcha_response\"") != -1);
@@ -99,7 +99,7 @@
 
         Utils.setStringValue("XWiki.XWikiPreferences", "edit_anonymous", "Text", context);
         Utils.createDoc(xwiki.getStore(), "Main", "WebHome", context);
-        setUrl(webRequest, "edit", "Main", "WebHome", "");
+        setUrl(webRequest, "edit", "WebHome", "");
     }
 
     public void endShowCaptchaTextForAnonymousEdit(WebResponse webResponse) throws HibernateException {
@@ -123,7 +123,7 @@
 
         Utils.setStringValue("XWiki.XWikiPreferences", "edit_anonymous", "---", context);
         Utils.createDoc(xwiki.getStore(), "Main", "WebHome", context);
-        setUrl(webRequest, "edit", "Main", "WebHome", "");
+        setUrl(webRequest, "edit", "WebHome", "");
     }
 
     public void endNotShowCaptchaImageForAnonymousEdit(WebResponse webResponse) throws HibernateException {
@@ -156,7 +156,7 @@
         MyFormAuthentication auth = new MyFormAuthentication("PhungHaiNam", "toto");
         auth.setSecurityCheckURL(new URL("http://127.0.0.1:9080/xwiki/testbin/loginsubmit/XWiki/XWikiLogin"));
         webRequest.setAuthentication(auth);
-        setUrl(webRequest, "edit", "Main", "WebHome1", "");
+        setUrl(webRequest, "edit", "WebHome1", "");
     }
 
     public void endNotShowCaptchaForRegisteredUserEdit(WebResponse webResponse) throws HibernateException {
@@ -183,7 +183,7 @@
 
         Utils.setStringValue("XWiki.XWikiPreferences", "edit_anonymous", "Image", context);
         Utils.createDoc(xwiki.getStore(), "Main", "WebHome", context);
-        setUrl(webRequest, "save", "Main", "WebHome", "");
+        setUrl(webRequest, "save", "WebHome", "");
         webRequest.addParameter("content", "This is modification");
         webRequest.addParameter("parent", "Main.WebHome");
         webRequest.addParameter("jcaptcha_response", "false");
@@ -217,7 +217,7 @@
         MyFormAuthentication auth = new MyFormAuthentication("PhungHaiNam", "toto");
         auth.setSecurityCheckURL(new URL("http://127.0.0.1:9080/xwiki/testbin/loginsubmit/XWiki/XWikiLogin"));
         webRequest.setAuthentication(auth);
-        setUrl(webRequest, "edit", "Main", "WebHome1", "");
+        setUrl(webRequest, "edit", "WebHome1", "");
     }
 
     public void endShowCaptchaImageForRegisteredUserEdit(WebResponse webResponse) throws HibernateException {
@@ -250,7 +250,7 @@
         MyFormAuthentication auth = new MyFormAuthentication("PhungHaiNam", "toto");
         auth.setSecurityCheckURL(new URL("http://127.0.0.1:9080/xwiki/testbin/loginsubmit/XWiki/XWikiLogin"));
         webRequest.setAuthentication(auth);
-        setUrl(webRequest, "edit", "Main", "WebHome1", "");
+        setUrl(webRequest, "edit", "WebHome1", "");
     }
 
     public void endShowCaptchaTextForRegisteredUserEdit(WebResponse webResponse) throws HibernateException {
@@ -283,7 +283,7 @@
         MyFormAuthentication auth = new MyFormAuthentication("admin", "toto");
         auth.setSecurityCheckURL(new URL("http://127.0.0.1:9080/xwiki/testbin/loginsubmit/XWiki/XWikiLogin"));
         webRequest.setAuthentication(auth);
-        setUrl(webRequest, "edit", "Main", "WebHome1", "");
+        setUrl(webRequest, "edit", "WebHome1", "");
     }
 
     public void endNotShowCaptchaTextForAdminEdit(WebResponse webResponse) throws HibernateException {
@@ -317,7 +317,7 @@
         MyFormAuthentication auth = new MyFormAuthentication("admin", "toto");
         auth.setSecurityCheckURL(new URL("http://127.0.0.1:9080/xwiki/testbin/loginsubmit/XWiki/XWikiLogin"));
         webRequest.setAuthentication(auth);
-        setUrl(webRequest, "save", "Main", "WebHome", "");
+        setUrl(webRequest, "save", "WebHome", "");
 
     }