[PATCH 0/1] MR7598: bluetoothapis/tests: Use the correct file name while skipping tests when no radios are found.

[PATCH 1/1] bluetoothapis/tests: Use the correct file name while skipping tests when no radios are found.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/bluetoothapis/tests/device.c |  6 +++---
 dlls/bluetoothapis/tests/radio.c  | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/bluetoothapis/tests/device.c b/dlls/bluetoothapis/tests/device.c
index b9331b7488d..b888643bba6 100644
--- a/dlls/bluetoothapis/tests/device.c
+++ b/dlls/bluetoothapis/tests/device.c
@@ -29,7 +29,7 @@

#include <wine/test.h>

-extern void test_for_all_radios( void (*test)( HANDLE radio, void *data ), void *data );
+extern void test_for_all_radios( const char *file, int line, void (*test)( HANDLE radio, void *data ), void *data );

void test_radio_BluetoothFindFirstDevice( HANDLE radio, void *data )
 {
@@ -91,7 +91,7 @@ void test_BluetoothFindFirstDevice( void )
     err = GetLastError();
     ok( err == ERROR_REVISION_MISMATCH, "%lu != %d\n", err, ERROR_REVISION_MISMATCH );

-    test_for_all_radios( test_radio_BluetoothFindFirstDevice, NULL );
+    test_for_all_radios( __FILE__, __LINE__, test_radio_BluetoothFindFirstDevice, NULL );
 }

void test_radio_BluetoothFindNextDevice( HANDLE radio, void *data )
@@ -171,7 +171,7 @@ void test_BluetoothFindNextDevice( void )
         params.cTimeoutMultiplier = 5;
     }

-    test_for_all_radios( test_radio_BluetoothFindNextDevice, &params );
+    test_for_all_radios( __FILE__, __LINE__, test_radio_BluetoothFindNextDevice, &params );
 }

void test_BluetoothFindDeviceClose( void )
diff --git a/dlls/bluetoothapis/tests/radio.c b/dlls/bluetoothapis/tests/radio.c
index 798c5ddce20..3b41bbcc2e2 100644
--- a/dlls/bluetoothapis/tests/radio.c
+++ b/dlls/bluetoothapis/tests/radio.c
@@ -119,7 +119,7 @@ void test_BluetoothFindRadioClose( void )
     ok( err == ERROR_INVALID_HANDLE, "%lu != %d\n", err, ERROR_INVALID_HANDLE );
 }

-void test_for_all_radios( void (*test)( HANDLE radio, void *data ), void *data )
+void test_for_all_radios( const char *file, int line, void (*test)( HANDLE radio, void *data ), void *data )
 {
     DWORD err, idx = 0;
     HANDLE radio;
@@ -132,7 +132,7 @@ void test_for_all_radios( void (*test)( HANDLE radio, void *data ), void *data )
     {
         err = GetLastError();
         ok( err == ERROR_NO_MORE_ITEMS, "%lu != %d\n", err, ERROR_NO_MORE_ITEMS );
-        skip( "No Bluetooth radios found.\n" );
+        skip_(file, line)( "No Bluetooth radios found.\n" );
         return;
     }

@@ -196,7 +196,7 @@ void test_BluetoothIsConnectable( void )

ret = BluetoothIsConnectable( NULL );
     /* If ret is true, then at least one radio must be connectable. If ret returns false, then no radios are connectable. */
-    test_for_all_radios( test_radio_BluetoothIsConnectable, &result );
+    test_for_all_radios( __FILE__, __LINE__, test_radio_BluetoothIsConnectable, &result );

ok( ret == result, "%d != %d\n", ret, result );
 }
@@ -214,7 +214,7 @@ void test_BluetoothIsDiscoverable( void )
     BOOL result = FALSE;

ret = BluetoothIsDiscoverable( NULL );
-    test_for_all_radios( test_radio_BluetoothIsDiscoverable, &result );
+    test_for_all_radios( __FILE__, __LINE__, test_radio_BluetoothIsDiscoverable, &result );

ok( ret == result, "%d != %d\n", ret, result );
 }
@@ -239,7 +239,7 @@ void test_BluetoothEnableIncomingConnections( void )
 {
     BOOL result = FALSE;

-    test_for_all_radios( test_radio_BluetoothEnableIncomingConnections, &result );
+    test_for_all_radios( __FILE__, __LINE__, test_radio_BluetoothEnableIncomingConnections, &result );
     if (result)
     {
         BOOL connectable;
@@ -272,7 +272,7 @@ void test_radio_BluetoothEnableDiscovery( HANDLE radio, void *data )

void test_BluetoothEnableDiscovery( void )
 {
-    test_for_all_radios( test_radio_BluetoothEnableDiscovery, NULL );
+    test_for_all_radios( __FILE__, __LINE__, test_radio_BluetoothEnableDiscovery, NULL );
 }

START_TEST( radio )
@@ -281,7 +281,7 @@ START_TEST( radio )
     test_BluetoothFindNextRadio();
     test_BluetoothFindRadioClose();

-    test_for_all_radios( test_BluetoothGetRadioInfo, NULL );
+    test_for_all_radios( __FILE__, __LINE__, test_BluetoothGetRadioInfo, NULL );
     test_BluetoothIsDiscoverable();
     test_BluetoothIsConnectable();
     test_BluetoothEnableIncomingConnections();