r1001 - xwiki/trunk/src/test/java/com/xpn/xwiki/test

[Ludovic Dubost]

Author: ludovic
Date: 2006-03-28 13:22:38 +0200 (Tue, 28 Mar 2006)
New Revision: 1001

Modified:
   xwiki/trunk/src/test/java/com/xpn/xwiki/test/UtilTest.java
Log:
Fix servlet url factory test since default URL should now contain "view"

Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/test/UtilTest.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/UtilTest.java	2006-03-28 11:21:53 UTC (rev 1000)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/UtilTest.java	2006-03-28 11:22:38 UTC (rev 1001)
@@ -1,27 +1,27 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author ludovic
- * @author vmassol
- * @author sdumitriu
- * @author tepich
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author ludovic
+ * @author vmassol
+ * @author sdumitriu
+ * @author tepich
+ */
 
 package com.xpn.xwiki.test;
 
@@ -122,17 +122,17 @@
         getXWikiContext().setURLFactory(factory);
 
         assertEquals("URL is incorrect",
-                     new URL("http://www.xwiki.org/xwiki/bin/Main/Toto"),
-                     factory.createURL("Main", "Toto", getXWikiContext()));
+                     "http://www.xwiki.org/xwiki/bin/view/Main/Toto",
+                     factory.createURL("Main", "Toto", getXWikiContext()).toString());
         assertEquals("URL is incorrect",
-                     new URL("http://www.xwiki.org/xwiki/bin/XWiki/Toto"),
-                     factory.createURL("XWiki", "Toto", getXWikiContext()));
+                     "http://www.xwiki.org/xwiki/bin/view/XWiki/Toto",
+                     factory.createURL("XWiki", "Toto", getXWikiContext()).toString());
         assertEquals("URL is incorrect",
-                     new URL("http://www.xwiki.org/xwiki/bin/edit/XWiki/Toto"),
-                     factory.createURL("XWiki", "Toto", "edit", getXWikiContext()));
+                     "http://www.xwiki.org/xwiki/bin/edit/XWiki/Toto",
+                     factory.createURL("XWiki", "Toto", "edit", getXWikiContext()).toString());
         assertEquals("URL is incorrect",
-                     new URL("http://www.xwiki.org/xwiki/bin/edit/XWiki/Toto?raw=1"),
-                     factory.createURL("XWiki", "Toto", "edit", "raw=1", null, getXWikiContext()));
+                     "http://www.xwiki.org/xwiki/bin/edit/XWiki/Toto?raw=1",
+                     factory.createURL("XWiki", "Toto", "edit", "raw=1", null, getXWikiContext()).toString());
     }
     
     public void testTOCGeneration() {