You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2009/03/13 15:18:39 UTC
svn commit: r753281 -
/lenya/branches/BRANCH_2_0_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java
Author: andreas
Date: Fri Mar 13 14:18:39 2009
New Revision: 753281
URL: http://svn.apache.org/viewvc?rev=753281&view=rev
Log:
Use source resolver to test links with a query string.
Modified:
lenya/branches/BRANCH_2_0_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java
Modified: lenya/branches/BRANCH_2_0_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java?rev=753281&r1=753280&r2=753281&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java (original)
+++ lenya/branches/BRANCH_2_0_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java Fri Mar 13 14:18:39 2009
@@ -19,10 +19,11 @@
import java.util.Arrays;
+import org.apache.excalibur.source.SourceNotFoundException;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.ac.impl.AbstractAccessControlTest;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.site.SiteStructure;
@@ -75,6 +76,10 @@
}
+ protected String getWebappUrl() {
+ return "/default/authoring/index.html";
+ }
+
/**
* Test links across publications.
* @throws Exception
@@ -98,9 +103,10 @@
final String queryString = "?format=xhtml";
final String baseLink = "lenya-document:" + target.getUUID() + ",lang="
+ target.getLanguage();
- final String relativeLink = baseLink + queryString;
- final String absoluteLink = relativeLink + ",pub=test" + queryString;
+ final String relativeLink = baseLink;
+ final String absoluteLink = relativeLink + ",pub=test";
+ SourceResolver sourceResolver = null;
LinkResolver resolver = null;
try {
resolver = (LinkResolver) getManager().lookup(LinkResolver.ROLE);
@@ -108,10 +114,28 @@
assertFalse(resolver.resolve(source, relativeLink).exists());
assertTrue(resolver.resolve(source, absoluteLink).exists());
+ sourceResolver = (SourceResolver) getManager().lookup(SourceResolver.ROLE);
+
+ String relativeUri = relativeLink + queryString;
+ String absoluteUri = absoluteLink + queryString;
+
+ Exception e = null;
+ try {
+ sourceResolver.resolveURI(relativeUri);
+ } catch (SourceNotFoundException ex) {
+ e = ex;
+ }
+ assertNotNull("SourceNotFoundException thrown", e);
+
+ sourceResolver.resolveURI(absoluteUri);
+
} finally {
if (resolver != null) {
getManager().release(resolver);
}
+ if (sourceResolver != null) {
+ getManager().release(sourceResolver);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org