* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
#define TESTSTRING "Hello World\0"
ret = GNUNET_DISK_fn_read (".testfile", tmp, sizeof (tmp) - 1);
if (ret < 0)
{
- fprintf (stderr, "Error reading file `%s' in testReadWrite\n", ".testfile");
+ FPRINTF (stderr, "Error reading file `%s' in testReadWrite\n", ".testfile");
return 1;
}
tmp[ret] = '\0';
if (0 != memcmp (tmp, TESTSTRING, strlen (TESTSTRING) + 1))
{
- fprintf (stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp,
+ FPRINTF (stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp,
TESTSTRING, ".testfile");
return 1;
}
ret = GNUNET_DISK_fn_read (".testfile2", tmp, sizeof (tmp) - 1);
if (ret < 0)
{
- fprintf (stderr, "Error reading file `%s' in testReadWrite\n",
+ FPRINTF (stderr, "Error reading file `%s' in testReadWrite\n",
".testfile2");
return 1;
}
tmp[ret] = '\0';
if (0 != memcmp (tmp, TESTSTRING, strlen (TESTSTRING) + 1))
{
- fprintf (stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp,
+ FPRINTF (stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp,
TESTSTRING, ".testfile2");
return 1;
}
{
struct GNUNET_DISK_FileHandle *fh;
uint64_t size;
- long avail;
fh = GNUNET_DISK_file_open (".testfile",
GNUNET_DISK_OPEN_READWRITE |
GNUNET_break (5 == GNUNET_DISK_file_write (fh, "Hello", 5));
GNUNET_DISK_file_close (fh);
GNUNET_break (GNUNET_OK ==
- GNUNET_DISK_file_size (".testfile", &size, GNUNET_NO));
+ GNUNET_DISK_file_size (".testfile", &size, GNUNET_NO, GNUNET_YES));
if (size != 5)
return 1;
GNUNET_break (0 == UNLINK (".testfile"));
- /* test that avail goes down as we fill the disk... */
- GNUNET_log_skip (1, GNUNET_NO);
- avail = GNUNET_DISK_get_blocks_available (".testfile");
- GNUNET_log_skip (0, GNUNET_NO);
- fh = GNUNET_DISK_file_open (".testfile",
- GNUNET_DISK_OPEN_READWRITE |
- GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_WRITE |
- GNUNET_DISK_PERM_USER_READ);
- GNUNET_assert (GNUNET_NO == GNUNET_DISK_handle_invalid (fh));
- while ((avail == GNUNET_DISK_get_blocks_available (".testfile")) &&
- (avail != -1))
- if (16 != GNUNET_DISK_file_write (fh, "HelloWorld123456", 16))
- {
- GNUNET_DISK_file_close (fh);
- GNUNET_break (0 == UNLINK (".testfile"));
- return 1;
- }
- GNUNET_DISK_file_close (fh);
- GNUNET_break (0 == UNLINK (".testfile"));
-
return 0;
}
return 1;
if (GNUNET_OK != GNUNET_DISK_directory_create ("test"))
return 1;
- if (GNUNET_YES != GNUNET_DISK_directory_test ("test"))
+ if (GNUNET_YES != GNUNET_DISK_directory_test ("test", GNUNET_YES))
return 1;
if (GNUNET_OK != GNUNET_DISK_directory_remove ("test"))
return 1;
failureCount += testDirMani ();
if (failureCount != 0)
{
- fprintf (stderr, "\n%u TESTS FAILED!\n", failureCount);
+ FPRINTF (stderr, "\n%u TESTS FAILED!\n", failureCount);
return -1;
}
return 0;