iotivity · Danielius1922 · Aug 7, 2024 · Aug 7, 2024
diff --git a/api/client/unittest/clientcbtest.cpp b/api/client/unittest/clientcbtest.cpp
@@ -28,8 +28,9 @@
 #include "tests/gtest/Device.h"
 #include "tests/gtest/Endpoint.h"
 
+#include "gtest/gtest.h"
+
 #include <array>
-#include <gtest/gtest.h>
 #include <cstdint>
 #include <limits>
 #include <string>

diff --git a/api/cloud/unittest/cloud_access_test.cpp b/api/cloud/unittest/cloud_access_test.cpp
@@ -28,7 +28,7 @@
 #include "tests/gtest/Device.h"
 #include "tests/gtest/Endpoint.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 class TestCloudAccess : public testing::Test {
 public:

diff --git a/api/cloud/unittest/cloud_context_test.cpp b/api/cloud/unittest/cloud_context_test.cpp
@@ -22,7 +22,7 @@
 #include "oc_uuid.h"
 #include "util/oc_features.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 #include <vector>
 
 class TestCloudContext : public testing::Test {

diff --git a/api/cloud/unittest/cloud_manager_test.cpp b/api/cloud/unittest/cloud_manager_test.cpp
@@ -33,8 +33,9 @@
 #include "tests/gtest/Device.h"
 #include "tests/gtest/RepPool.h"
 
+#include "gtest/gtest.h"
+
 #include <array>
-#include <gtest/gtest.h>
 #include <optional>
 #include <string>
 #include <vector>

diff --git a/api/cloud/unittest/cloud_rd_test.cpp b/api/cloud/unittest/cloud_rd_test.cpp
@@ -24,7 +24,7 @@
 #include "oc_ri.h"
 #include "tests/gtest/Device.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 static constexpr size_t kDeviceID{ 0 };
 

diff --git a/api/cloud/unittest/cloud_resource_test.cpp b/api/cloud/unittest/cloud_resource_test.cpp
@@ -29,8 +29,9 @@
 #include "tests/gtest/Resource.h"
 #include "util/oc_macros_internal.h"
 
+#include "gtest/gtest.h"
+
 #include <cstddef>
-#include <gtest/gtest.h>
 #include <string>
 
 using namespace std::chrono_literals;

diff --git a/api/cloud/unittest/cloud_store_test.cpp b/api/cloud/unittest/cloud_store_test.cpp
@@ -35,14 +35,15 @@
 #include "tests/gtest/RepPool.h"
 #include "util/oc_endpoint_address.h"
 
+#include "gtest/gtest.h"
+
 #include <array>
 #include <filesystem>
 #include <fstream>
 #include <functional>
-#include <gtest/gtest.h>
+#include <map>
 #include <string>
 #include <string_view>
-#include <map>
 
 using namespace std::chrono_literals;
 

diff --git a/api/cloud/unittest/cloud_test.cpp b/api/cloud/unittest/cloud_test.cpp
@@ -36,12 +36,6 @@
 #include "util/oc_secure_string_internal.h"
 #include "util/oc_features.h"
 
-#include <array>
-#include <gtest/gtest.h>
-#include <set>
-#include <string>
-#include <vector>
-
 #ifdef OC_SECURITY
 #include "security/oc_pstat_internal.h"
 #include "security/oc_svr_internal.h"
@@ -51,6 +45,13 @@
 #include "api/oc_push_internal.h"
 #endif /* OC_HAS_FEATURE_PUSH */
 
+#include "gtest/gtest.h"
+
+#include <array>
+#include <set>
+#include <string>
+#include <vector>
+
 using namespace std::chrono_literals;
 
 static constexpr size_t kDeviceID{ 0 };

diff --git a/api/cloud/unittest/rd_client_test.cpp b/api/cloud/unittest/rd_client_test.cpp
@@ -35,8 +35,9 @@
 #include "tests/gtest/Endpoint.h"
 #include "tests/gtest/RepPool.h"
 
+#include "gtest/gtest.h"
+
 #include <array>
-#include <gtest/gtest.h>
 #include <optional>
 #include <string>
 #include <vector>

diff --git a/api/oc_core_res_internal.h b/api/oc_core_res_internal.h
@@ -27,7 +27,8 @@
 #include "port/oc_connectivity_internal.h"
 #include "util/oc_compiler.h"
 
-#include <cbor.h>
+#include "cbor.h"
+
 #include <stdbool.h>
 #include <stddef.h>
 

diff --git a/api/oc_rep_encode_cbor.c b/api/oc_rep_encode_cbor.c
@@ -18,8 +18,6 @@
 
 #include "api/oc_rep_encode_cbor_internal.h"
 
-#include <cbor.h>
-
 oc_rep_encoder_implementation_t
 oc_rep_cbor_encoder(void)
 {

diff --git a/api/oc_rep_encode_internal.h b/api/oc_rep_encode_internal.h
@@ -23,7 +23,8 @@
 #include "oc_ri.h"
 #include "util/oc_compiler.h"
 
-#include <cbor.h>
+#include "cbor.h"
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

diff --git a/api/oc_server_api_internal.h b/api/oc_server_api_internal.h
@@ -25,7 +25,7 @@
 #include "util/oc_compiler.h"
 
 #ifdef OC_RES_BATCH_SUPPORT
-#include <cbor.h>
+#include "cbor.h"
 #endif /* OC_RES_BATCH_SUPPORT */
 
 #include <stdbool.h>

diff --git a/api/oc_tcp.c b/api/oc_tcp.c
@@ -26,7 +26,7 @@
 #include "oc_tcp_internal.h"
 #include "util/oc_atomic.h"
 #ifdef OC_SECURITY
-#include <mbedtls/ssl.h>
+#include "mbedtls/ssl.h"
 #ifdef OC_OSCORE
 #include "messaging/coap/oscore_internal.h"
 #endif /* OC_OSCORE */

diff --git a/api/oc_udp.c b/api/oc_udp.c
@@ -21,7 +21,7 @@
 #include "messaging/coap/coap_internal.h"
 #include "port/oc_connectivity.h"
 #ifdef OC_SECURITY
-#include <mbedtls/ssl.h>
+#include "mbedtls/ssl.h"
 #ifdef OC_OSCORE
 #include "messaging/coap/oscore_internal.h"
 #endif /* OC_OSCORE */

diff --git a/api/plgd/plgd_time.c b/api/plgd/plgd_time.c
@@ -49,7 +49,7 @@
 #include <time.h>
 
 #ifdef OC_SECURITY
-#include <mbedtls/x509.h>
+#include "mbedtls/x509.h"
 #endif /* OC_SECURITY */
 
 #ifdef OC_CLIENT

diff --git a/api/plgd/plgd_time_internal.h b/api/plgd/plgd_time_internal.h
@@ -30,7 +30,7 @@
 #include "port/oc_clock.h"
 
 #ifdef OC_SECURITY
-#include <mbedtls/platform_time.h>
+#include "mbedtls/platform_time.h"
 #endif /* OC_SECURITY */
 
 #include <stdbool.h>

diff --git a/api/unittest/RIServerTest.cpp b/api/unittest/RIServerTest.cpp
@@ -36,9 +36,10 @@
 #include "tests/gtest/Device.h"
 #include "util/oc_process_internal.h"
 
+#include "gtest/gtest.h"
+
 #include <array>
 #include <cstdint>
-#include <gtest/gtest.h>
 #include <unordered_map>
 
 static const std::string kResourceURI = "/LightResourceURI";

diff --git a/api/unittest/RITest.cpp b/api/unittest/RITest.cpp
@@ -30,7 +30,8 @@
 #include "messaging/coap/signal_internal.h"
 #endif /* OC_TCP */
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
+
 #include <limits>
 #include <set>
 #include <string>

diff --git a/api/unittest/base64test.cpp b/api/unittest/base64test.cpp
@@ -19,9 +19,10 @@
 #include "oc_base64.h"
 #include "oc_helpers.h"
 
+#include "gtest/gtest.h"
+
 #include <algorithm>
 #include <array>
-#include <gtest/gtest.h>
 #include <stddef.h>
 #include <string>
 #include <vector>

diff --git a/api/unittest/buffertest.cpp b/api/unittest/buffertest.cpp
@@ -28,7 +28,7 @@
 #include "util/oc_memb.h"
 #include "util/oc_process_internal.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 #include <memory>
 
 constexpr size_t kTestMessagesPoolSize = 1;

diff --git a/api/unittest/collectiontest.cpp b/api/unittest/collectiontest.cpp
@@ -44,10 +44,11 @@
 #include "oc_etag.h"
 #endif /* OC_HAS_FEATURE_ETAG */
 
+#include "gtest/gtest.h"
+
 #include <algorithm>
 #include <array>
 #include <chrono>
-#include <gtest/gtest.h>
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/api/unittest/conresourcetest.cpp b/api/unittest/conresourcetest.cpp
@@ -28,8 +28,9 @@
 #include "tests/gtest/Resource.h"
 #include "util/oc_macros_internal.h"
 
+#include "gtest/gtest.h"
+
 #include <functional>
-#include <gtest/gtest.h>
 #include <optional>
 #include <string>
 

diff --git a/api/unittest/coreresourcetest.cpp b/api/unittest/coreresourcetest.cpp
@@ -32,10 +32,11 @@
 #include "api/oc_push_internal.h"
 #endif /* OC_HAS_FEATURE_PUSH */
 
+#include "gtest/gtest.h"
+
 #include <algorithm>
+#include <cstdio>
 #include <cstdlib>
-#include <gtest/gtest.h>
-#include <stdio.h>
 #include <string>
 
 using namespace std::chrono_literals;

diff --git a/api/unittest/discovery/discovery.cpp b/api/unittest/discovery/discovery.cpp
@@ -36,7 +36,7 @@
 #include "tests/gtest/Collection.h"
 #endif /* OC_COLLECTIONS */
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 namespace oc::discovery {
 

diff --git a/api/unittest/discovery/discovery.h b/api/unittest/discovery/discovery.h
@@ -28,9 +28,10 @@
 #include "messaging/coap/oc_coap.h"
 #endif /* OC_HAS_FEATURE_ETAG */
 
+#include "gtest/gtest.h"
+
 #include <cstdint>
 #include <string>
-#include <gtest/gtest.h>
 #include <vector>
 #include <unordered_map>
 

diff --git a/api/unittest/discovery/discoverytest.cpp b/api/unittest/discovery/discoverytest.cpp
@@ -42,12 +42,13 @@
 #include "security/oc_sdi_internal.h"
 #endif /* OC_SECURITY */
 
+#include "gtest/gtest.h"
+
 #include <algorithm>
 #include <array>
 #include <chrono>
 #include <cinttypes>
 #include <cstring>
-#include <gtest/gtest.h>
 #include <map>
 #include <string>
 #include <vector>

diff --git a/api/unittest/encoder/TestEncoderBuffer.h b/api/unittest/encoder/TestEncoderBuffer.h
@@ -24,8 +24,9 @@
 #include "oc_rep.h"
 #include "tests/gtest/RepPool.h"
 
+#include "gtest/gtest.h"
+
 #include <array>
-#include <gtest/gtest.h>
 #include <optional>
 #include <vector>
 

diff --git a/api/unittest/enumstest.cpp b/api/unittest/enumstest.cpp
@@ -18,7 +18,7 @@
 
 #include "api/oc_enums_internal.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 #include <limits>
 #include <string>
 

diff --git a/api/unittest/eptest.cpp b/api/unittest/eptest.cpp
@@ -28,9 +28,10 @@
 #include "tests/gtest/Device.h"
 #include "tests/gtest/Endpoint.h"
 
+#include "gtest/gtest.h"
+
 #include <array>
 #include <cstdlib>
-#include <gtest/gtest.h>
 #include <string>
 #include <string_view>
 #include <vector>

diff --git a/api/unittest/etagtest.cpp b/api/unittest/etagtest.cpp
@@ -60,13 +60,14 @@
 #include "api/plgd/plgd_time_internal.h"
 #endif /* OC_HAS_FEATURE_PLGD_TIME */
 
+#include "gtest/gtest.h"
+
 #include <algorithm>
 #include <array>
 #include <chrono>
 #include <filesystem>
 #include <fstream>
 #include <functional>
-#include <gtest/gtest.h>
 #include <map>
 #include <string>
 #include <vector>

diff --git a/api/unittest/eventcallbacktest.cpp b/api/unittest/eventcallbacktest.cpp
@@ -46,8 +46,9 @@
 #include "security/oc_security_internal.h"
 #endif /* OC_SECURITY */
 
+#include "gtest/gtest.h"
+
 #include <chrono>
-#include <gtest/gtest.h>
 #include <string>
 #include <vector>
 

diff --git a/api/unittest/eventstest.cpp b/api/unittest/eventstest.cpp
@@ -19,7 +19,7 @@
 #include "api/oc_events_internal.h"
 #include "port/oc_log_internal.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 class TestEvents : public testing::Test {
 public:

diff --git a/api/unittest/helperstest.cpp b/api/unittest/helperstest.cpp
@@ -20,10 +20,11 @@
 #include "oc_helpers.h"
 #include "port/oc_random.h"
 
+#include "gtest/gtest.h"
+
 #include <array>
 #include <cstdint>
 #include <cstdlib>
-#include <gtest/gtest.h>
 #include <numeric>
 #include <vector>
 

diff --git a/api/unittest/introspectiontest.cpp b/api/unittest/introspectiontest.cpp
@@ -34,9 +34,10 @@
 #include "tests/gtest/Resource.h"
 #include "tests/gtest/Storage.h"
 
+#include "gtest/gtest.h"
+
 #include <algorithm>
 #include <fstream>
-#include <gtest/gtest.h>
 #include <iterator>
 #include <vector>