X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Ftests_filesystem%2Ftest_byte_filer.cpp;h=0bf0ff1a9eb2a0e0de4e8b0006c85a512f79322e;hb=49c7386493690343410ccc51f3c527429f5c00ff;hp=8261d39831055a08180dc8f9f1c6e17d7b0a5fa0;hpb=457b128b77b5b4a0b7dd3094de543de2ce1477ad;p=feisty_meow.git

diff --git a/nucleus/library/tests_filesystem/test_byte_filer.cpp b/nucleus/library/tests_filesystem/test_byte_filer.cpp
index 8261d398..0bf0ff1a 100644
--- a/nucleus/library/tests_filesystem/test_byte_filer.cpp
+++ b/nucleus/library/tests_filesystem/test_byte_filer.cpp
@@ -44,6 +44,9 @@ using namespace unit_test;
 
 #define LOG(s) CLASS_EMERGENCY_LOG(program_wide_logger::get(), s)
 
+#define DEBUG_BYTE_FILER
+  // uncomment for noisy test run.
+
 class test_byte_filer : virtual public unit_base, virtual public application_shell
 {
 public:
@@ -56,12 +59,15 @@ public:
 
 const astring &TEST_FILE()
 {
-  const char *TEST_FILE_BASE = "/zz_garbage.txt";
+  const char *TEST_FILE_BASE = "/zz_garbage";
+  const char *TEST_FILE_SUFFIX = ".txt";
   static astring __hidden_filename;
   if (!__hidden_filename) {
     __hidden_filename = environment::get("TMP");
     if (!__hidden_filename) __hidden_filename = "/tmp";
-    __hidden_filename += astring(TEST_FILE_BASE);
+    __hidden_filename += TEST_FILE_BASE;
+    __hidden_filename += a_sprintf("%d", chaos().inclusive(0, 65535));
+    __hidden_filename += TEST_FILE_SUFFIX;
   }
   return __hidden_filename;
 }
@@ -69,7 +75,7 @@ const astring &TEST_FILE()
 int test_byte_filer::run_simple_test()
 {
   FUNCDEF("run_simple_test");
-#ifdef DEBUG
+#ifdef DEBUG_BYTE_FILER
   LOG("ahoy, beginning file test...");
   LOG(astring("test file is ") + TEST_FILE());
 #endif
@@ -90,7 +96,7 @@ int test_byte_filer::run_simple_test()
   test1.unlink();
 
   int block_size = randomizer.inclusive(3000, 30000);
-#ifdef DEBUG
+#ifdef DEBUG_BYTE_FILER
   LOG(a_sprintf("block size=%d", block_size));
 #endif
   abyte *original_block = new abyte[block_size];
@@ -99,7 +105,7 @@ int test_byte_filer::run_simple_test()
   unsigned int original_checksum
       = checksums::bizarre_checksum((abyte *)original_block, block_size);
   if (original_checksum) {} // compiler quieting.
-#ifdef DEBUG
+#ifdef DEBUG_BYTE_FILER
   LOG(a_sprintf("random block checksum=%d", original_checksum));
 #endif
   {
@@ -108,7 +114,7 @@ int test_byte_filer::run_simple_test()
     byte_filer fred(TEST_FILE(), "w+");
     fred.write(to_stuff_in_file);
   }
-#ifdef DEBUG
+#ifdef DEBUG_BYTE_FILER
   LOG(astring("about to compare file to checksum"));
 #endif
   {
@@ -116,17 +122,14 @@ int test_byte_filer::run_simple_test()
     byte_array to_fake_stuff(21309, temp_array);
     delete [] temp_array;
     byte_filer fred(TEST_FILE(), "r");
-#ifdef DEBUG
+#ifdef DEBUG_BYTE_FILER
     LOG(astring("about to try writing to file"));
 #endif
     int should_be_failure = fred.write(to_fake_stuff);
     ASSERT_EQUAL(should_be_failure, 0, "write on read only, should not succeed");
 
-///    int fredsize = int(fred.size());
-///    fred.chunk_factor(fredsize);
-
-#ifdef DEBUG
-    LOG(a_sprintf("about to try reading from file %d bytes", fredsize));
+#ifdef DEBUG_BYTE_FILER
+    LOG(a_sprintf("about to try reading from file %d bytes", block_size * 2));
 #endif
     byte_array file_contents;
     int bytes_read = fred.read(file_contents, block_size * 2);