Make SCP tests more robust

lamyj · Jan 3, 2016 · 7266aab · 7266aab
1 parent 5220146
commit 7266aab
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/tests/code/EchoSCP.cpp b/tests/code/EchoSCP.cpp
@@ -23,18 +23,19 @@ struct Status
 void run_server(Status * status)
 {
     dcmtkpp::Association association;
-
-    association.receive_association(boost::asio::ip::tcp::v4(), 11113);
-
-    dcmtkpp::EchoSCP echo_scp(association,
-        [status](dcmtkpp::message::CEchoRequest const &)
-        {
-            status->called = true;
-            return dcmtkpp::message::Response::Success;
-        });
+    association.set_tcp_timeout(boost::posix_time::seconds(1));
 
     try
     {
+        association.receive_association(boost::asio::ip::tcp::v4(), 11113);
+
+        dcmtkpp::EchoSCP echo_scp(association,
+            [status](dcmtkpp::message::CEchoRequest const &)
+            {
+                status->called = true;
+                return dcmtkpp::message::Response::Success;
+            });
+
         // Get echo message
         auto const message = association.receive_message();
         echo_scp(message);

diff --git a/tests/code/FindSCP.cpp b/tests/code/FindSCP.cpp
@@ -77,15 +77,16 @@ class Generator: public dcmtkpp::SCP::DataSetGenerator
 void run_server(Status * status)
 {
     dcmtkpp::Association association;
-
-    association.receive_association(boost::asio::ip::tcp::v4(), 11113);
-
-    dcmtkpp::FindSCP find_scp(association);
-    auto const generator = std::make_shared<Generator>(status);
-    find_scp.set_generator(generator);
+    association.set_tcp_timeout(boost::posix_time::seconds(1));
 
     try
     {
+        association.receive_association(boost::asio::ip::tcp::v4(), 11113);
+
+        dcmtkpp::FindSCP find_scp(association);
+        auto const generator = std::make_shared<Generator>(status);
+        find_scp.set_generator(generator);
+
         // Get echo message
         auto const message = association.receive_message();
         find_scp(message);