Changeset 9b20126 in mainline for uspace/lib/pcut/tests

Timestamp:

2014-09-19T08:23:01Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c85a57f

Parents:

15d0046

Message:

Update PCUT to newest version

Location:

uspace/lib/pcut/tests

Files:

• abort.c (moved) (moved from uspace/lib/pcut/tests/null.c ) (1 diff)
• abort.expected (moved) (moved from uspace/lib/pcut/tests/null.expected )
• beforeafter.c (moved) (moved from uspace/lib/pcut/tests/alloc.c ) (3 diffs)
• beforeafter.expected (moved) (moved from uspace/lib/pcut/tests/alloc.expected ) (1 diff)
• errno.expected (modified) (1 diff)
• inithook.c (added)
• inithook.expected (added)
• preinithook.c (added)
• preinithook.expected (added)
• teardown.c (modified) (1 diff)
• teardownaborts.c (moved) (moved from uspace/lib/pcut/tests/nullteardown.c ) (1 diff)
• teardownaborts.expected (moved) (moved from uspace/lib/pcut/tests/nullteardown.expected ) (1 diff)
• testlist.c (added)
• testlist.expected (added)
• timeout.c (modified) (3 diffs)
• xmlreport.c (added)
• xmlreport.expected (added)

uspace/lib/pcut/tests/abort.c

@@ -28 +28 @@
 
 #include <pcut/pcut.h>
-#include "tested.h"
+#include <stdlib.h>
 
 PCUT_INIT
 
 PCUT_TEST(access_null_pointer) {
-        int a = 5;
-        int *p = &a;
-        PCUT_ASSERT_INT_EQUALS(5, *p);
-        p = NULL;
-        PCUT_ASSERT_INT_EQUALS(5, *p);
+        abort();
 }
 

uspace/lib/pcut/tests/beforeafter.c

@@ -27 +27 @@
  */
 
+#define _BSD_SOURCE
+
 #include <pcut/pcut.h>
 #include <stdlib.h>
 #include <stdio.h>
+
+/*
+ * Use sprintf_s in Windows but only with Microsoft compiler.
+ * Namely, let MinGW use snprintf.
+ */
+#if (defined(__WIN64) || defined(__WIN32) || defined(_WIN32)) && defined(_MSC_VER)
+#define snprintf sprintf_s
+#endif
 
 PCUT_INIT
@@ -36 +46 @@
 #define BUFFER_SIZE 512
 
-PCUT_TEST_SUITE(suite_with_setup_and_teardown)
+PCUT_TEST_SUITE(suite_with_setup_and_teardown);
 
 PCUT_TEST_BEFORE {
@@ -48 +58 @@
 }
 
-PCUT_TEST(snprintf) {
+PCUT_TEST(test_with_setup_and_teardown) {
         snprintf(buffer, BUFFER_SIZE - 1, "%d-%s", 56, "abcd");
         PCUT_ASSERT_STR_EQUALS("56-abcd", buffer);
 }
 
-PCUT_TEST_SUITE(another_without_setup)
+PCUT_TEST_SUITE(another_without_setup);
 
-PCUT_TEST(whatever) {
+PCUT_TEST(test_without_any_setup_or_teardown) {
         PCUT_ASSERT_NULL(buffer);
 }

uspace/lib/pcut/tests/beforeafter.expected

@@ -1 +1 @@
 1..2
 #> Starting suite suite_with_setup_and_teardown.
-ok 1 snprintf
+ok 1 test_with_setup_and_teardown
 #> Finished suite suite_with_setup_and_teardown (failed 0 of 1).
 #> Starting suite another_without_setup.
-ok 2 whatever
+ok 2 test_without_any_setup_or_teardown
 #> Finished suite another_without_setup (failed 0 of 1).

uspace/lib/pcut/tests/errno.expected

@@ -2 +2 @@
 #> Starting suite Default.
 not ok 1 errno_value failed
-# error: errno.c:46: Expected error 0 (EOK, Success) but got error 2 (No such file or directory)
+# error: errno.c:46: Expected error 0 (EOK, *****) but got error ***** (*****)
 not ok 2 errno_variable failed
-# error: errno.c:54: Expected error 0 (EOK, Success) but got error 2 (No such file or directory)
+# error: errno.c:54: Expected error 0 (EOK, *****) but got error ***** (*****)
 #> Finished suite Default (failed 2 of 2).

uspace/lib/pcut/tests/teardown.c

@@ -50 +50 @@
 
 
-PCUT_TEST_SUITE(with_failing_teardown)
+PCUT_TEST_SUITE(with_failing_teardown);
 
 PCUT_TEST_AFTER {

uspace/lib/pcut/tests/teardownaborts.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <pcut/pcut.h>
-#include "tested.h"
+#include <stdlib.h>
 
 PCUT_INIT
 
 PCUT_TEST_AFTER {
-        int a = 5;
-        int *p = &a;
-        PCUT_ASSERT_INT_EQUALS(5, *p);
-        p = NULL;
-        PCUT_ASSERT_INT_EQUALS(5, *p);
+        abort();
 }
 

uspace/lib/pcut/tests/teardownaborts.expected

@@ -2 +2 @@
 #> Starting suite Default.
 not ok 1 print_and_fail aborted
-# error: nullteardown.c:45: Pointer <NULL> ought not to be NULL
+# error: teardownaborts.c:41: Pointer <NULL> ought not to be NULL
 # stdio: Tear-down will cause null pointer access...
 #> Finished suite Default (failed 1 of 1).

uspace/lib/pcut/tests/timeout.c

@@ -28 +28 @@
 
 #include <pcut/pcut.h>
+
+#ifdef __unix
 #include <unistd.h>
+#endif
+#if defined(__WIN64) || defined(__WIN32) || defined(_WIN32)
+#include <windows.h>
+#endif
+
 #include <stdio.h>
 #include "tested.h"
+
+static void my_sleep(int sec) {
+#ifdef __unix
+        sleep(sec);
+#endif
+#if defined(__WIN64) || defined(__WIN32) || defined(_WIN32)
+        Sleep(1000 * sec);
+#endif
+}
 
 PCUT_INIT
@@ -36 +52 @@
 PCUT_TEST(shall_time_out) {
         printf("Text before sleeping.\n");
-        sleep(PCUT_DEFAULT_TEST_TIMEOUT * 5);
+        my_sleep(PCUT_DEFAULT_TEST_TIMEOUT * 5);
         printf("Text after the sleep.\n");
 }
@@ -43 +59 @@
                 PCUT_TEST_SET_TIMEOUT(PCUT_DEFAULT_TEST_TIMEOUT * 3)) {
         printf("Text before sleeping.\n");
-        sleep(PCUT_DEFAULT_TEST_TIMEOUT * 2);
+        my_sleep(PCUT_DEFAULT_TEST_TIMEOUT * 2);
         printf("Text after the sleep.\n");
 }