Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2018-10-29 14:32:15 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2018-11-14 10:20:55 (GMT) |
| commit | 5758cc48f5f340132d19e79f647dd5d3ad8c54fc (patch) | |
| tree | d4c6d449344d99f333ee49b834ac76ab848b6e78 /Swiften/StreamManagement/UnitTest | |
| parent | 961a997b406cc1283f316c88bb0475e35e7cc9aa (diff) | |
| download | swift-5758cc48f5f340132d19e79f647dd5d3ad8c54fc.zip swift-5758cc48f5f340132d19e79f647dd5d3ad8c54fc.tar.bz2 | |
Fix Stanza Ack maximum and tests
The stanza ack code now uses a constexpr without numeric cast to
calculate the maximum, and test code uses the constant UINT32_MAX from
limits, both of which should result in the same number.
Test-Information:
Unit tests pass on macOS 10.14
Change-Id: Iba8fc779e52699d480d1ce458df0c6581a16ad06
Diffstat (limited to 'Swiften/StreamManagement/UnitTest')
| -rw-r--r-- | Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp | 7 | ||||
| -rw-r--r-- | Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp b/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp index ce16e1f..e0ebefd 100644 --- a/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp +++ b/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp | |||
| @@ -1,11 +1,12 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2016 Isode Limited. | 2 | * Copyright (c) 2010-2018 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <cstdint> | ||
| 8 | |||
| 7 | #include <boost/bind.hpp> | 9 | #include <boost/bind.hpp> |
| 8 | #include <boost/numeric/conversion/cast.hpp> | ||
| 9 | 10 | ||
| 10 | #include <cppunit/extensions/HelperMacros.h> | 11 | #include <cppunit/extensions/HelperMacros.h> |
| 11 | #include <cppunit/extensions/TestFactoryRegistry.h> | 12 | #include <cppunit/extensions/TestFactoryRegistry.h> |
| @@ -111,7 +112,7 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture { | |||
| 111 | // Handle stanza ack count wrapping, as per the XEP | 112 | // Handle stanza ack count wrapping, as per the XEP |
| 112 | void testHandleAckReceived_WrapAround() { | 113 | void testHandleAckReceived_WrapAround() { |
| 113 | std::shared_ptr<StanzaAckRequester> testling(createRequester()); | 114 | std::shared_ptr<StanzaAckRequester> testling(createRequester()); |
| 114 | testling->lastHandledStanzasCount = boost::numeric_cast<unsigned int>((1ULL<<32) - 1); | 115 | testling->lastHandledStanzasCount = UINT32_MAX; |
| 115 | testling->handleStanzaSent(createMessage("m1")); | 116 | testling->handleStanzaSent(createMessage("m1")); |
| 116 | testling->handleStanzaSent(createMessage("m2")); | 117 | testling->handleStanzaSent(createMessage("m2")); |
| 117 | 118 | ||
diff --git a/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp b/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp index ffdabe9..ee4b913 100644 --- a/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp +++ b/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp | |||
| @@ -1,11 +1,12 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2016 Isode Limited. | 2 | * Copyright (c) 2010-2018 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <cstdint> | ||
| 8 | |||
| 7 | #include <boost/bind.hpp> | 9 | #include <boost/bind.hpp> |
| 8 | #include <boost/numeric/conversion/cast.hpp> | ||
| 9 | 10 | ||
| 10 | #include <cppunit/extensions/HelperMacros.h> | 11 | #include <cppunit/extensions/HelperMacros.h> |
| 11 | #include <cppunit/extensions/TestFactoryRegistry.h> | 12 | #include <cppunit/extensions/TestFactoryRegistry.h> |
| @@ -63,7 +64,7 @@ class StanzaAckResponderTest : public CppUnit::TestFixture { | |||
| 63 | // Handle stanza ack count wrapping, as per the XEP | 64 | // Handle stanza ack count wrapping, as per the XEP |
| 64 | void testHandleAckRequestReceived_WrapAround() { | 65 | void testHandleAckRequestReceived_WrapAround() { |
| 65 | std::shared_ptr<StanzaAckResponder> testling(createResponder()); | 66 | std::shared_ptr<StanzaAckResponder> testling(createResponder()); |
| 66 | testling->handledStanzasCount = boost::numeric_cast<unsigned int>((1ULL<<32) - 1); | 67 | testling->handledStanzasCount = UINT32_MAX; |
| 67 | testling->handleStanzaReceived(); | 68 | testling->handleStanzaReceived(); |
| 68 | testling->handleStanzaReceived(); | 69 | testling->handleStanzaReceived(); |
| 69 | 70 | ||