rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed unit tests, changed modes to cfb (other modes have been removed).

This commit is contained in:
Nick Bolton 2013-08-30 15:20:36 +00:00
parent c459cd80d3
commit 024f66e25e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/unittests/server/CClientProxyTests.cpp
View File

@ -43,7 +43,7 @@ TEST(CClientProxyTests, cryptoIvWrite)
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
NiceMock<CMockStream> innerStream; NiceMock<CMockStream> innerStream;
NiceMock<CMockServer> server; NiceMock<CMockServer> server;
CCryptoOptions options("ctr", "mock"); CCryptoOptions options("cfb", "mock");
IStreamEvents streamEvents; IStreamEvents streamEvents;
streamEvents.setEvents(&eventQueue); streamEvents.setEvents(&eventQueue);

12
src/test/unittests/synergy/CCryptoStreamTests.cpp
View File

@ -70,7 +70,7 @@ TEST(CCryptoStreamTests, write)
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
NiceMock<CMockStream> innerStream; NiceMock<CMockStream> innerStream;
CCryptoOptions options("ctr", "mock"); CCryptoOptions options("cfb", "mock");
ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(write_mockWrite)); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(write_mockWrite));
@ -88,7 +88,7 @@ TEST(CCryptoStreamTests, read)
{ {
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
NiceMock<CMockStream> innerStream; NiceMock<CMockStream> innerStream;
CCryptoOptions options("ctr", "mock"); CCryptoOptions options("cfb", "mock");
ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(read_mockRead)); ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(read_mockRead));
@ -117,7 +117,7 @@ TEST(CCryptoStreamTests, write4Read1)
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
NiceMock<CMockStream> innerStream; NiceMock<CMockStream> innerStream;
CCryptoOptions options("ctr", "mock"); CCryptoOptions options("cfb", "mock");
ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(write4Read1_mockWrite)); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(write4Read1_mockWrite));
ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(write4Read1_mockRead)); ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(write4Read1_mockRead));
@ -148,7 +148,7 @@ TEST(CCryptoStreamTests, write1Read4)
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
NiceMock<CMockStream> innerStream; NiceMock<CMockStream> innerStream;
CCryptoOptions options("ctr", "mock"); CCryptoOptions options("cfb", "mock");
ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(write1Read4_mockWrite)); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(write1Read4_mockWrite));
ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(write1Read4_mockRead)); ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(write1Read4_mockRead));
@ -185,7 +185,7 @@ TEST(CCryptoStreamTests, readWriteIvChanged)
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
NiceMock<CMockStream> innerStream; NiceMock<CMockStream> innerStream;
CCryptoOptions options("ctr", "mock"); CCryptoOptions options("cfb", "mock");
ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockWrite)); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockWrite));
ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockRead)); ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockRead));
@ -257,7 +257,7 @@ TEST(CCryptoStreamTests, newIvDoesNotChangeIv)
{ {
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
NiceMock<CMockStream> innerStream; NiceMock<CMockStream> innerStream;
CCryptoOptions options("ctr", "mock"); CCryptoOptions options("cfb", "mock");
ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(newIvDoesNotChangeIv_mockWrite)); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(newIvDoesNotChangeIv_mockWrite));