Merge branch 'dailies_tests' of https://github.com/GMLC-TDC/HELICS in…

…to dailies_tests
GMLC-TDC · Oct 16, 2024 · e3151ca · e3151ca
2 parents 83bbfbb + e95d521
commit e3151ca
Show file tree

Hide file tree

Showing 38 changed files with 58 additions and 61 deletions.
diff --git a/src/helics/shared_api_library/ValueFederateExport.cpp b/src/helics/shared_api_library/ValueFederateExport.cpp
@@ -15,9 +15,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <map>
 #include <memory>
 #include <mutex>
-#include <vector>
 #include <string>
 #include <utility>
+#include <vector>
 
 /** random integer for validation purposes of inputs */
 static constexpr int InputValidationIdentifier = 0x3456'E052;

diff --git a/src/helics/shared_api_library/helicsExport.cpp b/src/helics/shared_api_library/helicsExport.cpp
@@ -21,10 +21,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <iostream>
 #include <memory>
 #include <mutex>
+#include <string>
 #include <thread>
-#include <vector>
 #include <utility>
-#include <string>
+#include <vector>
 
 #ifdef HELICS_ENABLE_ZMQ_CORE
 #    include "../network/zmq/ZmqContextManager.h"

diff --git a/tests/helics/application_api/CallbackFederateTests.cpp b/tests/helics/application_api/CallbackFederateTests.cpp
@@ -19,8 +19,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <gtest/gtest.h>
 #include <stdexcept>
 #include <string>
-#include <vector>
 #include <utility>
+#include <vector>
 #include <memory>
 
 class callbackFed: public ::testing::Test, public FederateTestFixture {};

diff --git a/tests/helics/application_api/EndpointLinkingTests.cpp b/tests/helics/application_api/EndpointLinkingTests.cpp
@@ -23,8 +23,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <future>
 #include <iostream>
 #include <numeric>
-#include <thread>
 #include <string>
+#include <thread>
 #include <vector>
 
 /** these test cases test out the message federates

diff --git a/tests/helics/application_api/FederateTests.cpp b/tests/helics/application_api/FederateTests.cpp
@@ -20,8 +20,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gmock/gmock.h"
 #include <future>
 #include <gtest/gtest.h>
-#include <thread>
 #include <string>
+#include <thread>
 #include <memory>
 
 /** these test cases test out the value converters

diff --git a/tests/helics/application_api/FilterAdditionalTests.cpp b/tests/helics/application_api/FilterAdditionalTests.cpp
@@ -14,9 +14,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <future>
 #include <gtest/gtest.h>
 #include <helics/core/Broker.hpp>
-#include <thread>
-#include <string>
 #include <memory>
+#include <string>
+#include <thread>
 
 /** these test cases test out the message federates
  */

diff --git a/tests/helics/application_api/FilterTests.cpp b/tests/helics/application_api/FilterTests.cpp
@@ -19,13 +19,13 @@ SPDX-License-Identifier: BSD-3-Clause
 #else
 #    include "testFixtures_shared.hpp"
 #endif
+#include <cstdio>
 #include <future>
 #include <gtest/gtest.h>
+#include <string>
 #include <thread>
 #include <utility>
 #include <vector>
-#include <cstdio>
-#include <string>
 #include <memory>
 
 /** these test cases test out the message federates

diff --git a/tests/helics/application_api/GrantTimeoutTests.cpp b/tests/helics/application_api/GrantTimeoutTests.cpp
@@ -17,11 +17,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <future>
 #include <gmlc/libguarded/guarded.hpp>
 #include <gtest/gtest.h>
-#include <thread>
-#include <string>
 #include <iostream>
 #include <memory>
-
+#include <string>
+#include <thread>
 
 /** these test cases test out user-directed logging functionality
  */

diff --git a/tests/helics/application_api/LoggingTests.cpp b/tests/helics/application_api/LoggingTests.cpp
@@ -18,10 +18,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <future>
 #include <gmlc/libguarded/guarded.hpp>
 #include <gtest/gtest.h>
-#include <thread>
-#include <string>
 #include <iostream>
 #include <memory>
+#include <string>
+#include <thread>
 
 /** these test cases test out user-directed logging functionality
  */

diff --git a/tests/helics/application_api/MessageFederateAdditionalTests.cpp b/tests/helics/application_api/MessageFederateAdditionalTests.cpp
@@ -17,9 +17,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <iostream>
-#include <thread>
-#include <vector>
 #include <string>
+#include <thread>
 #include <utility>
 #include <vector>
 #include <memory>

diff --git a/tests/helics/application_api/MessageFederateKeyTests.cpp b/tests/helics/application_api/MessageFederateKeyTests.cpp
@@ -21,9 +21,9 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <future>
 #include <iostream>
-#include <thread>
-#include <string>
 #include <memory>
+#include <string>
+#include <thread>
 
 /** these test cases test out the message federates
  */

diff --git a/tests/helics/application_api/MultiInputTests.cpp b/tests/helics/application_api/MultiInputTests.cpp
@@ -14,8 +14,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/core/helics_definitions.hpp"
 
 #include <future>
-#include <string>
 #include <gtest/gtest.h>
+#include <string>
 #ifndef HELICS_SHARED_LIBRARY
 #    include "testFixtures.hpp"
 #else

diff --git a/tests/helics/core/ActionMessage-tests.cpp b/tests/helics/core/ActionMessage-tests.cpp
@@ -9,10 +9,10 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include "gtest/gtest.h"
 #include <cstdio>
-#include <set>
-#include <utility>
 #include <memory>
+#include <set>
 #include <string>
+#include <utility>
 
 using namespace helics;
 

diff --git a/tests/helics/core/CoreFactory-tests.cpp b/tests/helics/core/CoreFactory-tests.cpp
@@ -13,8 +13,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/network/loadCores.hpp"
 
 #include "gtest/gtest.h"
-#include <thread>
 #include <string>
+#include <thread>
 
 static const bool loaded = helics::loadCores();
 

diff --git a/tests/helics/core/MessageTimerTests.cpp b/tests/helics/core/MessageTimerTests.cpp
@@ -8,10 +8,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/core/MessageTimer.hpp"
 
 #include "gtest/gtest.h"
-#include <thread>
 #include <iostream>
-#include <utility>
 #include <memory>
+#include <thread>
+#include <utility>
 
 using namespace helics;
 

diff --git a/tests/helics/network/IPCcore_tests.cpp b/tests/helics/network/IPCcore_tests.cpp
@@ -19,9 +19,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <boost/interprocess/ipc/message_queue.hpp>
 #include <future>
 #include <gtest/gtest.h>
-#include <thread>
 #include <iostream>
 #include <string>
+#include <thread>
 
 using namespace std::literals::chrono_literals;
 

diff --git a/tests/helics/network/InprocCore-Tests.cpp b/tests/helics/network/InprocCore-Tests.cpp
@@ -13,7 +13,6 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/core/inproc/InprocCore.h"
 
 #include "gtest/gtest.h"
-
 #include <memory>
 #include <string>
 

diff --git a/tests/helics/network/TcpCore-tests.cpp b/tests/helics/network/TcpCore-tests.cpp
@@ -18,13 +18,13 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/network/tcp/TcpCore.h"
 
 #include "gtest/gtest.h"
+#include <algorithm>
 #include <future>
 #include <numeric>
-#include <thread>
 #include <string>
-#include <vector>
-#include <algorithm>
+#include <thread>
 #include <utility>
+#include <vector>
 
 using namespace std::literals::chrono_literals;
 

diff --git a/tests/helics/network/TcpSSCore-tests.cpp b/tests/helics/network/TcpSSCore-tests.cpp
@@ -18,12 +18,12 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/network/tcp/TcpCore.h"
 
 #include "gtest/gtest.h"
+#include <algorithm>
 #include <future>
 #include <numeric>
+#include <string>
 #include <thread>
 #include <vector>
-#include <algorithm>
-#include <string>
 
 using namespace std::literals::chrono_literals;
 

diff --git a/tests/helics/network/UdpCore-tests.cpp b/tests/helics/network/UdpCore-tests.cpp
@@ -18,8 +18,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gtest/gtest.h"
 #include <asio/ip/udp.hpp>
 #include <future>
-#include <thread>
 #include <string>
+#include <thread>
 #include <utility>
 #include <vector>
 

diff --git a/tests/helics/network/ZeromqCore-tests.cpp b/tests/helics/network/ZeromqCore-tests.cpp
@@ -21,8 +21,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gtest/gtest.h"
 #include <future>
 #include <iostream>
-#include <thread>
 #include <string>
+#include <thread>
 
 using namespace std::literals::chrono_literals;
 

diff --git a/tests/helics/network/ZeromqSSCore-tests.cpp b/tests/helics/network/ZeromqSSCore-tests.cpp
@@ -21,9 +21,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gtest/gtest.h"
 #include <future>
 #include <iostream>
+#include <string>
 #include <thread>
 #include <vector>
-#include <string>
 
 using namespace std::literals::chrono_literals;
 

diff --git a/tests/helics/sequencing_tests/Sequencing1.cpp b/tests/helics/sequencing_tests/Sequencing1.cpp
@@ -14,12 +14,12 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/core/Core.hpp"
 #include "sequencingHelpers.hpp"
 
+#include <cstdio>
 #include <future>
 #include <gtest/gtest.h>
 #include <iostream>
-#include <thread>
 #include <memory>
-#include <cstdio>
+#include <thread>
 #include <vector>
 
 /** these test cases test out the message federates

diff --git a/tests/helics/shared_library/CallbackFederateTests.cpp b/tests/helics/shared_library/CallbackFederateTests.cpp
@@ -12,9 +12,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <future>
 #include <gtest/gtest.h>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <utility>
-#include <memory>
 
 struct callback_federate_tests: public FederateTestFixture, public ::testing::Test {};
 

diff --git a/tests/helics/shared_library/FilterTests.cpp b/tests/helics/shared_library/FilterTests.cpp
@@ -8,11 +8,11 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "ctestFixtures.hpp"
 #include "helics/helics.h"
 
+#include <cstdio>
 #include <future>
 #include <gtest/gtest.h>
-#include <thread>
 #include <string>
-#include <cstdio>
+#include <thread>
 /** these test cases test out the message federates
  */
 

diff --git a/tests/helics/shared_library/loggingTests.cpp b/tests/helics/shared_library/loggingTests.cpp
@@ -10,8 +10,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <complex>
 #include <filesystem>
 #include <gtest/gtest.h>
-#include <thread>
 #include <string>
+#include <thread>
 /** these test cases test out the value converters
  */
 #include "ctestFixtures.hpp"

diff --git a/tests/helics/shared_library/miscApiTests.cpp b/tests/helics/shared_library/miscApiTests.cpp
@@ -9,9 +9,9 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <complex>
 #include <gtest/gtest.h>
+#include <string>
 #include <thread>
 #include <vector>
-#include <string>
 // misc test copying some of the JAVA/Python tests
 
 #ifdef HELICS_ENABLE_ZMQ_CORE

diff --git a/tests/helics/shared_library/test-message-federate.cpp b/tests/helics/shared_library/test-message-federate.cpp
@@ -10,8 +10,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <future>
 #include <gtest/gtest.h>
 #include <iostream>
-#include <thread>
 #include <string>
+#include <thread>
 
 // these test cases test out the message federates
 

diff --git a/tests/helics/shared_library/test-message-federate_cpp.cpp b/tests/helics/shared_library/test-message-federate_cpp.cpp
@@ -11,8 +11,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gtest/gtest.h"
 #include <future>
 #include <iostream>
-#include <thread>
 #include <string>
+#include <thread>
 #include <utility>
 // these test cases test out the message federates
 

diff --git a/tests/helics/system_tests/ErrorTests.cpp b/tests/helics/system_tests/ErrorTests.cpp
@@ -12,9 +12,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gtest/gtest.h"
 #include <complex>
 #include <future>
-#include <thread>
-#include <string>
 #include <memory>
+#include <string>
+#include <thread>
 
 #define CORE_TYPE_TO_TEST helics::CoreType::TEST
 

diff --git a/tests/helics/system_tests/QueryTests.cpp b/tests/helics/system_tests/QueryTests.cpp
@@ -18,10 +18,10 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include <memory>
 #include <nlohmann/json.hpp>
-#include <thread>
 #include <string>
-#include <memory>
+#include <thread>
 #include <utility>
 
 struct query: public FederateTestFixture, public ::testing::Test {};

diff --git a/tests/helics/system_tests/TimingTests2.cpp b/tests/helics/system_tests/TimingTests2.cpp
@@ -14,8 +14,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/helics.hpp"
 
 #include <future>
-#include <thread>
 #include <string>
+#include <thread>
 
 struct timing2: public FederateTestFixture, public ::testing::Test {};
 /** just a check that in the simple case we do actually get the time back we requested*/

diff --git a/tests/helics/system_tests/dynamicFederationTests.cpp b/tests/helics/system_tests/dynamicFederationTests.cpp
@@ -12,8 +12,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <complex>
 #include <future>
 #include <iostream>
-#include <string>
 #include <memory>
+#include <string>
 
 /** these test cases test out the value converters
  */

diff --git a/tests/helics/system_tests/federateRealTimeTests.cpp b/tests/helics/system_tests/federateRealTimeTests.cpp
@@ -17,9 +17,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gtest/gtest.h"
 #include <chrono>
 #include <future>
-#include <thread>
-#include <string>
 #include <memory>
+#include <string>
+#include <thread>
 
 /** @file these test cases test out the real time mode for HELICS
  */