X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Ftesting%2FTestStep.cpp;h=9bb5230d809e8fd98d561cf2e1d512fb800718c4;hb=56fdf785afe43dc636ca4334c4ca47cf8241334d;hp=524e0bdf3841df386200d6a433a1380736a4c7a8;hpb=932990242f7b76f7c1404bdfdda6587bbe588c5f;p=anna.git

diff --git a/example/diameter/launcher/testing/TestStep.cpp b/example/diameter/launcher/testing/TestStep.cpp
index 524e0bd..9bb5230 100644
--- a/example/diameter/launcher/testing/TestStep.cpp
+++ b/example/diameter/launcher/testing/TestStep.cpp
@@ -33,7 +33,7 @@
 #include <anna/diameter/helpers/base/functions.hpp>
 
 // Process
-#include <RealmNode.hpp>
+#include <OriginHost.hpp>
 #include <MyDiameterEntity.hpp>
 #include <MyLocalServer.hpp>
 #include <TestStep.hpp>
@@ -177,10 +177,11 @@ void TestStep::initialize(TestCase *testCase) {
   a_number = testCase->steps() + 1; // testCase is not NULL
 }
 
-bool TestStep::decodeMessage() throw() {
+bool TestStep::decodeMessage(bool trust) throw() {
   if (a_messageCodec) return true;
   a_messageCodec = new anna::diameter::codec::Message;
   if (::decodeMessage(a_message, *a_messageCodec)) return true;
+  if (trust) return true;
 
   delete a_messageCodec;
   a_messageCodec = NULL;
@@ -334,6 +335,9 @@ throw() {
     xmlmsg += a_messageCodec->asXMLString();
     xmlmsg += "\n";
   }
+  else {
+    xmlmsg = "<unable to decode, check traces>"; 
+  }
 
   if (msg != "") result->createAttribute("Message", msg);
   if (xmlmsg != "") result->createAttribute("XMLMessage", xmlmsg);
@@ -347,12 +351,12 @@ throw() {
 bool TestStepSendxml::do_execute() throw() {
   bool success = false;
   std::string failReason, s_warn;
-  MyDiameterEntity *entity = a_realmNode->getEntity(); // by default
-  MyLocalServer *localServer = a_realmNode->getDiameterServer(); // by default
+  MyDiameterEntity *entity = a_originHost->getEntity(); // by default
+  MyLocalServer *localServer = a_originHost->getDiameterServer(); // by default
   const TestStepWait *tsw = NULL;
 
   // Create comm message:
-  anna::diameter::comm::Message *msg = a_realmNode->createCommMessage();
+  anna::diameter::comm::Message *msg = a_originHost->createCommMessage();
   //msg->clearBody();
   msg->setBody(a_message);
 
@@ -409,10 +413,10 @@ bool TestStepSendxml::do_execute() throw() {
       } // else (normal sending)
 
       // Detailed log:
-      if(a_realmNode->logEnabled()) {
-        if (decodeMessage()) {
+      if(a_originHost->logEnabled()) {
+        if (decodeMessage(true /* trust */)) {
           std::string detail = usedClientSession ? usedClientSession->asString() : "<null client session>"; // shouldn't happen
-          a_realmNode->writeLogFile(*a_messageCodec, (success ? "sent2e" : "send2eError"), detail);
+          a_originHost->writeLogFile(*a_messageCodec, (success ? "sent2e" : "send2eError"), detail);
         }
       }
     }
@@ -443,10 +447,10 @@ bool TestStepSendxml::do_execute() throw() {
       } // else (normal sending)
 
       // Detailed log:
-      if(a_realmNode->logEnabled()) {
-        if (decodeMessage()) {
+      if(a_originHost->logEnabled()) {
+        if (decodeMessage(true /* trust */)) {
           std::string detail = usedServerSession ? usedServerSession->asString() : "<null server session>"; // shouldn't happen
-          a_realmNode->writeLogFile(*a_messageCodec, (success ? "sent2c" : "send2cError"), detail);
+          a_originHost->writeLogFile(*a_messageCodec, (success ? "sent2c" : "send2cError"), detail);
         }
       }
     }
@@ -456,7 +460,7 @@ bool TestStepSendxml::do_execute() throw() {
   }
 
   // release msg
-  a_realmNode->releaseCommMessage(msg);
+  a_originHost->releaseCommMessage(msg);
 
   if (!success) {
     a_testCase->addDebugSummaryHint(failReason); // before report (when set Failed state);
@@ -570,6 +574,9 @@ throw() {
     xmlmsg += a_messageCodec->asXMLString();
     xmlmsg += "\n";
   }
+  else {
+    xmlmsg = "<unable to decode, check traces>"; 
+  }
 
   if (msg != "") result->createAttribute("MatchedMessage", msg);
   if (xmlmsg != "") result->createAttribute("MatchedXMLMessage", xmlmsg);