Changeset 2122

Timestamp:

04/04/2008 21:06:47 (4 years ago)

Author:

chris

Message:

Remove uses of obsolete TRACE macros in tests.

Location:

box/trunk/test

Files:

• backupdiff/testbackupdiff.cpp (modified) (3 diffs)
• compress/testcompress.cpp (modified) (1 diff)
• raidfile/testraidfile.cpp (modified) (1 diff)

box/trunk/test/backupdiff/testbackupdiff.cpp

@@ -111 +111 @@
         // number of blocks
         int64_t nblocks = box_ntoh64(hdr.mNumBlocks);
-        TRACE2("Reading index from '%s', has %lld blocks\n", filename, nblocks);
-        TRACE0("======== ===== ========== ======== ========\n   Index Where  EncSz/Idx     Size  WChcksm\n");
+        BOX_TRACE("Reading index from '" << filename << "', has " <<
+                nblocks << " blocks");
+        BOX_TRACE("======== ===== ========== ======== ========");
+        BOX_TRACE("   Index Where  EncSz/Idx     Size  WChcksm");
         // Read them all in
         int64_t nnew = 0, nold = 0;
@@ -120 +122 @@
                 TEST_THAT(enc.ReadFullBuffer(&en, sizeof(en), 0));
                 int64_t s = box_ntoh64(en.mEncodedSize);
-                if(s > 0)
-                {
-                        nnew++;
-                        #ifdef WIN32
-                        TRACE2("%8I64d this  s=%8I64d", b, s);
-                        #else
-                        TRACE2("%8lld this  s=%8lld", b, s);
-                        #endif
-                }
-                else
-                {
-                        nold++;
-                        #ifdef WIN32
-                        TRACE2("%8I64d other i=%8I64d", b, 0 - s);              
-                        #else
-                        TRACE2("%8lld other i=%8lld", b, 0 - s);                
-                        #endif
-                }
+
                 // Decode the rest
                 uint64_t iv = box_ntoh64(hdr.mEntryIVBase);
@@ -143 +128 @@
                 sBlowfishDecryptBlockEntry.SetIV(&iv);                  
                 file_BlockIndexEntryEnc entryEnc;
-                sBlowfishDecryptBlockEntry.TransformBlock(&entryEnc, sizeof(entryEnc),
-                                en.mEnEnc, sizeof(en.mEnEnc));
-                TRACE2(" %8d %08x\n", ntohl(entryEnc.mSize), ntohl(entryEnc.mWeakChecksum));
-                
-        }
-        TRACE0("======== ===== ========== ======== ========\n");
+                sBlowfishDecryptBlockEntry.TransformBlock(&entryEnc,
+                        sizeof(entryEnc), en.mEnEnc, sizeof(en.mEnEnc));
+
+
+                if(s > 0)
+                {
+                        nnew++;
+                        BOX_TRACE(std::setw(8) << b << " this  s=" << 
+                                std::setw(8) << s << " " <<
+                                std::setw(8) << ntohl(entryEnc.mSize) << " " <<
+                                std::setw(8) << std::setfill('0') <<
+                                std::hex << ntohl(entryEnc.mWeakChecksum));
+                }
+                else
+                {
+                        nold++;
+                        BOX_TRACE(std::setw(8) << b << " other i=" << 
+                                std::setw(8) << (0-s) <<
+                                std::setw(8) << ntohl(entryEnc.mSize) << " " <<
+                                std::setw(8) << std::setfill('0') <<
+                                std::hex << ntohl(entryEnc.mWeakChecksum));
+                }
+        }
+        BOX_TRACE("======== ===== ========== ======== ========");
         TEST_THAT(new_blocks_expected == nnew);
         TEST_THAT(old_blocks_expected == nold);

box/trunk/test/compress/testcompress.cpp

@@ -91 +91 @@
                 // Check sizes
                 TEST_THAT(poutput->GetSize() < source.GetSize());
-                TRACE2("compressed size = %d, source size = %d\n", poutput->GetSize(), source.GetSize());
+                BOX_TRACE("compressed size = " << poutput->GetSize() <<
+                        ", source size = " << source.GetSize());
                 
                 // Decompress the data

box/trunk/test/raidfile/testraidfile.cpp

@@ -623 +623 @@
                 TEST_THAT(n1 != n3);
                 TEST_THAT(n1 == n4);            // ie wraps around
-                TRACE3("Gen paths= '%s','%s',%s'\n", n1.c_str(), n2.c_str(), n3.c_str());
+                BOX_TRACE("Gen paths = '" << n1 << "', '" << n2 << 
+                        "', '" << n3);
         }