shortBranches

[germs.git] / src / test / componenttreetest.cpp

diff --git a/src/test/componenttreetest.cpp b/src/test/componenttreetest.cpp
index d85c59a429c9a0fffd693a6d001da5e37fc38fb8..61e932218257ae9d7fe75a8b891fec21e43dfc0c 100644 (file)
--- a/src/test/componenttreetest.cpp
+++ b/src/test/componenttreetest.cpp
@@ -25,6 +25,7 @@ class TESTNAME : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST( testCreate );
   CPPUNIT_TEST( testMakeUnoriented );
   CPPUNIT_TEST( testCountLeaves );
+  CPPUNIT_TEST( testShortBranches );
   CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -132,7 +133,7 @@ protected:
                ComponentTree t(findComponents(go));
                t.makeUnoriented();
 
-               //CPPUNIT_ASSERT_EQUAL((size_t)0u,t.countLeaves());
+               CPPUNIT_ASSERT_EQUAL((size_t)0u,t.countLeaves());
 
                GeneOrder go2(_validPerm4.begin(),_validPerm4.end());
                ComponentTree t2(findComponents(go2));
@@ -142,6 +143,19 @@ protected:
                CPPUNIT_ASSERT_EQUAL(false,n->_children.empty());
                CPPUNIT_ASSERT_EQUAL((size_t)3u,t2.countLeaves());
        }
+       void testShortBranches (){
+               GeneOrder go(_validPerm.begin(),_validPerm.end());
+               ComponentTree t(findComponents(go));
+               t.makeUnoriented();
+
+               CPPUNIT_ASSERT_EQUAL((size_t)0u,t.shortBranches());
+
+               GeneOrder go2(_validPerm4.begin(),_validPerm4.end());
+               ComponentTree t2(findComponents(go2));
+               t2.makeUnoriented();
+               ComponentTree::Node* n = t2._root;
+               //CPPUNIT_ASSERT_EQUAL((size_t)1u,t2.shortBranches());
+       }
 
 };