Changeset 2983 for box/trunk/test/backupstorepatch

Timestamp:

27/08/2011 15:06:46 (9 months ago)

Author:

chris

Message:

Combine client and server protocols to make way for an offline/local protocol.

Rename ProtocolObject? to Message.

File:

• box/trunk/test/backupstorepatch/testbackupstorepatch.cpp (modified) (10 diffs)

box/trunk/test/backupstorepatch/testbackupstorepatch.cpp

@@ -14 +14 @@
 #include <signal.h>
 
-#include "autogen_BackupProtocolClient.h"
+#include "autogen_BackupProtocol.h"
 #include "BackupClientCryptoKeys.h"
 #include "BackupClientFileAttributes.h"
@@ -355 +355 @@
                         {
                                 // Check the version
-                                std::auto_ptr<BackupProtocolClientVersion> serverVersion(protocol.QueryVersion(BACKUP_STORE_SERVER_VERSION));
+                                std::auto_ptr<BackupProtocolVersion> serverVersion(protocol.QueryVersion(BACKUP_STORE_SERVER_VERSION));
                                 TEST_THAT(serverVersion->GetVersion() == BACKUP_STORE_SERVER_VERSION);
         
@@ -368 +368 @@
                         {
                                 std::auto_ptr<IOStream> upload(BackupStoreFile::EncodeFile("testfiles/0.test",
-                                                BackupProtocolClientListDirectory::RootDirectory, storeFilename));
-                                std::auto_ptr<BackupProtocolClientSuccess> stored(protocol.QueryStoreFile(
-                                                BackupProtocolClientListDirectory::RootDirectory, ModificationTime,
+                                                BackupProtocolListDirectory::RootDirectory, storeFilename));
+                                std::auto_ptr<BackupProtocolSuccess> stored(protocol.QueryStoreFile(
+                                                BackupProtocolListDirectory::RootDirectory, ModificationTime,
                                                 ModificationTime, 0 /* no diff from file ID */, storeFilename, *upload));
                                 test_files[0].IDOnServer = stored->GetObjectID();
@@ -381 +381 @@
                         {
                                 // Get an index for the previous version
-                                std::auto_ptr<BackupProtocolClientSuccess> getBlockIndex(protocol.QueryGetBlockIndexByName(
-                                                BackupProtocolClientListDirectory::RootDirectory, storeFilename));
+                                std::auto_ptr<BackupProtocolSuccess> getBlockIndex(protocol.QueryGetBlockIndexByName(
+                                                BackupProtocolListDirectory::RootDirectory, storeFilename));
                                 int64_t diffFromID = getBlockIndex->GetObjectID();
                                 TEST_THAT(diffFromID != 0);
@@ -398 +398 @@
                                                 BackupStoreFile::EncodeFileDiff(
                                                         filename,
-                                                        BackupProtocolClientListDirectory::RootDirectory,       /* containing directory */
+                                                        BackupProtocolListDirectory::RootDirectory,     /* containing directory */
                                                         storeFilename, 
                                                         diffFromID, 
@@ -408 +408 @@
                 
                                         // Upload the patch to the store
-                                        std::auto_ptr<BackupProtocolClientSuccess> stored(protocol.QueryStoreFile(
-                                                        BackupProtocolClientListDirectory::RootDirectory, ModificationTime,
+                                        std::auto_ptr<BackupProtocolSuccess> stored(protocol.QueryStoreFile(
+                                                        BackupProtocolListDirectory::RootDirectory, ModificationTime,
                                                         ModificationTime, isCompletelyDifferent?(0):(diffFromID), storeFilename, *patchStream));
                                         ModificationTime += MODIFICATION_TIME_INC;
@@ -433 +433 @@
                         // List the directory from the server, and check that no dependency info is sent -- waste of bytes
                         {
-                                std::auto_ptr<BackupProtocolClientSuccess> dirreply(protocol.QueryListDirectory(
-                                                BackupProtocolClientListDirectory::RootDirectory,
-                                                BackupProtocolClientListDirectory::Flags_INCLUDE_EVERYTHING,
-                                                BackupProtocolClientListDirectory::Flags_EXCLUDE_NOTHING, false /* no attributes */));
+                                std::auto_ptr<BackupProtocolSuccess> dirreply(protocol.QueryListDirectory(
+                                                BackupProtocolListDirectory::RootDirectory,
+                                                BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING,
+                                                BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, false /* no attributes */));
                                 // Stream
                                 BackupStoreDirectory dir;
@@ -532 +532 @@
                         BackupProtocolClient protocol(conn);
                         {
-                                std::auto_ptr<BackupProtocolClientVersion> serverVersion(protocol.QueryVersion(BACKUP_STORE_SERVER_VERSION));
+                                std::auto_ptr<BackupProtocolVersion> serverVersion(protocol.QueryVersion(BACKUP_STORE_SERVER_VERSION));
                                 TEST_THAT(serverVersion->GetVersion() == BACKUP_STORE_SERVER_VERSION);
                                 protocol.QueryLogin(0x01234567, 0);
@@ -556 +556 @@
                                 // Fetch the file
                                 {
-                                        std::auto_ptr<BackupProtocolClientSuccess> getobj(protocol.QueryGetFile(
-                                                BackupProtocolClientListDirectory::RootDirectory,
+                                        std::auto_ptr<BackupProtocolSuccess> getobj(protocol.QueryGetFile(
+                                                BackupProtocolListDirectory::RootDirectory,
                                                 test_files[f].IDOnServer));
                                         TEST_THAT(getobj->GetObjectID() == test_files[f].IDOnServer);
@@ -573 +573 @@
                                 // Download the index, and check it looks OK
                                 {
-                                        std::auto_ptr<BackupProtocolClientSuccess> getblockindex(protocol.QueryGetBlockIndexByID(test_files[f].IDOnServer));
+                                        std::auto_ptr<BackupProtocolSuccess> getblockindex(protocol.QueryGetBlockIndexByID(test_files[f].IDOnServer));
                                         TEST_THAT(getblockindex->GetObjectID() == test_files[f].IDOnServer);
                                         std::auto_ptr<IOStream> blockIndexStream(protocol.ReceiveStream());