Fix merge conflichts

tony-josi-aws · Jun 14, 2024 · 8540c79 · 8540c79
1 parent f0375bf
commit 8540c79
Showing 1 changed file with 8 additions and 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
@@ -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 );
 }