Use a macro to wrap the casting instead

Andne · Andne · commit 6526bc764d07 · 2017-10-24T21:40:28.000-05:00
Now the casts change depending on system configuration, allows having the right cast/literal combinations to avoid any warnings
diff --git a/tests/CppUTest/TestUTestMacro.cpp b/tests/CppUTest/TestUTestMacro.cpp
@@ -31,6 +31,18 @@
 
 #define CHECK_TEST_FAILS_PROPER_WITH_TEXT(text) fixture.checkTestFailsWithProperTestLocation(text, __FILE__, __LINE__)
 
+// Mainly this is for Visual C++, but we'll define it for any system that has the same behavior
+// of a 32-bit long on a 64-bit system
+#if defined(CPPUTEST_64BIT) && defined(CPPUTEST_64BIT_32BIT_LONGS)
+// Forcing the value to be unsigned long long means that there's no sign-extension to perform
+#define to_void_pointer(x) ((void *)x##ULL)
+#define to_func_pointer(x) ((void (*)())x##ULL)
+#else
+// Probably not needed, but let's guarantee that the value is an unsigned long
+#define to_void_pointer(x) ((void *)x##UL)
+#define to_func_pointer(x) ((void (*)())x##UL)
+#endif
+
 TEST_GROUP(UnitTestMacros)
 {
     TestTestingFixture fixture;
@@ -721,8 +733,8 @@ TEST(UnitTestMacros, FailureWithPOINTERS_EQUAL)
 
 TEST(UnitTestMacros, POINTERS_EQUALBehavesAsProperMacro)
 {
-    if (false) POINTERS_EQUAL(0, 0x0ea1beef)
-    else POINTERS_EQUAL(0x01debeef, 0x01debeef)
+    if (false) POINTERS_EQUAL(0, to_void_pointer(0xbeefbeef))
+    else POINTERS_EQUAL(to_void_pointer(0xdeadbeef), to_void_pointer(0xdeadbeef))
 }
 
 IGNORE_TEST(UnitTestMacros, POINTERS_EQUALWorksInAnIgnoredTest)
@@ -746,8 +758,8 @@ TEST(UnitTestMacros, FailureWithPOINTERS_EQUAL_TEXT)
 
 TEST(UnitTestMacros, POINTERS_EQUAL_TEXTBehavesAsProperMacro)
 {
-    if (false) POINTERS_EQUAL_TEXT(0, (void*) 0x0ea1beef, "Failed because it failed")
-    else POINTERS_EQUAL_TEXT((void*)0x01debeef, (void*)0x01debeef, "Failed because it failed")
+    if (false) POINTERS_EQUAL_TEXT(0, to_void_pointer(0xbeefbeef), "Failed because it failed")
+    else POINTERS_EQUAL_TEXT(to_void_pointer(0xdeadbeef), to_void_pointer(0xdeadbeef), "Failed because it failed")
 }
 
 IGNORE_TEST(UnitTestMacros, POINTERS_EQUAL_TEXTWorksInAnIgnoredTest)
@@ -771,8 +783,8 @@ TEST(UnitTestMacros, FailureWithFUNCTIONPOINTERS_EQUAL)
 
 TEST(UnitTestMacros, FUNCTIONPOINTERS_EQUALBehavesAsProperMacro)
 {
-    if (false) FUNCTIONPOINTERS_EQUAL(0, (void (*)())0x0ea1beef)
-    else FUNCTIONPOINTERS_EQUAL((void (*)())0x01debeef, (void (*)())0x01debeef)
+    if (false) FUNCTIONPOINTERS_EQUAL(0, to_func_pointer(0xbeefbeef))
+    else FUNCTIONPOINTERS_EQUAL(to_func_pointer(0xdeadbeef), to_func_pointer(0xdeadbeef))
 }
 
 IGNORE_TEST(UnitTestMacros, FUNCTIONPOINTERS_EQUALWorksInAnIgnoredTest)
@@ -796,8 +808,8 @@ TEST(UnitTestMacros, FailureWithFUNCTIONPOINTERS_EQUAL_TEXT)
 
 TEST(UnitTestMacros, FUNCTIONPOINTERS_EQUAL_TEXTBehavesAsProperMacro)
 {
-    if (false) FUNCTIONPOINTERS_EQUAL_TEXT(0, (void (*)())0x0ea1beef, "Failed because it failed")
-    else FUNCTIONPOINTERS_EQUAL_TEXT((void (*)())0x01debeef, (void (*)())0x01debeef, "Failed because it failed")
+    if (false) FUNCTIONPOINTERS_EQUAL_TEXT(0, to_func_pointer(0xbeefbeef), "Failed because it failed")
+    else FUNCTIONPOINTERS_EQUAL_TEXT(to_func_pointer(0xdeadbeef), to_func_pointer(0xdeadbeef), "Failed because it failed")
 }
 
 IGNORE_TEST(UnitTestMacros, FUNCTIONPOINTERS_EQUAL_TEXTWorksInAnIgnoredTest)

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,18 @@`
`31`	`31`
`32`	`32`	`#define CHECK_TEST_FAILS_PROPER_WITH_TEXT(text) fixture.checkTestFailsWithProperTestLocation(text, __FILE__, __LINE__)`
`33`	`33`
	`34`	`+// Mainly this is for Visual C++, but we'll define it for any system that has the same behavior`
	`35`	`+// of a 32-bit long on a 64-bit system`
	`36`	`+#if defined(CPPUTEST_64BIT) && defined(CPPUTEST_64BIT_32BIT_LONGS)`
	`37`	`+// Forcing the value to be unsigned long long means that there's no sign-extension to perform`
	`38`	`+#define to_void_pointer(x) ((void *)x##ULL)`
	`39`	`+#define to_func_pointer(x) ((void (*)())x##ULL)`
	`40`	`+#else`
	`41`	`+// Probably not needed, but let's guarantee that the value is an unsigned long`
	`42`	`+#define to_void_pointer(x) ((void *)x##UL)`
	`43`	`+#define to_func_pointer(x) ((void (*)())x##UL)`
	`44`	`+#endif`
	`45`	`+`
`34`	`46`	`TEST_GROUP(UnitTestMacros)`
`35`	`47`	`{`
`36`	`48`	`TestTestingFixture fixture;`
`@@ -721,8 +733,8 @@ TEST(UnitTestMacros, FailureWithPOINTERS_EQUAL)`
`721`	`733`
`722`	`734`	`TEST(UnitTestMacros, POINTERS_EQUALBehavesAsProperMacro)`
`723`	`735`	`{`
`724`		`- if (false) POINTERS_EQUAL(0, 0x0ea1beef)`
`725`		`- else POINTERS_EQUAL(0x01debeef, 0x01debeef)`
	`736`	`+ if (false) POINTERS_EQUAL(0, to_void_pointer(0xbeefbeef))`
	`737`	`+ else POINTERS_EQUAL(to_void_pointer(0xdeadbeef), to_void_pointer(0xdeadbeef))`
`726`	`738`	`}`
`727`	`739`
`728`	`740`	`IGNORE_TEST(UnitTestMacros, POINTERS_EQUALWorksInAnIgnoredTest)`
`@@ -746,8 +758,8 @@ TEST(UnitTestMacros, FailureWithPOINTERS_EQUAL_TEXT)`
`746`	`758`
`747`	`759`	`TEST(UnitTestMacros, POINTERS_EQUAL_TEXTBehavesAsProperMacro)`
`748`	`760`	`{`
`749`		`- if (false) POINTERS_EQUAL_TEXT(0, (void*) 0x0ea1beef, "Failed because it failed")`
`750`		`- else POINTERS_EQUAL_TEXT((void)0x01debeef, (void)0x01debeef, "Failed because it failed")`
	`761`	`+ if (false) POINTERS_EQUAL_TEXT(0, to_void_pointer(0xbeefbeef), "Failed because it failed")`
	`762`	`+ else POINTERS_EQUAL_TEXT(to_void_pointer(0xdeadbeef), to_void_pointer(0xdeadbeef), "Failed because it failed")`
`751`	`763`	`}`
`752`	`764`
`753`	`765`	`IGNORE_TEST(UnitTestMacros, POINTERS_EQUAL_TEXTWorksInAnIgnoredTest)`
`@@ -771,8 +783,8 @@ TEST(UnitTestMacros, FailureWithFUNCTIONPOINTERS_EQUAL)`
`771`	`783`
`772`	`784`	`TEST(UnitTestMacros, FUNCTIONPOINTERS_EQUALBehavesAsProperMacro)`
`773`	`785`	`{`
`774`		`- if (false) FUNCTIONPOINTERS_EQUAL(0, (void (*)())0x0ea1beef)`
`775`		`- else FUNCTIONPOINTERS_EQUAL((void ()())0x01debeef, (void ()())0x01debeef)`
	`786`	`+ if (false) FUNCTIONPOINTERS_EQUAL(0, to_func_pointer(0xbeefbeef))`
	`787`	`+ else FUNCTIONPOINTERS_EQUAL(to_func_pointer(0xdeadbeef), to_func_pointer(0xdeadbeef))`
`776`	`788`	`}`
`777`	`789`
`778`	`790`	`IGNORE_TEST(UnitTestMacros, FUNCTIONPOINTERS_EQUALWorksInAnIgnoredTest)`
`@@ -796,8 +808,8 @@ TEST(UnitTestMacros, FailureWithFUNCTIONPOINTERS_EQUAL_TEXT)`
`796`	`808`
`797`	`809`	`TEST(UnitTestMacros, FUNCTIONPOINTERS_EQUAL_TEXTBehavesAsProperMacro)`
`798`	`810`	`{`
`799`		`- if (false) FUNCTIONPOINTERS_EQUAL_TEXT(0, (void (*)())0x0ea1beef, "Failed because it failed")`
`800`		`- else FUNCTIONPOINTERS_EQUAL_TEXT((void ()())0x01debeef, (void ()())0x01debeef, "Failed because it failed")`
	`811`	`+ if (false) FUNCTIONPOINTERS_EQUAL_TEXT(0, to_func_pointer(0xbeefbeef), "Failed because it failed")`
	`812`	`+ else FUNCTIONPOINTERS_EQUAL_TEXT(to_func_pointer(0xdeadbeef), to_func_pointer(0xdeadbeef), "Failed because it failed")`
`801`	`813`	`}`
`802`	`814`
`803`	`815`	`IGNORE_TEST(UnitTestMacros, FUNCTIONPOINTERS_EQUAL_TEXTWorksInAnIgnoredTest)`