xlawrence 2005/06/21 16:18:20 CEST
Modified files:
core/src/test/src/java/org/jahia/engines/shared
BigText_FieldTest.java
Log:
Updated testcase for the new BigText engine and BigText field
Revision Changes Path
1.5 +9 -9
jahia/core/src/test/src/java/org/jahia/engines/shared/BigText_FieldTest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/src/java/org/jahia/engines/shared/BigText_FieldTest.java.diff?r1=1.4&r2=1.5&f=h
Index: BigText_FieldTest.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/src/java/org/jahia/engines/shared/BigText_FieldTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BigText_FieldTest.java 15 Jun 2005 13:04:50 -0000 1.4
+++ BigText_FieldTest.java 21 Jun 2005 14:18:20 -0000 1.5
@@ -74,8 +74,8 @@
<a href='/site/myjahiasite/pid/2'>the link (9)</a> <br/>
<a href='site/myjahiasite/lang/en/pid/2'>the link (10)</a> <br/>
<a href='/site/myjahiasite/lang/en/pid/2'>the link (11)</a> <br/>
- <a href='jahia/Jahia/site/myjahiasite/lang/en/pid/2'>the link
(12)</a> <br/>
- <a href='/jahia/Jahia/site/myjahiasite/lang/en/pid/2'>the link
(13)</a> <br/>
+ <a href='jahia/Jahia/site/myjahiasite/lang/fr/pid/2'>the link
(12)</a> <br/>
+ <a href='/jahia/Jahia/site/myjahiasite/lang/fr/pid/2'>the link
(13)</a> <br/>
<a
href='http://localhost:8080/jahia/Jahia/site/myjahiasite/lang/en/pid/2'>the
link (14)</a><br/>
<a
href='http://localhost:8080/jahia/Jahia/site/myjahiasite/lang/en/pid/2'>the
link (15)</a><br/>
<a href='/jahia/Jahia/site/myjahiasite/lang/en/op/edit/pid/2'>the
link (16)</a><br/>
@@ -99,8 +99,8 @@
"<a href='/site/myjahiasite/pid/2'>the link (9)</a>\n" +
"<a href='site/myjahiasite/lang/en/pid/2'>the link
(10)</a>\n" +
"<a href='/site/myjahiasite/lang/en/pid/2'>the link
(11)</a>\n" +
- "<a href='jahia/Jahia/site/myjahiasite/lang/en/pid/2'>the
link (12)</a>\n" +
- "<a href='/jahia/Jahia/site/myjahiasite/lang/en/pid/2'>the
link (13)</a>\n" +
+ "<a href='jahia/Jahia/site/myjahiasite/lang/fr/pid/2'>the
link (12)</a>\n" +
+ "<a href='/jahia/Jahia/site/myjahiasite/lang/fr/pid/2'>the
link (13)</a>\n" +
"<a
href='http://localhost:8080/jahia/Jahia/site/myjahiasite/lang/en/pid/2'>the
link (14)</a>\n" +
"<a
href='http://localhost:8080/jahia/Jahia/site/myjahiasite/lang/en/pid/2'>the
link (15)</a>\n" +
"<a
href='/jahia/Jahia/site/myjahiasite/lang/en/op/edit/pid/2'>the link (16)</a>\n"
+
@@ -128,8 +128,7 @@
new HttpServletRequestImpl());
Integer id = new Integer(1);
-
-
+
JahiaBigTextField field = new JahiaBigTextField( id,
id,
id,
@@ -145,23 +144,24 @@
"en");
JahiaBigTextField.SERVLET_PATH = request.getServletPath();
- String[] res = field.cleanUpHardCodedLinks(content, request);
+ String[] res = field.cleanUpHardCodedLinks(content, request,
"en");
logger.info("RawValue: "+res[0]);
logger.info("DisplayValue: "+res[1]);
+ logger.info("InternalLinks: "+field.getInternalLinks());
assertTrue(res[0].indexOf("?matrix") < 0 &&
res[0].indexOf(";jsessionid") < 0 &&
res[0].indexOf("/op/") < 0 &&
res[0].indexOf("/site/") < 0 &&
-// res[0].indexOf(request.getContextPath()) < 0 &&
-// res[0].indexOf(request.getServletPath()) < 0 &&
+ res[0].indexOf("/lang/") > -1 &&
res[0].indexOf(HttpServletRequestImpl.SERVER_NAME) < 0);
assertTrue(res[1].indexOf("?matrix") < 0 &&
res[1].indexOf(";jsessionid") < 0 &&
res[1].indexOf("/op/") < 0 &&
res[1].indexOf("/site/") < 0 &&
+ res[1].indexOf("/lang/") > -1 &&
res[1].indexOf(request.getContextPath()) > -1 &&
res[1].indexOf(request.getServletPath()) > -1 &&
res[1].indexOf(JahiaBigTextField.URL_MARKER) < 0);
