X-Git-Url: https://ruin.nu/git/?p=germs.git;a=blobdiff_plain;f=src%2Ftest%2Fgenesortertest.cpp;h=b06191827c58376cd50e31346094dea7e05d7280;hp=a2c4faeaf93b0987d5fc7f406b83c19e6fb85b76;hb=3401199b1ce268dd6465f09abf6264592b989140;hpb=d0abe1592fcbb10f4ac303e7b66c384624d4d439

diff --git a/src/test/genesortertest.cpp b/src/test/genesortertest.cpp
index a2c4fae..b061918 100644
--- a/src/test/genesortertest.cpp
+++ b/src/test/genesortertest.cpp
@@ -62,11 +62,18 @@ protected:
 		GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
 		al = so.sort(go2);
 		CPPUNIT_ASSERT_EQUAL(1ul,al.size());
-		CPPUNIT_ASSERT(al[0] == ReverseAction(2,3));
+		CPPUNIT_ASSERT((*al[0]) == ReverseAction(2,3));
+
+		(*al[0])(go2);
+		CPPUNIT_ASSERT(equal(go.begin(),go.end(),go2.begin()));
 
 		GeneOrder go3(_validPerm3.begin(),_validPerm3.end());
 		al = so.sort(go3);
 		CPPUNIT_ASSERT_EQUAL(5ul,al.size());
+		for (size_t i = 0; i < al.size(); ++i)
+			(*al[i])(go3);
+		int perm[] = {0,1,2,3,4,5,6,7,8,9};
+		CPPUNIT_ASSERT(equal(go3.begin(),go3.end(),perm));
 	}
 	void testSafeActions (){
 		GeneSorter so;
@@ -77,7 +84,8 @@ protected:
 		GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
 		al = so.safeActions(go2);
 		CPPUNIT_ASSERT_EQUAL(1ul,al.size());
-		CPPUNIT_ASSERT(al[0] == ReverseAction(2,3));
+		CPPUNIT_ASSERT((*al[0]) == ReverseAction(2,3));
+		CPPUNIT_ASSERT(!((*al[0]) == ReverseAction(2,5)));
 	}
 
 };