Merge pull request #86 from BITERP/SB-65

SB-65 исправил работу метода BasicConsumeMessage при запуске компонен…
BITERP · Nov 17, 2022 · 745556d · 745556d
2 parents 77a2dbc + 6acc5cd
commit 745556d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
 
       - name: Test
         working-directory: ${{matrix.buildDir}}
-        run: ctest .
+        run: ctest . -V
 
       - name: Rename Library
         if: matrix.sourceLinuxLibrary != ''

diff --git a/linux/common.cpp b/linux/common.cpp
@@ -175,7 +175,7 @@ u16string receiveUntil(Connection& conn, u16string qname, u16string msg, long* m
         ret = conn.retString(&args[1]);
         if (ret == msg) {
             if (msgTag) {
-                *msgTag = static_cast<long>(args[2].dblVal);
+                *msgTag = static_cast<long>(args[2].lVal);
             }
             return ret;
         }

diff --git a/linux/tests.cpp b/linux/tests.cpp
@@ -146,8 +146,8 @@ CTEST(BasicConsumeNoMessage) {
     ASSERT(ret.vt == VTYPE_BOOL);
     ASSERT(!ret.bVal);
     ASSERT(args[1].vt == VTYPE_EMPTY);
-    ASSERT(args[2].vt == VTYPE_R8);
-    ASSERT(args[2].dblVal == 0);
+    ASSERT(args[2].vt == VTYPE_I4);
+    ASSERT(args[2].lVal == 0);
 }
 
 CTEST(BasicCancel) {

diff --git a/src/RabbitMQClient.cpp b/src/RabbitMQClient.cpp
@@ -322,7 +322,7 @@ void RabbitMQClient::basicConsumeMessageImpl(Biterp::CallContext& ctx) {
 	tVariant* outMessageTag = ctx.skipParam();
 	int timeout = ctx.intParam();
 	ctx.setEmptyResult(outdata);
-	ctx.setLongResult(0, outMessageTag);
+	ctx.setIntResult(0, outMessageTag);
 	{
 		unique_lock<mutex> lock(_mutex);
 		if (!cvDataArrived.wait_for(lock, chrono::milliseconds(timeout), [&] { return !messageQueue.empty(); })) {
@@ -338,7 +338,7 @@ void RabbitMQClient::basicConsumeMessageImpl(Biterp::CallContext& ctx) {
 		messageQueue.pop();
 	}
 	ctx.setStringResult(u16Converter.from_bytes(lastMessage.body), outdata);
-	ctx.setLongResult(lastMessage.messageTag, outMessageTag);
+	ctx.setIntResult(lastMessage.messageTag, outMessageTag); 
 	ctx.setBoolResult(true);
 	inConsume = false;
 }

diff --git a/windows/tests/common.cpp b/windows/tests/common.cpp
@@ -181,7 +181,7 @@ u16string receiveUntil(Addin& conn, u16string qname, u16string msg, long* msgTag
         ret = conn.retString(&args[1]);
         if (ret == msg) {
             if (msgTag) {
-                *msgTag = static_cast<long>(args[2].dblVal);
+                *msgTag = static_cast<long>(args[2].lVal);
             }
             return ret;
         }

diff --git a/windows/tests/tests.cpp b/windows/tests/tests.cpp
@@ -157,8 +157,8 @@ namespace tests
             Assert::IsTrue(ret.vt == VTYPE_BOOL);
             Assert::IsTrue(!ret.bVal);
             Assert::IsTrue(args[1].vt == VTYPE_EMPTY);
-            Assert::IsTrue(args[2].vt == VTYPE_R8);
-            Assert::IsTrue(args[2].dblVal == 0);
+            Assert::IsTrue(args[2].vt == VTYPE_I4);
+            Assert::IsTrue(args[2].lVal == 0);
         }
 
         TEST_METHOD(BasicCancel) {