Changeset 8722

Timestamp:

02/02/11 18:00:11 (2 years ago)

Author:

sampson

Message:

Coding Windows tests

Location:

branches/windows-client/src/client/windows/client-test

Files:

• client-test.c (modified) (2 diffs)
• create.c (modified) (3 diffs)
• test-support.c (modified) (1 diff)

branches/windows-client/src/client/windows/client-test/client-test.c

@@ -17 +17 @@
 
 /* test prototypes */
-extern int test_test(op_options *options, int fatal);
+/* extern int test_test(op_options *options, int fatal); */
+extern int create_dir(op_options *options, int fatal);
+extern int create_subdir(op_options *options, int fatal);
 
 typedef struct _list_node
@@ -34 +36 @@
 test_operation op_table[] =
 {
-    {"test-test", test_test, FALSE},
+    /*{"test-test", test_test, FALSE}, */
+    {"create-dir", create_dir, TRUE},
+    {"create-subdir", create_subdir, TRUE},
     {NULL, NULL, 0}
 };

branches/windows-client/src/client/windows/client-test/create.c

@@ -14 +14 @@
 }
 
+char randchar()
+{
+    return rand() % 26 + 'a';
+}
+
 int create_dir(op_options *options, int fatal)
 {
@@ -24 +29 @@
     code = errno;
 
-    report_result(options, "create-dir", RESULT_SUCCESS, 0, OPER_EQUAL, errno);
+    report_result(options, "create-dir", RESULT_SUCCESS, 0, OPER_EQUAL, code);
 
     create_dir_cleanup(dir);
@@ -40 +45 @@
 int create_subdir(op_options *options, int fatal)
 {
-    int rem_size = MAX_SIZE;
+    int rem_size = MAX_SIZE, dir_size, i, 
+        code = 0;
+    char path[MAX_SIZE*2], dir[9];
 
-    rem_size -= strlen(options->root_dir);
-
-    while (rem_size > 0)
+    /* copy root into path */
+    strcpy(path, options->root_dir);
+    /* rem_size -= strlen(options->root_dir); */
+    /* add backslash if necessary */
+    if (strlen(options->root_dir) && 
+        options->root_dir[strlen(options->root_dir)-1] != '\\')
     {
-
-
+        strcat(path, "\\");
+        /* rem_size--; */
     }
 
-    
+    /* note--root dir is not included in the path size */
+
+    while (rem_size > 0 && code == 0)
+    {
+        /* generate subdir */
+        dir_size = rem_size > 8 ? 8 : rem_size;
+        for (i = 0; i < dir_size-1; i++)
+            dir[i] = randchar();
+        dir[dir_size-1] = '\\';
+        dir[dir_size] = '\0';
+
+        /* append the path */
+        strcat(path, dir);
+
+        /* create the sub-directory */
+        _mkdir(path);
+        code = errno;
+
+        rem_size -= dir_size;
+    }
+
+    report_result(options, "create-subdir", RESULT_SUCCESS, 0, OPER_EQUAL, code);
+
+    if (code != 0 && fatal)
+        return CODE_FATAL;
+
+    return 0;
 }

branches/windows-client/src/client/windows/client-test/test-support.c

@@ -132 +132 @@
 
     /* print to buffer */
-    ret = _snprintf(line, line_size, "%s %s %d %2s %d %s",
+    ret = _snprintf(line, line_size, "%s %s %d %s %d %s",
                     test_name, 
                     (expected_result == RESULT_SUCCESS) ? "EXPECT_SUCCESS" : "EXPECT_FAILURE",