Merge pull request #377 from jwillemsen/jwi-stringtestext

Use a IDL constant string to test also the string generation
RemedyIT · Apr 12, 2024 · 35f163c · 35f163c
2 parents e4f5115 + 03d3d85
commit 35f163c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/tests/string/client.cpp b/tests/string/client.cpp
@@ -52,13 +52,13 @@ main(int argc, char* argv[])
     {
       TAOX11_TEST_DEBUG << "Test string type." << std::endl;
       std::string getText = hello->get_string ();
-      if (getText != "Hello there!")
+      if (getText != test_string)
       {
         TAOX11_TEST_ERROR << "ERROR: hello->get_string() returned an unexpected value. "
-          << "expected <Hello there!>, received <" << getText << ">" << std::endl;
+          << "expected <" << test_string << ">, received <" << getText << ">" << std::endl;
         ++result;
       }
-      hello->set_string ("Hello there!");
+      hello->set_string (test_string);
     }
 
     {
@@ -75,7 +75,7 @@ main(int argc, char* argv[])
 
     {
       TAOX11_TEST_DEBUG << "Test string type inout parameter." << std::endl;
-      std::string inoutText = "Hello there!";
+      std::string inoutText = test_string;
       hello->inout_string (inoutText);
       if (inoutText != "I hear you!")
       {

diff --git a/tests/string/hello.cpp b/tests/string/hello.cpp
@@ -20,16 +20,16 @@ Hello::Hello (IDL::traits<CORBA::ORB>::ref_type orb, int& result)
 std::string
 Hello::get_string ()
 {
-  return "Hello there!";
+  return test_string;
 }
 
 void
 Hello::set_string (const std::string& text)
 {
-  if (text != "Hello there!")
+  if (text != test_string)
   {
     TAOX11_TEST_ERROR << "ERROR: Hello::set_string received an unexpected value. "
-      << "expected <Hello there!>, received <" << text <<">" << std::endl;
+      << "expected <" << test_string << ">, received <" << text <<">" << std::endl;
     ++this->result_;
   }
 }
@@ -43,10 +43,10 @@ Hello::out_string (std::string& text)
 void
 Hello::inout_string (std::string& text)
 {
-  if (text != "Hello there!")
+  if (text != test_string)
   {
     TAOX11_TEST_ERROR << "ERROR: Hello::inout_string received an unexpected value. "
-      << "expected <Hello there!>, received <" << text << ">" << std::endl;
+      << "expected <" << test_string << "!>, received <" << text << ">" << std::endl;
     ++this->result_;
   }
   text = "I hear you!";

diff --git a/tests/string/test.idl b/tests/string/test.idl
@@ -8,6 +8,7 @@
 #include "orb.idl"
 
 const string name = "testing";
+const string test_string = "Hello there!";
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test