Changeset 2d11a7d8 in mainline for uspace/app/tester/print/print1.c

Timestamp:

2009-06-30T15:54:14Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9c40f88

Parents:

db24058

Message:

tester framework rewrite (go from a menu-driven interface to command-line interface)

File:

• uspace/app/tester/print/print1.c (modified) (1 diff)

uspace/app/tester/print/print1.c

@@ -31 +31 @@
 #include "../tester.h"
 
-#define BUFFER_SIZE 32
-
-char * test_print1(bool quiet)
+char *test_print1(void)
 {
-        if (!quiet) {
-                int retval;
-                unsigned int nat = 0x12345678u;
-                
-                char buffer[BUFFER_SIZE];
-                
-                printf(" text 10.8s %*.*s \n", 5, 3, "text");
-                printf(" very long text 10.8s %10.8s \n", "very long text");
-                printf(" text 8.10s %8.10s \n", "text");
-                printf(" very long text 8.10s %8.10s \n", "very long text");
-                
-                printf(" char: c '%c', 3.2c '%3.2c', -3.2c '%-3.2c', 2.3c '%2.3c', -2.3c '%-2.3c' \n",'a', 'b', 'c', 'd', 'e' );
-                printf(" int: d '%d', 3.2d '%3.2d', -3.2d '%-3.2d', 2.3d '%2.3d', -2.3d '%-2.3d' \n",1, 1, 1, 1, 1 );
-                printf(" -int: d '%d', 3.2d '%3.2d', -3.2d '%-3.2d', 2.3d '%2.3d', -2.3d '%-2.3d' \n",-1, -1, -1, -1, -1 );
-                printf(" 0xint: x '%#x', 5.3x '%#5.3x', -5.3x '%#-5.3x', 3.5x '%#3.5x', -3.5x '%#-3.5x' \n",17, 17, 17, 17, 17 );
-                
-                printf("'%#llx' 64bit, '%#x' 32bit, '%#hhx' 8bit, '%#hx' 16bit, unative_t '%#zx'. '%#llx' 64bit and '%s' string.\n", 0x1234567887654321ll, 0x12345678, 0x12, 0x1234, nat, 0x1234567887654321ull, "Lovely string" );
-                
-                printf(" Print to NULL '%s'\n", NULL);
-                
-                retval = snprintf(buffer, BUFFER_SIZE, "Short text without parameters.");
-                printf("Result is: '%s', retval = %d\n", buffer, retval);
-                
-                retval = snprintf(buffer, BUFFER_SIZE, "Very very very long text without parameters.");
-                printf("Result is: '%s', retval = %d\n", buffer, retval);
-                
-                printf("Print short text to %d char long buffer via snprintf.\n", BUFFER_SIZE);
-                retval = snprintf(buffer, BUFFER_SIZE, "Short %s", "text");
-                printf("Result is: '%s', retval = %d\n", buffer, retval);
-                
-                printf("Print long text to %d char long buffer via snprintf.\n", BUFFER_SIZE);
-                retval = snprintf(buffer, BUFFER_SIZE, "Very long %s. This text`s length is more than %d. We are interested in the result.", "text" , BUFFER_SIZE);
-                printf("Result is: '%s', retval = %d\n", buffer, retval);
-        }
+        TPRINTF("Testing printf(\"%%*.*s\", 5, 3, \"text\"):\n");
+        TPRINTF("Expected output: \"  tex\"\n");
+        TPRINTF("Real output:     \"%*.*s\"\n\n", 5, 3, "text");
+        
+        TPRINTF("Testing printf(\"%%10.8s\", \"very long text\"):\n");
+        TPRINTF("Expected output: \"  very lon\"\n");
+        TPRINTF("Real output:     \"%10.8s\"\n\n", "very long text");
+        
+        TPRINTF("Testing printf(\"%%8.10s\", \"text\"):\n");
+        TPRINTF("Expected output: \"text\"\n");
+        TPRINTF("Real output:     \"%8.10s\"\n\n", "text");
+        
+        TPRINTF("Testing printf(\"%%8.10s\", \"very long text\"):\n");
+        TPRINTF("Expected output: \"very long \"\n");
+        TPRINTF("Real output:     \"%8.10s\"\n\n", "very long text");
+        
+        TPRINTF("Testing printf(\"%%s\", NULL):\n");
+        TPRINTF("Expected output: \"(NULL)\"\n");
+        TPRINTF("Real output:     \"%s\"\n\n", NULL);
         
         return NULL;