diff options
| author | Alan Conway <aconway@apache.org> | 2007-04-03 22:27:10 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-04-03 22:27:10 +0000 |
| commit | c378f175f08edf5d7e72e99dd604a1ba8c8e7167 (patch) | |
| tree | 73afaf55397f8719c24ef3f1d489392a822aade3 /qpid/cpp/src | |
| parent | 820c6f73cecb054fa422f34a0fd98a42b545e5a1 (diff) | |
| download | qpid-python-c378f175f08edf5d7e72e99dd604a1ba8c8e7167.tar.gz | |
* tests/FramingTest.cpp: Fixed integer types to build on 64 bit architectures
* tests/test_env: added missing executable property.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@525310 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/tests/FramingTest.cpp | 30 | ||||
| -rwxr-xr-x[-rw-r--r--] | qpid/cpp/src/tests/test_env | 0 |
2 files changed, 15 insertions, 15 deletions
diff --git a/qpid/cpp/src/tests/FramingTest.cpp b/qpid/cpp/src/tests/FramingTest.cpp index 89a559d0bb..954c378c37 100644 --- a/qpid/cpp/src/tests/FramingTest.cpp +++ b/qpid/cpp/src/tests/FramingTest.cpp @@ -249,12 +249,12 @@ class FramingTest : public CppUnit::TestCase AMQResponseBody::Data p; r.sending(q); - CPPUNIT_ASSERT_EQUAL(1ULL, q.requestId); - CPPUNIT_ASSERT_EQUAL(0ULL, q.responseMark); + CPPUNIT_ASSERT_EQUAL(RequestId(1), q.requestId); + CPPUNIT_ASSERT_EQUAL(ResponseId(0), q.responseMark); r.sending(q); - CPPUNIT_ASSERT_EQUAL(2ULL, q.requestId); - CPPUNIT_ASSERT_EQUAL(0ULL, q.responseMark); + CPPUNIT_ASSERT_EQUAL(RequestId(2), q.requestId); + CPPUNIT_ASSERT_EQUAL(ResponseId(0), q.responseMark); // Now process a response p.responseId = 1; @@ -262,8 +262,8 @@ class FramingTest : public CppUnit::TestCase r.processed(AMQResponseBody::Data(1, 2)); r.sending(q); - CPPUNIT_ASSERT_EQUAL(3ULL, q.requestId); - CPPUNIT_ASSERT_EQUAL(1ULL, q.responseMark); + CPPUNIT_ASSERT_EQUAL(RequestId(3), q.requestId); + CPPUNIT_ASSERT_EQUAL(ResponseId(1), q.responseMark); try { r.processed(p); // Already processed this response. @@ -284,16 +284,16 @@ class FramingTest : public CppUnit::TestCase p.batchOffset = 2; r.processed(p); r.sending(q); - CPPUNIT_ASSERT_EQUAL(7ULL, q.requestId); - CPPUNIT_ASSERT_EQUAL(2ULL, q.responseMark); + CPPUNIT_ASSERT_EQUAL(RequestId(7), q.requestId); + CPPUNIT_ASSERT_EQUAL(ResponseId(2), q.responseMark); p.responseId++; p.requestId = 1; // Out of order p.batchOffset = 0; r.processed(p); r.sending(q); - CPPUNIT_ASSERT_EQUAL(8ULL, q.requestId); - CPPUNIT_ASSERT_EQUAL(3ULL, q.responseMark); + CPPUNIT_ASSERT_EQUAL(RequestId(8), q.requestId); + CPPUNIT_ASSERT_EQUAL(ResponseId(3), q.responseMark); } void testResponder() { @@ -306,18 +306,18 @@ class FramingTest : public CppUnit::TestCase r.received(q); p.requestId = q.requestId; r.sending(p); - CPPUNIT_ASSERT_EQUAL(1ULL, p.responseId); - CPPUNIT_ASSERT_EQUAL(1ULL, p.requestId); + CPPUNIT_ASSERT_EQUAL(ResponseId(1), p.responseId); + CPPUNIT_ASSERT_EQUAL(RequestId(1), p.requestId); CPPUNIT_ASSERT_EQUAL(0U, p.batchOffset); - CPPUNIT_ASSERT_EQUAL(0ULL, r.getResponseMark()); + CPPUNIT_ASSERT_EQUAL(ResponseId(0), r.getResponseMark()); q.requestId++; q.responseMark = 1; r.received(q); r.sending(p); - CPPUNIT_ASSERT_EQUAL(2ULL, p.responseId); + CPPUNIT_ASSERT_EQUAL(ResponseId(2), p.responseId); CPPUNIT_ASSERT_EQUAL(0U, p.batchOffset); - CPPUNIT_ASSERT_EQUAL(1ULL, r.getResponseMark()); + CPPUNIT_ASSERT_EQUAL(ResponseId(1), r.getResponseMark()); try { // Response mark higher any request ID sent. diff --git a/qpid/cpp/src/tests/test_env b/qpid/cpp/src/tests/test_env index fdfc5f0369..fdfc5f0369 100644..100755 --- a/qpid/cpp/src/tests/test_env +++ b/qpid/cpp/src/tests/test_env |