X-Git-Url: https://ruin.nu/git/?p=germs.git;a=blobdiff_plain;f=src%2Ftest%2Fgenesortertest.cpp;h=c84ead8356fd26bf03e22000277e414180fd60cd;hp=1625dbd5607d64615cece2b823bf2f55fac4c7c6;hb=efe42ca948704593c847996d0ae8da71d15bb75b;hpb=f8575ea6c0982bba5ccf42771b2994d19500c0a3 diff --git a/src/test/genesortertest.cpp b/src/test/genesortertest.cpp index 1625dbd..c84ead8 100644 --- a/src/test/genesortertest.cpp +++ b/src/test/genesortertest.cpp @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include #include @@ -56,11 +58,11 @@ protected: void testSort (){ GeneSorter so; GeneOrder go(_validPerm.begin(),_validPerm.end()); - GeneSorter::ActionList al = so.sort(go); + GeneSorter::ActionList al = so.sort(go,Model(new Models::ModelImpl)); CPPUNIT_ASSERT_EQUAL((size_t)0u,al.size()); GeneOrder go2(_validPerm2.begin(),_validPerm2.end()); - al = so.sort(go2); + al = so.sort(go2,Model(new Models::ModelImpl)); CPPUNIT_ASSERT_EQUAL((size_t)1u,al.size()); CPPUNIT_ASSERT(al[0] == ReverseAction(2,3)); @@ -68,7 +70,7 @@ protected: CPPUNIT_ASSERT(equal(go.begin(),go.end(),go2.begin())); GeneOrder go3(_validPerm3.begin(),_validPerm3.end()); - al = so.sort(go3); + al = so.sort(go3,Model(new Models::ModelImpl)); CPPUNIT_ASSERT_EQUAL((size_t)5u,al.size()); for (size_t i = 0; i < al.size(); ++i) al[i](go3); @@ -76,7 +78,7 @@ protected: CPPUNIT_ASSERT(equal(go3.begin(),go3.end(),perm)); GeneOrder go4(_validPerm4.begin(),_validPerm4.end()); - al = so.sort(go4); + al = so.sort(go4,Model(new Models::ModelImpl)); CPPUNIT_ASSERT_EQUAL((size_t)13u,al.size()); for (size_t i = 0; i < al.size(); ++i) al[i](go3);