From 8540c79489715655d13bdd254bfac12f078ecff7 Mon Sep 17 00:00:00 2001 From: tony-josi-aws Date: Fri, 14 Jun 2024 17:04:40 +0530 Subject: [PATCH] Fix merge conflichts --- .../FreeRTOS_DNS_Callback_utest.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c b/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c index 345efbbbf..a23ee1ba6 100644 --- a/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c +++ b/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c @@ -224,10 +224,10 @@ void test_xDNSSetCallBack_success( void ) xReturn = xDNSSetCallBack( "hostname", pvSearchID, dns_callback, 56, 123, pdFALSE ); /* Validations */ - TEST_ASSERT_EQUAL( 0, strcmp( dnsCallback.pcName, "hostname" ) ); - TEST_ASSERT_EQUAL( dns_callback, dnsCallback.pCallbackFunction ); - TEST_ASSERT_EQUAL( pvSearchID, dnsCallback.pvSearchID ); - TEST_ASSERT_EQUAL( 56, dnsCallback.uxRemainingTime ); + TEST_ASSERT_EQUAL( 0, strcmp( dnsCallback->pcName, "hostname" ) ); + TEST_ASSERT_EQUAL( dns_callback, dnsCallback->pCallbackFunction ); + TEST_ASSERT_EQUAL( pvSearchID, dnsCallback->pvSearchID ); + TEST_ASSERT_EQUAL( 56, dnsCallback->uxRemainingTime ); TEST_ASSERT_EQUAL( pdPASS, xReturn ); } @@ -255,10 +255,10 @@ void test_xDNSSetCallBack_success_empty_list( void ) xReturn = xDNSSetCallBack( "hostname", pvSearchID, dns_callback, 56, 123, pdFALSE ); /* Validations */ - TEST_ASSERT_EQUAL( 0, strcmp( dnsCallback.pcName, "hostname" ) ); - TEST_ASSERT_EQUAL( dns_callback, dnsCallback.pCallbackFunction ); - TEST_ASSERT_EQUAL( pvSearchID, dnsCallback.pvSearchID ); - TEST_ASSERT_EQUAL( 56, dnsCallback.uxRemainingTime ); + TEST_ASSERT_EQUAL( 0, strcmp( dnsCallback->pcName, "hostname" ) ); + TEST_ASSERT_EQUAL( dns_callback, dnsCallback->pCallbackFunction ); + TEST_ASSERT_EQUAL( pvSearchID, dnsCallback->pvSearchID ); + TEST_ASSERT_EQUAL( 56, dnsCallback->uxRemainingTime ); TEST_ASSERT_EQUAL( pdPASS, xReturn ); }