Return-Path: Delivered-To: apmail-lenya-commits-archive@www.apache.org Received: (qmail 93886 invoked from network); 23 Dec 2010 20:31:17 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Dec 2010 20:31:17 -0000 Received: (qmail 8630 invoked by uid 500); 23 Dec 2010 20:31:17 -0000 Delivered-To: apmail-lenya-commits-archive@lenya.apache.org Received: (qmail 8572 invoked by uid 500); 23 Dec 2010 20:31:17 -0000 Mailing-List: contact commits-help@lenya.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lenya.apache.org Delivered-To: mailing list commits@lenya.apache.org Received: (qmail 8565 invoked by uid 99); 23 Dec 2010 20:31:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Dec 2010 20:31:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Dec 2010 20:31:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E2F5423888FE; Thu, 23 Dec 2010 20:30:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1052369 - /lenya/branches/BRANCH_2_0_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java Date: Thu, 23 Dec 2010 20:30:56 -0000 To: commits@lenya.apache.org From: andreas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101223203056.E2F5423888FE@eris.apache.org> Author: andreas Date: Thu Dec 23 20:30:56 2010 New Revision: 1052369 URL: http://svn.apache.org/viewvc?rev=1052369&view=rev Log: Adding test case for bug 50493. Modified: lenya/branches/BRANCH_2_0_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java Modified: lenya/branches/BRANCH_2_0_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java?rev=1052369&r1=1052368&r2=1052369&view=diff ============================================================================== --- lenya/branches/BRANCH_2_0_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java (original) +++ lenya/branches/BRANCH_2_0_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java Thu Dec 23 20:30:56 2010 @@ -18,6 +18,7 @@ package org.apache.lenya.cms.export; import java.io.File; +import java.io.InputStreamReader; import org.apache.avalon.framework.service.ServiceException; import org.apache.lenya.ac.impl.AbstractAccessControlTest; @@ -29,6 +30,8 @@ import org.apache.lenya.cms.publication. import org.apache.lenya.cms.publication.PublicationException; import org.apache.lenya.cms.repository.Session; import org.apache.lenya.cms.site.SiteStructure; +import org.apache.lenya.xml.DocumentHelper; +import org.apache.xpath.XPathAPI; /** * Import example content into test publication. @@ -39,12 +42,12 @@ public class ImportTest extends Abstract * @throws Exception if an error occurs. */ public void testImport() throws Exception { - + Session session = login("lenya"); - + Publication pub = getPublication(session, "test"); Area area = pub.getArea("authoring"); - + if (area.getDocuments().length == 0) { Publication defaultPub = getPublication(session, "default"); Area defaultArea = defaultPub.getArea("authoring"); @@ -52,17 +55,23 @@ public class ImportTest extends Abstract String path = pubPath.replace(File.separatorChar, '/') + "/example-content"; Importer importer = new Importer(getManager(), getLogger()); importer.importContent(defaultPub, area, path); - + assertTrue(area.getSite().contains("/tutorial")); - + session.commit(); } - + Session aliceSession = login("alice"); Publication alicePub = getPublication(aliceSession, "test"); - assertTrue(alicePub.getArea("authoring").getSite().contains("/tutorial")); - + final SiteStructure authSite = alicePub.getArea("authoring").getSite(); + assertTrue(authSite.contains("/tutorial")); + final Document index = authSite.getNode("/index").getLink("en").getDocument(); + final org.w3c.dom.Document indexDoc = DocumentHelper.readDocument(index.getRepositoryNode() + .getInputStream()); + + // https://issues.apache.org/bugzilla/show_bug.cgi?id=50493 + assertNotNull("No rewritten links found.", + XPathAPI.selectSingleNode(indexDoc, "//*[starts-with(@href, 'lenya-document:')]")); } - } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org For additional commands, e-mail: commits-help@lenya.apache.org