X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=Source%2Fcharon%2Ftestcases%2Fike_sa_id_test.c;h=d3d56709309aecebc2ba92211b1f04bf498829ff;hp=960e451068416050ba50caec90494a07ea2c05a4;hb=d0cc48e5ece245c70708e9da79c785ad460a6501;hpb=1bcea5140da4be45825f672094afa38130b051d1

diff --git a/Source/charon/testcases/ike_sa_id_test.c b/Source/charon/testcases/ike_sa_id_test.c
index 960e451..d3d5670 100644
--- a/Source/charon/testcases/ike_sa_id_test.c
+++ b/Source/charon/testcases/ike_sa_id_test.c
@@ -32,7 +32,6 @@ void test_ike_sa_id(tester_t *tester)
 	ike_sa_id_t *ike_sa_id, *clone, *equal, *other1, *other2, *other3, *other4;
 	u_int64_t initiator, initiator2, responder, responder2;
 	bool is_initiator;
-	bool are_equal = FALSE;
 	
 	initiator = 0;
 
@@ -53,33 +52,25 @@ void test_ike_sa_id(tester_t *tester)
 	other4 = ike_sa_id_create(initiator, responder, is_initiator);
 	
 	/* check equality */
-	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,equal,&are_equal) == SUCCESS), "equal call check");
-	tester->assert_true(tester,(are_equal == TRUE), "equal check");
-	tester->assert_true(tester,(equal->equals(equal,ike_sa_id,&are_equal) == SUCCESS), "equal call check");
-	tester->assert_true(tester,(are_equal == TRUE), "equal check");	
+	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,equal) == TRUE), "equal check");
+	tester->assert_true(tester,(equal->equals(equal,ike_sa_id) == TRUE), "equal check");
 
 	/* check clone functionality and equality*/	
-	tester->assert_true(tester,(ike_sa_id->clone(ike_sa_id,&clone) == SUCCESS), "clone call check");
+	clone = ike_sa_id->clone(ike_sa_id);
 	tester->assert_false(tester,(clone == ike_sa_id), "clone pointer check");	
-	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,clone,&are_equal) == SUCCESS), "equal call check");
-	tester->assert_true(tester,(are_equal == TRUE), "equal check");
+	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,clone) == TRUE), "equal check");
 	
 	/* check for non equality */
-	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,other1,&are_equal) == SUCCESS), "equal call check");
-	tester->assert_false(tester,(are_equal == TRUE), "equal check");
+	tester->assert_false(tester,(ike_sa_id->equals(ike_sa_id,other1) == TRUE), "equal check");
 
-	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,other2,&are_equal) == SUCCESS), "equal call check");
-	tester->assert_false(tester,(are_equal == TRUE), "equal check");
+	tester->assert_false(tester,(ike_sa_id->equals(ike_sa_id,other2) == TRUE), "equal check");
 
-	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,other3,&are_equal) == SUCCESS), "equal call check");
-	tester->assert_false(tester,(are_equal == TRUE), "equal check");
+	tester->assert_false(tester,(ike_sa_id->equals(ike_sa_id,other3) == TRUE), "equal check");
 
-	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,other4,&are_equal) == SUCCESS), "equal call check");
-	tester->assert_false(tester,(are_equal == TRUE), "equal check");
+	tester->assert_false(tester,(ike_sa_id->equals(ike_sa_id,other4) == TRUE), "equal check");
 
-	tester->assert_true(tester,(other4->replace_values(other4,ike_sa_id) == SUCCESS), "replace values call check");
-	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,other4,&are_equal) == SUCCESS), "equal call check");
-	tester->assert_true(tester,(are_equal == TRUE), "equal check");
+	other4->replace_values(other4,ike_sa_id);
+	tester->assert_true(tester,(ike_sa_id->equals(ike_sa_id,other4) == TRUE), "equal check");
 	
 	
 	/* check destroy functionality */