@@ -278,10 +278,15 @@ class uTreeComposite(libpry.AutoTree): list(reversed(list(self.tt["c"]["ca"].pathFromRoot()))) def test_isDescendantOf(self): - assert self.tt["a"].isDescendantOf(self.tt) - assert self.tt["c"]["ca"].isDescendantOf(self.tt["c"]) - assert not self.tt["a"].isDescendantOf(self.tt["c"]) - assert not self.tt.isDescendantOf(self.tt["c"]) + assert self.tt.isDescendantOf(self.tt["a"]) + assert self.tt["c"].isDescendantOf(self.tt["c"]["ca"]) + assert not self.tt["c"].isDescendantOf(self.tt["a"]) + assert not self.tt["c"].isDescendantOf(self.tt) + + def test_isSiblingOf(self): + assert not self.tt.isSiblingOf(self.tt["a"]) + assert self.tt["a"].isSiblingOf(self.tt["b"]) + assert not self.tt["a"].isSiblingOf(self.tt["c"]["ca"]) def test_getRoot(self): assert self.tt["c"]["ca"].getRoot() == self.tt test/test_tinytree.py @@ -167,12 +167,20 @@ class Tree(object): def isDescendantOf(self, node): """ - Returns true if the specified node lies on the path to the root - from this node. + Returns true if this node lies on the path to the root from the + specified node. :node A Tree object """ - return (node in self.pathToRoot()) + return (self in node.pathToRoot()) + + def isSiblingOf(self, node): + """ + Returns true if this node is a sibling of the specified node. + + :node A Tree object + """ + return (self in node.siblings()) def siblings(self): """ tinytree.py ceea22960f55a0bfec29763195139f50a19d7cf8 Aldo Cortesi aldo@nullcube.com http://github.com/cortesi/tinytree/commit/c22e115b4e360cf0a8c1239e395e563c51d252fa c22e115b4e360cf0a8c1239e395e563c51d252fa 2008-04-24T21:24:19-07:00 2008-04-24T21:24:19-07:00 Fix a semantic glitch - isDescendantOf should test whether the current node is a descendant of the argument node, not the other way around. Add an isSiblingOf method. a496356a85f19335d2f9d9102695f5dfc4abd195 Aldo Cortesi aldo@nullcube.com