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 2007/01/10 14:12:28 UTC
svn commit: r494807 - in /lenya/trunk/src/modules/sitetree/java:
src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java
test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java
Author: andreas
Date: Wed Jan 10 05:12:27 2007
New Revision: 494807
URL: http://svn.apache.org/viewvc?view=rev&rev=494807
Log:
Use direct methods instead of SiteUtil convenience methods
Modified:
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java
lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java?view=diff&rev=494807&r1=494806&r2=494807
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java Wed Jan 10 05:12:27 2007
@@ -37,6 +37,7 @@
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.SiteException;
import org.apache.lenya.cms.site.SiteNode;
+import org.apache.lenya.util.Assert;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.apache.xpath.XPathAPI;
@@ -340,6 +341,7 @@
* @throws SiteException
*/
private synchronized Node removeNodeInternal(String path) throws SiteException {
+ Assert.isTrue("contains " + path, contains(path));
Node node = this.getNodeInternal(path);
Node parentNode = node.getParentNode();
Node newNode = parentNode.removeChild(node);
Modified: lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java?view=diff&rev=494807&r1=494806&r2=494807
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java (original)
+++ lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java Wed Jan 10 05:12:27 2007
@@ -152,7 +152,9 @@
*/
final public void testRemoveLabel() throws SiteException {
this.siteTree.addLabel("/foo/bar", "de", "Hello");
- this.siteTree.addLabel("/foo/bar", "en", "World");
+ if (!this.siteTree.getNode("/foo/bar").hasLink("en")) {
+ this.siteTree.addLabel("/foo/bar", "en", "World");
+ }
assertEquals(((SiteTreeNode) this.siteTree.getNode("/foo/bar")).getLanguages().length, 2);
this.siteTree.removeLabel("/foo/bar", "de");
@@ -192,7 +194,7 @@
*/
final public void testGetNode() throws SiteException {
assertNotNull(this.siteTree.getNode("/foo/bar"));
- assertFalse(this.siteTree.contains("/foo/baz"));
+ assertFalse(this.siteTree.contains("/foo/bar/baz"));
}
/**
Modified: lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java?view=diff&rev=494807&r1=494806&r2=494807
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java (original)
+++ lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java Wed Jan 10 05:12:27 2007
@@ -48,6 +48,10 @@
siteTree.getRepositoryNode().lock();
+ if (siteTree.contains("/foo")) {
+ siteTree.removeNode("/foo");
+ }
+
siteTree.addNode("/foo", "foo-uuid", true, null, null, false);
siteTree.addLabel("/foo", "en", "Foo");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org