Add some test helper _OR macros to execute commands when conditions fail.

This is useful to return from a test if an assertion/check fails, instead of
throwing an exception.

Also add logging of the actual error code received (with name) to
TEST_COMMAND_RETURNS_ERROR(_OR).

1 files changed, 27 insertions, 4 deletions

diff --git a/lib/backupstore/StoreTestUtils.h b/lib/backupstore/StoreTestUtils.h
index f65ae3df..39013422 100644
--- a/lib/backupstore/StoreTestUtils.h
+++ b/lib/backupstore/StoreTestUtils.h
@@ -10,6 +10,8 @@
 #ifndef STORETESTUTILS__H
 #define STORETESTUTILS__H
 
+#include "Test.h"
+
 class BackupProtocolCallable;
 class BackupProtocolClient;
 class SocketStreamTLS;
@@ -78,10 +80,31 @@ bool create_account(int soft, int hard);
 //! Deletes the standard test account, for testing behaviour with no account.
 bool delete_account();
 
-#define TEST_COMMAND_RETURNS_ERROR(command, error) \
-	TEST_CHECK_THROWS(command, ConnectionException, \
-		Conn_Protocol_UnexpectedReply); \
-	TEST_EQUAL(BackupProtocolError::error, protocol.GetLastErrorType());
+#define TEST_COMMAND_RETURNS_ERROR_OR(protocol, command, error, or_statements) \
+	{ \
+		TEST_CHECK_THROWS_OR(protocol . command, ConnectionException, \
+			Conn_Protocol_UnexpectedReply, or_statements); \
+		int type, subtype; \
+		protocol.GetLastError(type, subtype); \
+		if (type == BackupProtocolError::ErrorType) \
+		{ \
+			TEST_EQUAL_LINE(BackupProtocolError::error, subtype, \
+				"command returned error: " << \
+				BackupProtocolError::GetMessage(subtype)); \
+			if (subtype != BackupProtocolError::error) \
+			{ \
+				or_statements; \
+			} \
+		} \
+		else \
+		{ \
+			TEST_FAIL_WITH_MESSAGE("command returned success"); \
+			or_statements; \
+		} \
+	} 
+
+#define TEST_COMMAND_RETURNS_ERROR(protocol, command, error) \
+	TEST_COMMAND_RETURNS_ERROR_OR(protocol, command, error,)
 
 #endif // STORETESTUTILS__H