svn commit: r1072603 - in /lenya/branches/BRANCH_2_1_X/src: modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java

Author: rainer
Date: Sun Feb 20 14:34:50 2011
New Revision: 1072603

URL: http://svn.apache.org/viewvc?rev=1072603&view=rev
Log:
More merges from 2.0.4.

Modified:
    lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java
    lenya/branches/BRANCH_2_1_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java

Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java?rev=1072603&r1=1072602&r2=1072603&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java Sun Feb 20 14:34:50 2011
@@ -52,7 +52,8 @@ public class LinkTest extends AbstractAc
             resolver = (LinkResolver) getManager().lookup(LinkResolver.ROLE);
 
             Link[] links = linkManager.getLinksFrom(source);
-
+	    assertTrue(links.length > 0);
+	    
             boolean matched = false;
             for (int i = 0; i < links.length; i++) {
                 LinkTarget linkTarget = resolver.resolve(source, links[i].getUri());

Modified: lenya/branches/BRANCH_2_1_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java?rev=1072603&r1=1072602&r2=1072603&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/export/java/test/org/apache/lenya/cms/export/ImportTest.java Sun Feb 20 14:34:50 2011
@@ -54,8 +54,7 @@ public class ImportTest extends Abstract
             importer.importContent(defaultPub, area, path);
             
             assertTrue(area.getSite().contains("/tutorial"));
-            checkLinks(area);
-            
+                        
             session.commit();
         }
         
@@ -65,22 +64,5 @@ public class ImportTest extends Abstract
         
     }
 
-    protected void checkLinks(Area area) throws PublicationException, ServiceException {
-        SiteStructure site = area.getSite();
-        Document source = site.getNode("/index").getLink("en").getDocument();
-        
-        LinkManager linkManager = null;
-        try {
-            linkManager = (LinkManager) getManager().lookup(LinkManager.ROLE);
-            Link[] links = linkManager.getLinksFrom(source);
-            assertTrue(links.length > 0);
-        }
-        finally {
-            if (linkManager != null) {
-                getManager().release(linkManager);
-            }
-        }
-        
-    }
     
 }