[Box Backup-commit] COMMIT r3267 - in box/trunk: lib/backupstore test/backupstore
subversion at boxbackup.org
subversion at boxbackup.org
Thu Feb 13 22:12:18 GMT 2014
Author: chris
Date: 2014-02-13 22:12:18 +0000 (Thu, 13 Feb 2014)
New Revision: 3267
Modified:
box/trunk/lib/backupstore/BackupStoreDirectory.h
box/trunk/test/backupstore/testbackupstore.cpp
Log:
Add a convenience constructor to read a BackupStoreDirectory from a stream.
Saves ~2 lines each time it's used. And we use it a lot in testbackupstore.
Modified: box/trunk/lib/backupstore/BackupStoreDirectory.h
===================================================================
--- box/trunk/lib/backupstore/BackupStoreDirectory.h 2014-02-13 22:12:10 UTC (rev 3266)
+++ box/trunk/lib/backupstore/BackupStoreDirectory.h 2014-02-13 22:12:18 UTC (rev 3267)
@@ -32,6 +32,17 @@
public:
BackupStoreDirectory();
BackupStoreDirectory(int64_t ObjectID, int64_t ContainerID);
+ // Convenience constructor from a stream
+ BackupStoreDirectory(IOStream& rStream,
+ int Timeout = IOStream::TimeOutInfinite)
+ {
+ ReadFromStream(rStream, Timeout);
+ }
+ BackupStoreDirectory(std::auto_ptr<IOStream> apStream,
+ int Timeout = IOStream::TimeOutInfinite)
+ {
+ ReadFromStream(*apStream, Timeout);
+ }
private:
// Copying not allowed
BackupStoreDirectory(const BackupStoreDirectory &rToCopy);
Modified: box/trunk/test/backupstore/testbackupstore.cpp
===================================================================
--- box/trunk/test/backupstore/testbackupstore.cpp 2014-02-13 22:12:10 UTC (rev 3266)
+++ box/trunk/test/backupstore/testbackupstore.cpp 2014-02-13 22:12:18 UTC (rev 3267)
@@ -485,8 +485,7 @@
CollectInBufferStream stream;
dir1.WriteToStream(stream);
stream.SetForReading();
- BackupStoreDirectory dir2;
- dir2.ReadFromStream(stream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir2(stream);
TEST_THAT(dir2.GetNumberOfEntries() == DIR_NUM);
TEST_THAT(dir2.GetObjectID() == 12);
TEST_THAT(dir2.GetContainerID() == 98);
@@ -498,8 +497,7 @@
CollectInBufferStream stream;
dir1.WriteToStream(stream, BackupStoreDirectory::Entry::Flags_File);
stream.SetForReading();
- BackupStoreDirectory dir2;
- dir2.ReadFromStream(stream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir2(stream);
TEST_THAT(dir2.GetNumberOfEntries() == DIR_FILES);
CheckEntries(dir2, BackupStoreDirectory::Entry::Flags_File, BackupStoreDirectory::Entry::Flags_EXCLUDE_NOTHING);
}
@@ -507,8 +505,7 @@
CollectInBufferStream stream;
dir1.WriteToStream(stream, BackupStoreDirectory::Entry::Flags_INCLUDE_EVERYTHING, BackupStoreDirectory::Entry::Flags_File);
stream.SetForReading();
- BackupStoreDirectory dir2;
- dir2.ReadFromStream(stream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir2(stream);
TEST_THAT(dir2.GetNumberOfEntries() == DIR_DIRS);
CheckEntries(dir2, BackupStoreDirectory::Entry::Flags_Dir, BackupStoreDirectory::Entry::Flags_EXCLUDE_NOTHING);
}
@@ -516,8 +513,7 @@
CollectInBufferStream stream;
dir1.WriteToStream(stream, BackupStoreDirectory::Entry::Flags_File, BackupStoreDirectory::Entry::Flags_OldVersion);
stream.SetForReading();
- BackupStoreDirectory dir2;
- dir2.ReadFromStream(stream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir2(stream);
TEST_THAT(dir2.GetNumberOfEntries() == DIR_FILES - DIR_OLD);
CheckEntries(dir2, BackupStoreDirectory::Entry::Flags_File, BackupStoreDirectory::Entry::Flags_OldVersion);
}
@@ -530,8 +526,7 @@
CollectInBufferStream stream;
dir1.WriteToStream(stream, BackupStoreDirectory::Entry::Flags_File);
stream.SetForReading();
- BackupStoreDirectory dir2;
- dir2.ReadFromStream(stream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir2(stream);
TEST_THAT(dir2.GetNumberOfEntries() == DIR_FILES - 1);
}
@@ -546,8 +541,7 @@
CollectInBufferStream stream;
d1.WriteToStream(stream);
stream.SetForReading();
- BackupStoreDirectory d2;
- d2.ReadFromStream(stream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory d2(stream);
TEST_THAT(d2.GetAttributes() == attr);
TEST_THAT(d2.GetAttributesModTime() == 56234987324232LL);
}
@@ -609,10 +603,7 @@
BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING,
BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, false /* no attributes */));
// Stream
- BackupStoreDirectory dir;
- std::auto_ptr<IOStream> dirstream(protocol.ReceiveStream());
- dir.ReadFromStream(*dirstream, IOStream::TimeOutInfinite);
-
+ BackupStoreDirectory dir(protocol.ReceiveStream());
BackupStoreDirectory::Iterator i(dir);
BackupStoreDirectory::Entry *en = 0;
int files = 0;
@@ -720,9 +711,7 @@
BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, false /* no attributes */));
TEST_THAT(dirreply->GetObjectID() == BackupProtocolListDirectory::RootDirectory);
// Stream
- BackupStoreDirectory dir;
- std::auto_ptr<IOStream> dirstream(protocol.ReceiveStream());
- dir.ReadFromStream(*dirstream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir(protocol.ReceiveStream());
TEST_THAT(dir.GetNumberOfEntries() == UPLOAD_NUM + 1 /* for the first test file */);
TEST_THAT(!dir.HasAttributes());
@@ -775,9 +764,7 @@
BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING,
BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, false /* no attributes */));
// Stream
- BackupStoreDirectory dir;
- std::auto_ptr<IOStream> dirstream(protocol.ReceiveStream());
- dir.ReadFromStream(*dirstream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir(protocol.ReceiveStream());
// Check them!
BackupStoreDirectory::Iterator i(dir);
@@ -1076,9 +1063,7 @@
BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING,
BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, false /* no attributes */));
// Stream
- BackupStoreDirectory dir;
- std::auto_ptr<IOStream> dirstream(protocol.ReceiveStream());
- dir.ReadFromStream(*dirstream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir(protocol.ReceiveStream());
TEST_THAT(dir.GetNumberOfEntries() == 1);
BackupStoreDirectory::Iterator i(dir);
BackupStoreDirectory::Entry *en = i.Next();
@@ -1585,10 +1570,9 @@
BackupProtocolListDirectory::RootDirectory,
BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING,
BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, false /* no attributes! */)); // Stream
- BackupStoreDirectory dir;
- std::auto_ptr<IOStream> dirstream(protocolReadOnly.ReceiveStream());
- dir.ReadFromStream(*dirstream, IOStream::TimeOutInfinite);
- TEST_THAT(dir.GetNumberOfEntries() == UPLOAD_NUM + 3 /* for the first test file, the patched upload, and this new dir */);
+ BackupStoreDirectory dir(protocolReadOnly.ReceiveStream());
+ TEST_EQUAL(UPLOAD_NUM + 3, dir.GetNumberOfEntries());
+ // for the first test file, the patched upload, and this new dir.
// Check the last one...
BackupStoreDirectory::Iterator i(dir);
@@ -1620,10 +1604,7 @@
BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING,
BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, true /* get attributes */));
TEST_THAT(dirreply->GetObjectID() == subdirid);
- // Stream
- BackupStoreDirectory dir;
- std::auto_ptr<IOStream> dirstream(protocolReadOnly.ReceiveStream());
- dir.ReadFromStream(*dirstream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir(protocolReadOnly.ReceiveStream());
TEST_THAT(dir.GetNumberOfEntries() == 1);
// Check the last one...
@@ -1653,9 +1634,7 @@
BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING,
BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, false /* no attributes! */));
// Stream
- BackupStoreDirectory dir;
- std::auto_ptr<IOStream> dirstream(protocolReadOnly.ReceiveStream());
- dir.ReadFromStream(*dirstream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir(protocolReadOnly.ReceiveStream());
TEST_THAT(!dir.HasAttributes());
}
@@ -1680,9 +1659,7 @@
0, // no flags
BackupProtocolListDirectory::Flags_EXCLUDE_EVERYTHING, true /* get attributes */));
// Stream
- BackupStoreDirectory dir;
- std::auto_ptr<IOStream> dirstream(protocolReadOnly.ReceiveStream());
- dir.ReadFromStream(*dirstream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir(protocolReadOnly.ReceiveStream());
TEST_THAT(dir.GetNumberOfEntries() == 0);
// Attributes
@@ -1886,9 +1863,7 @@
BackupProtocolListDirectory::Flags_Dir | BackupProtocolListDirectory::Flags_Deleted,
BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, false /* no attributes */));
// Stream
- BackupStoreDirectory dir;
- std::auto_ptr<IOStream> dirstream(protocolReadOnly.ReceiveStream());
- dir.ReadFromStream(*dirstream, IOStream::TimeOutInfinite);
+ BackupStoreDirectory dir(protocolReadOnly.ReceiveStream());
// Check there's only that one entry
TEST_THAT(dir.GetNumberOfEntries() == 1);
More information about the Boxbackup-commit
mailing list