Changeset 922

Timestamp:

01/09/2006 09:45:50 (5 years ago)

Author:

chris

Message:

(refs #3)

Use correct directory separator everywhere

File:

• box/chris/merge/test/backupstore/testbackupstore.cpp (modified) (13 diffs)

box/chris/merge/test/backupstore/testbackupstore.cpp

@@ -949 +949 @@
                 protocol.QuerySetClientStoreMarker(0x8732523ab23aLL);
 
-#ifndef WIN32
+#ifndef WIN32 // can't open more than one connection on Win32
                 // Open a new connection which is read only
                 SocketStreamTLS connReadOnly;
@@ -969 +969 @@
                 }
 #else // WIN32
+                // we can't open a new connection, so fake it
                 BackupProtocolClient& protocolReadOnly(protocol);
 #endif
@@ -1531 +1532 @@
                 // The test block to a file
                 {
-                        FileStream f("testfiles/testenc1", O_WRONLY | O_CREAT | O_EXCL);
+                        FileStream f("testfiles" DIRECTORY_SEPARATOR 
+                                "testenc1", O_WRONLY | O_CREAT | O_EXCL);
                         f.Write(encfile, sizeof(encfile));
                 }
@@ -1537 +1539 @@
                 // Encode it
                 {
-                        FileStream out("testfiles/testenc1_enc", O_WRONLY | O_CREAT | O_EXCL);
-                        BackupStoreFilenameClear name("testfiles/testenc1");
-
-                        std::auto_ptr<IOStream> encoded(BackupStoreFile::EncodeFile("testfiles/testenc1", 32, name));
+                        FileStream out("testfiles" DIRECTORY_SEPARATOR 
+                                "testenc1_enc", O_WRONLY | O_CREAT | O_EXCL);
+                        BackupStoreFilenameClear name("testfiles"
+                                DIRECTORY_SEPARATOR "testenc1");
+
+                        std::auto_ptr<IOStream> encoded(
+                                BackupStoreFile::EncodeFile(
+                                        "testfiles" DIRECTORY_SEPARATOR
+                                        "testenc1", 32, name));
                         encoded->CopyStreamTo(out);
                 }
@@ -1546 +1553 @@
                 // Verify it
                 {
-                        FileStream enc("testfiles/testenc1_enc");
+                        FileStream enc("testfiles" DIRECTORY_SEPARATOR 
+                                "testenc1_enc");
                         TEST_THAT(BackupStoreFile::VerifyEncodedFileFormat(enc) == true);
                 }
@@ -1552 +1560 @@
                 // Decode it
                 {
-                        FileStream enc("testfiles/testenc1_enc");
-                        BackupStoreFile::DecodeFile(enc, "testfiles/testenc1_orig", IOStream::TimeOutInfinite);
+                        FileStream enc("testfiles" DIRECTORY_SEPARATOR 
+                                "testenc1_enc");
+                        BackupStoreFile::DecodeFile(enc, "testfiles"
+                                DIRECTORY_SEPARATOR "testenc1_orig", 
+                                IOStream::TimeOutInfinite);
                 }
                 
                 // Read in rebuilt original, and compare contents
                 {
-                        TEST_THAT(TestGetFileSize("testfiles/testenc1_orig") == sizeof(encfile));
-                        FileStream in("testfiles/testenc1_orig");
+                        TEST_THAT(TestGetFileSize("testfiles" 
+                                DIRECTORY_SEPARATOR "testenc1_orig") 
+                                == sizeof(encfile));
+                        FileStream in("testfiles" DIRECTORY_SEPARATOR 
+                                "testenc1_orig");
                         int encfile_i[ENCFILE_SIZE];
                         in.Read(encfile_i, sizeof(encfile_i));
@@ -1567 +1581 @@
                 // Check how many blocks it had, and test the stream based interface
                 {
-                        FileStream enc("testfiles/testenc1_enc");
+                        FileStream enc("testfiles" DIRECTORY_SEPARATOR 
+                                "testenc1_enc");
                         std::auto_ptr<BackupStoreFile::DecodedStream> decoded(BackupStoreFile::DecodeFileStream(enc, IOStream::TimeOutInfinite));
                         CollectInBufferStream d;
@@ -1581 +1596 @@
                 {
                         #define FILE_SIZE_JUST_OVER     ((4096*2)+58)
-                        FileStream f("testfiles/testenc2", O_WRONLY | O_CREAT | O_EXCL);
+                        FileStream f("testfiles" DIRECTORY_SEPARATOR 
+                                "testenc2", O_WRONLY | O_CREAT | O_EXCL);
                         f.Write(encfile + 2, FILE_SIZE_JUST_OVER);
+                        f.Close();
                         BackupStoreFilenameClear name("testenc2");
-                        std::auto_ptr<IOStream> encoded(BackupStoreFile::EncodeFile("testfiles/testenc2", 32, name));
+                        std::auto_ptr<IOStream> encoded(
+                                BackupStoreFile::EncodeFile(
+                                        "testfiles" DIRECTORY_SEPARATOR
+                                        "testenc2", 32, name));
                         CollectInBufferStream e;
                         encoded->CopyStreamTo(e);
@@ -1600 +1620 @@
                 // Test that reordered streams work too
                 {
-                        FileStream enc("testfiles/testenc1_enc");
+                        FileStream enc("testfiles" DIRECTORY_SEPARATOR 
+                                "testenc1_enc");
                         std::auto_ptr<IOStream> reordered(BackupStoreFile::ReorderFileToStreamOrder(&enc, false));
                         std::auto_ptr<BackupStoreFile::DecodedStream> decoded(BackupStoreFile::DecodeFileStream(*reordered, IOStream::TimeOutInfinite));
@@ -1630 +1651 @@
         {
                 RaidFileWrite::CreateDirectory(0, "test-info");
-                BackupStoreInfo::CreateNew(76, "test-info/", 0, 3461231233455433LL, 2934852487LL);
-                TEST_CHECK_THROWS(BackupStoreInfo::CreateNew(76, "test-info/", 0, 0, 0), RaidFileException, CannotOverwriteExistingFile);
-                std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76, "test-info/", 0, true));
+                BackupStoreInfo::CreateNew(76, "test-info" DIRECTORY_SEPARATOR, 
+                        0, 3461231233455433LL, 2934852487LL);
+                TEST_CHECK_THROWS(BackupStoreInfo::CreateNew(76, 
+                        "test-info" DIRECTORY_SEPARATOR, 0, 0, 0), 
+                        RaidFileException, CannotOverwriteExistingFile);
+                std::auto_ptr<BackupStoreInfo> info(
+                        BackupStoreInfo::Load(76, 
+                                "test-info" DIRECTORY_SEPARATOR, 0, true));
                 TEST_CHECK_THROWS(info->Save(), BackupStoreException, StoreInfoIsReadOnly);
                 TEST_CHECK_THROWS(info->ChangeBlocksUsed(1), BackupStoreException, StoreInfoIsReadOnly);
@@ -1641 +1667 @@
         }
         {
-                std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76, "test-info/", 0, false));
+                std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76, 
+                        "test-info" DIRECTORY_SEPARATOR, 0, false));
                 info->ChangeBlocksUsed(8);
                 info->ChangeBlocksInOldFiles(9);
@@ -1659 +1686 @@
         }
         {
-                std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76, "test-info/", 0, true));
+                std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76, 
+                        "test-info" DIRECTORY_SEPARATOR, 0, true));
                 TEST_THAT(info->GetBlocksUsed() == 7);
                 TEST_THAT(info->GetBlocksInOldFiles() == 5);
@@ -1677 +1705 @@
         TLSContext context;
         context.Initialise(false /* client */,
-                        "testfiles/clientCerts.pem",
-                        "testfiles/clientPrivKey.pem",
-                        "testfiles/clientTrustedCAs.pem");
+                        "testfiles" DIRECTORY_SEPARATOR "clientCerts.pem",
+                        "testfiles" DIRECTORY_SEPARATOR "clientPrivKey.pem",
+                        "testfiles" DIRECTORY_SEPARATOR "clientTrustedCAs.pem");
 
         // First, try logging in without an account having been created... just make sure login fails.