From 184488be2597798b2524d6cf63378fbbaa4ce62c Mon Sep 17 00:00:00 2001
From: "Fiorentino Ing. Stefano" <stefano.fiore84@gmail.com>
Date: Thu, 8 Oct 2020 07:54:49 +0000
Subject: [PATCH] refactor the `test' includes

Signed-off-by: Fiorentino Ing. Stefano <stefano.fiore84@gmail.com>
---
 .gitignore                     | 3 ++-
 test/uvw/async.cpp             | 2 +-
 test/uvw/check.cpp             | 2 +-
 test/uvw/dns.cpp               | 2 +-
 test/uvw/file_req.cpp          | 2 +-
 test/uvw/file_req_sendfile.cpp | 2 +-
 test/uvw/fs_event.cpp          | 3 ++-
 test/uvw/fs_poll.cpp           | 4 +++-
 test/uvw/fs_req.cpp            | 2 +-
 test/uvw/handle.cpp            | 3 ++-
 test/uvw/idle.cpp              | 2 +-
 test/uvw/lib.cpp               | 2 +-
 test/uvw/loop.cpp              | 4 +++-
 test/uvw/pipe.cpp              | 2 +-
 test/uvw/prepare.cpp           | 2 +-
 test/uvw/process.cpp           | 3 ++-
 test/uvw/request.cpp           | 3 ++-
 test/uvw/resource.cpp          | 3 ++-
 test/uvw/signal.cpp            | 3 ++-
 test/uvw/stream.cpp            | 2 +-
 test/uvw/tcp.cpp               | 2 +-
 test/uvw/thread.cpp            | 2 +-
 test/uvw/timer.cpp             | 2 +-
 test/uvw/tty.cpp               | 3 ++-
 test/uvw/udp.cpp               | 2 +-
 test/uvw/underlying_type.cpp   | 3 ++-
 test/uvw/util.cpp              | 1 -
 test/uvw/work.cpp              | 4 +++-
 28 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc1ae5e3..285713a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ CMakeSettings.json
 .conan/test_package/build
 cmake-build-debug/
 .idea/
-.vs/
\ No newline at end of file
+.vs/
+.vscode/
\ No newline at end of file
diff --git a/test/uvw/async.cpp b/test/uvw/async.cpp
index 7994a15b..04e37317 100644
--- a/test/uvw/async.cpp
+++ b/test/uvw/async.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/async.h>
 
 
 TEST(Async, Send) {
diff --git a/test/uvw/check.cpp b/test/uvw/check.cpp
index e612f15f..15f1a5be 100644
--- a/test/uvw/check.cpp
+++ b/test/uvw/check.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/check.h>
 
 
 TEST(Check, StartAndStop) {
diff --git a/test/uvw/dns.cpp b/test/uvw/dns.cpp
index 5d92d523..2012b197 100644
--- a/test/uvw/dns.cpp
+++ b/test/uvw/dns.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/dns.h>
 
 
 TEST(GetAddrInfo, GetNodeAddrInfo) {
diff --git a/test/uvw/file_req.cpp b/test/uvw/file_req.cpp
index aaa6e9e3..10db662f 100644
--- a/test/uvw/file_req.cpp
+++ b/test/uvw/file_req.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/fs.h>
 #include <chrono>
 
 #ifdef _WIN32
diff --git a/test/uvw/file_req_sendfile.cpp b/test/uvw/file_req_sendfile.cpp
index 714a71bc..bc4b5dd8 100644
--- a/test/uvw/file_req_sendfile.cpp
+++ b/test/uvw/file_req_sendfile.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/fs.h>
 #include <chrono>
 
 #ifdef _WIN32
diff --git a/test/uvw/fs_event.cpp b/test/uvw/fs_event.cpp
index 59b565ec..9976e58a 100644
--- a/test/uvw/fs_event.cpp
+++ b/test/uvw/fs_event.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/fs.h>
+#include <uvw/fs_event.h>
 
 
 TEST(FsEvent, Functionalities) {
diff --git a/test/uvw/fs_poll.cpp b/test/uvw/fs_poll.cpp
index 7f5dfb5c..cad7e7ab 100644
--- a/test/uvw/fs_poll.cpp
+++ b/test/uvw/fs_poll.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/fs.h>
+#include <uvw/fs_event.h>
+#include <uvw/fs_poll.h>
 
 
 TEST(FsPoll, Functionalities) {
diff --git a/test/uvw/fs_req.cpp b/test/uvw/fs_req.cpp
index c67f324b..2f589b48 100644
--- a/test/uvw/fs_req.cpp
+++ b/test/uvw/fs_req.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/fs.h>
 #include <chrono>
 
 #ifdef _WIN32
diff --git a/test/uvw/handle.cpp b/test/uvw/handle.cpp
index 55aa5735..ce37d114 100644
--- a/test/uvw/handle.cpp
+++ b/test/uvw/handle.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/async.h>
+#include <uvw/handle.hpp>
 
 
 struct fake_handle_t { void *data; };
diff --git a/test/uvw/idle.cpp b/test/uvw/idle.cpp
index d8db93a1..21ba7162 100644
--- a/test/uvw/idle.cpp
+++ b/test/uvw/idle.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/idle.h>
 
 
 TEST(Idle, StartAndStop) {
diff --git a/test/uvw/lib.cpp b/test/uvw/lib.cpp
index af7454dd..c4c38d7e 100644
--- a/test/uvw/lib.cpp
+++ b/test/uvw/lib.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/lib.h>
 
 
 TEST(SharedLib, Failure) {
diff --git a/test/uvw/loop.cpp b/test/uvw/loop.cpp
index dda37495..b37be7b1 100644
--- a/test/uvw/loop.cpp
+++ b/test/uvw/loop.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/prepare.h>
+#include <uvw/work.h>
+#include <uvw/loop.h>
 
 
 TEST(Loop, DefaultLoop) {
diff --git a/test/uvw/pipe.cpp b/test/uvw/pipe.cpp
index 71777f27..b52c8173 100644
--- a/test/uvw/pipe.cpp
+++ b/test/uvw/pipe.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/pipe.h>
 
 
 TEST(Pipe, ReadWrite) {
diff --git a/test/uvw/prepare.cpp b/test/uvw/prepare.cpp
index 8f622a77..5bdb5a68 100644
--- a/test/uvw/prepare.cpp
+++ b/test/uvw/prepare.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/prepare.h>
 
 
 TEST(Prepare, StartAndStop) {
diff --git a/test/uvw/process.cpp b/test/uvw/process.cpp
index 33348736..731a0552 100644
--- a/test/uvw/process.cpp
+++ b/test/uvw/process.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/pipe.h>
+#include <uvw/process.h>
 
 
 TEST(Process, Pid) {
diff --git a/test/uvw/request.cpp b/test/uvw/request.cpp
index b2848011..050f55d9 100644
--- a/test/uvw/request.cpp
+++ b/test/uvw/request.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/work.h>
+#include <uvw/request.hpp>
 
 
 TEST(Request, Functionalities) {
diff --git a/test/uvw/resource.cpp b/test/uvw/resource.cpp
index 3f444910..98587e45 100644
--- a/test/uvw/resource.cpp
+++ b/test/uvw/resource.cpp
@@ -1,7 +1,8 @@
 #include <memory>
 #include <type_traits>
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/async.h>
+#include <uvw/request.hpp>
 
 
 struct Res: uvw::Resource<Res, int> { };
diff --git a/test/uvw/signal.cpp b/test/uvw/signal.cpp
index df032e78..7c458ce7 100644
--- a/test/uvw/signal.cpp
+++ b/test/uvw/signal.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/check.h>
+#include <uvw/signal.h>
 
 
 TEST(Signal, Start) {
diff --git a/test/uvw/stream.cpp b/test/uvw/stream.cpp
index f9c89ad6..26b9e66b 100644
--- a/test/uvw/stream.cpp
+++ b/test/uvw/stream.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/stream.h>
 
 
 struct fake_stream_t { void *data; };
diff --git a/test/uvw/tcp.cpp b/test/uvw/tcp.cpp
index f56a4222..99c4bd89 100644
--- a/test/uvw/tcp.cpp
+++ b/test/uvw/tcp.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/tcp.h>
 
 
 TEST(TCP, Functionalities) {
diff --git a/test/uvw/thread.cpp b/test/uvw/thread.cpp
index f50c3207..5a2efc42 100644
--- a/test/uvw/thread.cpp
+++ b/test/uvw/thread.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/thread.h>
 
 TEST(Thread, Run) {
     auto loop = uvw::Loop::getDefault();
diff --git a/test/uvw/timer.cpp b/test/uvw/timer.cpp
index b803b406..7d226a5a 100644
--- a/test/uvw/timer.cpp
+++ b/test/uvw/timer.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/timer.h>
 
 
 TEST(Timer, StartAndStop) {
diff --git a/test/uvw/tty.cpp b/test/uvw/tty.cpp
index cd7266e2..68b0e54f 100644
--- a/test/uvw/tty.cpp
+++ b/test/uvw/tty.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/timer.h>
+#include <uvw/tty.h>
 
 
 TEST(TTY, Functionalities) {
diff --git a/test/uvw/udp.cpp b/test/uvw/udp.cpp
index bbf71b0a..2264dadd 100644
--- a/test/uvw/udp.cpp
+++ b/test/uvw/udp.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/udp.h>
 
 
 TEST(UDP, Functionalities) {
diff --git a/test/uvw/underlying_type.cpp b/test/uvw/underlying_type.cpp
index 724c9af5..28b1c40a 100644
--- a/test/uvw/underlying_type.cpp
+++ b/test/uvw/underlying_type.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/async.h>
+#include <uvw/underlying_type.hpp>
 
 
 TEST(UnderlyingType, Functionalities) {
diff --git a/test/uvw/util.cpp b/test/uvw/util.cpp
index 82bb63f5..609834eb 100644
--- a/test/uvw/util.cpp
+++ b/test/uvw/util.cpp
@@ -3,7 +3,6 @@
 #include <gtest/gtest.h>
 #include <uvw.hpp>
 
-
 template<typename T>
 struct tag { using type = T; };
 
diff --git a/test/uvw/work.cpp b/test/uvw/work.cpp
index 1b93b54f..cc25ca05 100644
--- a/test/uvw/work.cpp
+++ b/test/uvw/work.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
-#include <uvw.hpp>
+#include <uvw/check.h>
+#include <uvw/timer.h>
+#include <uvw/work.h>
 
 
 TEST(Work, RunTask) {