Run IWYU (#450)

examples/component/modal_dialog.cpp

@@ -1,8 +1,8 @@
 #include <ftxui/component/component_options.hpp>  // for ButtonOption
+#include <ftxui/component/mouse.hpp>              // for ftxui
 #include <functional>                             // for function
 #include <memory>                                 // for allocator, shared_ptr
 
-#include "ftxui/component/captured_mouse.hpp"  // for ftxui
 #include "ftxui/component/component.hpp"  // for Button, operator|=, Renderer, Vertical, Modal
 #include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive, Component
 #include "ftxui/dom/elements.hpp"  // for operator|, separator, text, size, Element, vbox, border, GREATER_THAN, WIDTH, center, HEIGHT

iwyu.imp

@@ -4,14 +4,22 @@
   { include: ["<bits/termios-struct.h>", "private", "<termios.h>", "public"]},
   { include: ["<bits/termios-tcflow.h>", "private", "<termios.h>", "public"]},
   { include: ["<ext/alloc_traits.h>", "private", "<vector>", "public"] },
-  { symbol: [ "ftxui", "private", "", "public" ] },
+  { include: ["<gtest/internal/gtest-internal.h>", "private", "<gtest/gtest.h>", "public" ] },
-  { symbol: [ "char_traits", "private", "<string>", "public" ] },
+  { include: ["<gtest/internal/gtest-string.h>", "private", "<gtest/gtest.h>", "public" ] },
-  { symbol: [ "ECHO", "private", "<termios.h>", "public" ] },
+  { include: ["<gtest/gtest-death-test.h>", "private", "<gtest/gtest.h>", "public" ] },
-  { symbol: [ "ICANON", "private", "<termios.h>", "public" ] },
+  { include: ["<gtest/gtest-message.h>", "private", "<gtest/gtest.h>", "public" ] },
-  { symbol: [ "TCSANOW", "private", "<termios.h>", "public" ] },
+  { include: ["<gtest/gtest-param-test.h>", "private", "<gtest/gtest.h>", "public" ] },
-  { symbol: [ "VMIN", "private", "<termios.h>", "public" ] },
+  { include: ["<gtest/gtest-printers.h>", "private", "<gtest/gtest.h>", "public" ] },
-  { symbol: [ "VTIME", "private", "<termios.h>", "public" ] },
+  { include: ["<gtest/gtest-test-part.h>", "private", "<gtest/gtest.h>", "public" ] },
-  { symbol: [ "__shared_ptr_access", "private", "<memory>", "public" ] },
+  { include: ["<gtest/gtest-typed-test.h>", "private", "<gtest/gtest.h>", "public" ] },
-  { symbol: [ "termios", "private", "<termios.h>", "public" ] },
+  { symbol: ["ftxui", "private", "", "public" ] },
-  { symbol: ["__alloc_traits<>:value_type", "private", "<vector>", "public" ] },
+  { symbol: ["char_traits", "private", "<string>", "public" ] },
+  { symbol: ["ECHO", "private", "<termios.h>", "public" ] },
+  { symbol: ["ICANON", "private", "<termios.h>", "public" ] },
+  { symbol: ["TCSANOW", "private", "<termios.h>", "public" ] },
+  { symbol: ["VMIN", "private", "<termios.h>", "public" ] },
+  { symbol: ["VTIME", "private", "<termios.h>", "public" ] },
+  { symbol: ["__shared_ptr_access", "private", "<memory>", "public" ] },
+  { symbol: ["termios", "private", "<termios.h>", "public" ] },
+  { symbol: ["__alloc_traits<>:value_type", "private", "<vector>", "public" ] }
 ]

src/ftxui/component/animation_test.cpp

@@ -1,10 +1,8 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestPartResult, TestFactoryImpl
+#include <functional>  // for function
-#include <functional>               // for function
+#include <vector>      // for allocator, vector
-#include <vector>                   // for allocator, vector
 
 #include "ftxui/component/animation.hpp"  // for Function, BackIn, BackInOut, BackOut, BounceIn, BounceInOut, BounceOut, CircularIn, CircularInOut, CircularOut, CubicIn, CubicInOut, CubicOut, ElasticIn, ElasticInOut, ElasticOut, ExponentialIn, ExponentialInOut, ExponentialOut, Linear, QuadraticIn, QuadraticInOut, QuadraticOut, QuarticIn, QuarticInOut, QuarticOut, QuinticIn, QuinticInOut, QuinticOut, SineIn, SineInOut, SineOut
-#include "gtest/gtest_pred_impl.h"        // for Test, EXPECT_NEAR, TEST
 
 namespace ftxui {
 

src/ftxui/component/button_test.cpp

@@ -1,6 +1,5 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
+#include <chrono>  // for operator""s, chrono_literals
-#include <chrono>                   // for operator""s, chrono_literals
 #include <memory>  // for __shared_ptr_access, shared_ptr, allocator
 #include <string>  // for string
 
@@ -13,7 +12,6 @@
 #include "ftxui/dom/node.hpp"         // for Render
 #include "ftxui/screen/screen.hpp"    // for Screen
 #include "ftxui/screen/terminal.hpp"  // for SetColorSupport, Color, TrueColor
-#include "gtest/gtest_pred_impl.h"  // for AssertionResult, EXPECT_EQ, Test, EXPECT_FALSE, EXPECT_TRUE, TEST
 
 namespace ftxui {
 

src/ftxui/component/collapsible_test.cpp

@@ -1,5 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
 #include <memory>  // for __shared_ptr_access, shared_ptr, allocator
 
 #include "ftxui/component/component.hpp"       // for Collapsible, Renderer
@@ -8,7 +7,6 @@
 #include "ftxui/dom/elements.hpp"     // for text, Element
 #include "ftxui/dom/node.hpp"         // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for AssertionResult, Test, EXPECT_EQ, EXPECT_FALSE, EXPECT_TRUE, TEST
 
 namespace ftxui {
 

src/ftxui/component/component_test.cpp

@@ -1,10 +1,8 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
 #include <memory>  // for shared_ptr, __shared_ptr_access, allocator, __shared_ptr_access<>::element_type, make_shared
 
 #include "ftxui/component/component.hpp"       // for Make
 #include "ftxui/component/component_base.hpp"  // for ComponentBase, Component
-#include "gtest/gtest_pred_impl.h"  // for EXPECT_EQ, Test, AssertionResult, TEST, EXPECT_FALSE
 
 namespace ftxui {
 

src/ftxui/component/container_test.cpp

@@ -1,11 +1,9 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
 #include <memory>  // for __shared_ptr_access, shared_ptr, allocator
 
 #include "ftxui/component/component.hpp"  // for Horizontal, Vertical, Button, Tab
 #include "ftxui/component/component_base.hpp"  // for ComponentBase, Component
 #include "ftxui/component/event.hpp"  // for Event, Event::Tab, Event::TabReverse, Event::ArrowDown, Event::ArrowLeft, Event::ArrowRight, Event::ArrowUp
-#include "gtest/gtest_pred_impl.h"  // for AssertionResult, EXPECT_EQ, EXPECT_FALSE, EXPECT_TRUE, Test, TEST
 
 namespace ftxui {
 

src/ftxui/component/input_test.cpp

@@ -1,5 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
 #include <memory>  // for __shared_ptr_access, shared_ptr, allocator
 #include <string>  // for string
 
@@ -12,7 +11,6 @@
 #include "ftxui/dom/node.hpp"       // for Render
 #include "ftxui/screen/screen.hpp"  // for Fixed, Screen, Pixel
 #include "ftxui/util/ref.hpp"       // for Ref
-#include "gtest/gtest_pred_impl.h"  // for EXPECT_EQ, Test, TEST
 
 namespace ftxui {
 

src/ftxui/component/menu_test.cpp

@@ -1,6 +1,5 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
+#include <chrono>  // for operator""s, chrono_literals
-#include <chrono>                   // for operator""s, chrono_literals
 #include <memory>  // for __shared_ptr_access, shared_ptr, allocator
 #include <string>  // for string
 #include <vector>  // for vector
@@ -13,7 +12,6 @@
 #include "ftxui/dom/node.hpp"         // for Render
 #include "ftxui/screen/screen.hpp"    // for Screen
 #include "ftxui/util/ref.hpp"         // for Ref
-#include "gtest/gtest_pred_impl.h"    // for EXPECT_EQ, Test, TEST
 
 namespace ftxui {
 

src/ftxui/component/modal_test.cpp

@@ -1,5 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestPartResult, TestFactoryImpl
 #include <ftxui/dom/elements.hpp>  // for Element, operator|, text, border
 #include <memory>  // for shared_ptr, allocator, __shared_ptr_access
 
@@ -7,7 +6,6 @@
 #include "ftxui/component/component_base.hpp"  // for ComponentBase
 #include "ftxui/dom/node.hpp"                  // for Render
 #include "ftxui/screen/screen.hpp"             // for Screen
-#include "gtest/gtest_pred_impl.h"             // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/component/radiobox_test.cpp

@@ -1,5 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
 #include <memory>  // for __shared_ptr_access, shared_ptr, allocator
 #include <string>  // for string
 #include <vector>  // for vector
@@ -9,7 +8,6 @@
 #include "ftxui/component/component_options.hpp"  // for RadioboxOption
 #include "ftxui/component/event.hpp"  // for Event, Event::Return, Event::ArrowDown, Event::ArrowUp, Event::Tab, Event::TabReverse
 #include "ftxui/util/ref.hpp"         // for Ref
-#include "gtest/gtest_pred_impl.h"    // for EXPECT_EQ, Test, TEST
 
 namespace ftxui {
 

src/ftxui/component/receiver_test.cpp

@@ -1,10 +1,8 @@
-#include <gtest/gtest-message.h>    // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult
+#include <thread>   // for thread
-#include <thread>                   // for thread
+#include <utility>  // for move
-#include <utility>                  // for move
 
 #include "ftxui/component/receiver.hpp"
-#include "gtest/gtest_pred_impl.h"  // for AssertionResult, Test, EXPECT_EQ
 
 namespace ftxui {
 

src/ftxui/component/resizable_split_test.cpp

@@ -1,5 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
 #include <memory>  // for __shared_ptr_access, shared_ptr, allocator
 
 #include "ftxui/component/component.hpp"  // for Renderer, ResizableSplitBottom, ResizableSplitLeft, ResizableSplitRight, ResizableSplitTop
@@ -9,7 +8,6 @@
 #include "ftxui/dom/elements.hpp"   // for text, Element
 #include "ftxui/dom/node.hpp"       // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for AssertionResult, Test, EXPECT_EQ, EXPECT_TRUE, TEST
 
 namespace ftxui {
 

src/ftxui/component/screen_interactive_test.cpp

@@ -1,12 +1,10 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
 #include <csignal>  // for raise, SIGABRT, SIGFPE, SIGILL, SIGINT, SIGSEGV, SIGTERM
 #include <ftxui/component/event.hpp>  // for Event, Event::Custom
 
 #include "ftxui/component/component.hpp"  // for Renderer
 #include "ftxui/component/screen_interactive.hpp"
-#include "ftxui/dom/elements.hpp"   // for text, Element
+#include "ftxui/dom/elements.hpp"  // for text, Element
-#include "gtest/gtest_pred_impl.h"  // for Test, TEST, EXPECT_EQ
 
 namespace ftxui {
 

src/ftxui/component/terminal_input_parser_test.cpp

@@ -1,6 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>  // for AssertionResult, Test, Message, TestPartResult, SuiteApiResolver, TestInfo (ptr only), EXPECT_EQ, EXPECT_TRUE, TEST, TestFactoryImpl, EXPECT_FALSE
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
-#include <algorithm>                // for max
 #include <ftxui/component/mouse.hpp>  // for Mouse, Mouse::Left, Mouse::Middle, Mouse::Pressed, Mouse::Released, Mouse::Right
 #include <ftxui/component/task.hpp>   // for Task
 #include <initializer_list>           // for initializer_list
@@ -10,7 +8,6 @@
 #include "ftxui/component/event.hpp"  // for Event, Event::Return, Event::ArrowDown, Event::ArrowLeft, Event::ArrowRight, Event::ArrowUp, Event::Backspace, Event::Custom, Event::Delete, Event::End, Event::F10, Event::F11, Event::F12, Event::F5, Event::F6, Event::F7, Event::F8, Event::F9, Event::Home, Event::PageDown, Event::PageUp, Event::Tab, Event::TabReverse, Event::Escape
 #include "ftxui/component/receiver.hpp"  // for MakeReceiver, ReceiverImpl
 #include "ftxui/component/terminal_input_parser.hpp"
-#include "gtest/gtest_pred_impl.h"  // for AssertionResult, Test, EXPECT_EQ, EXPECT_TRUE, TEST, EXPECT_FALSE
 
 namespace ftxui {
 

src/ftxui/component/terminal_input_parser_test_fuzzer.cpp

@@ -1,5 +1,3 @@
-//#include "ftxui/component/event.hpp"
-//#include "ftxui/component/receiver.hpp"
 #include <vector>
 #include "ftxui/component/terminal_input_parser.hpp"
 

src/ftxui/component/toggle_test.cpp

@@ -1,9 +1,8 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
+#include <functional>  // for function
-#include <functional>               // for function
+#include <memory>      // for __shared_ptr_access, shared_ptr, allocator
-#include <memory>  // for __shared_ptr_access, shared_ptr, allocator
+#include <string>      // for string, basic_string
-#include <string>  // for string, basic_string
+#include <vector>      // for vector
-#include <vector>  // for vector
 
 #include "ftxui/component/captured_mouse.hpp"     // for ftxui
 #include "ftxui/component/component.hpp"          // for Toggle
@@ -11,7 +10,6 @@
 #include "ftxui/component/component_options.hpp"  // for ToggleOption
 #include "ftxui/component/event.hpp"  // for Event, Event::ArrowLeft, Event::ArrowRight, Event::Return, Event::Tab, Event::TabReverse
 #include "ftxui/util/ref.hpp"         // for Ref
-#include "gtest/gtest_pred_impl.h"  // for AssertionResult, EXPECT_EQ, Test, EXPECT_TRUE, EXPECT_FALSE, TEST
 
 using namespace ftxui;
 

src/ftxui/dom/blink_test.cpp

@@ -1,6 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <gtest/gtest.h>  // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST
 #include <string>  // for allocator
 
 #include "ftxui/dom/elements.hpp"   // for operator|, text, blink, Element

src/ftxui/dom/bold_test.cpp

@@ -1,6 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <gtest/gtest.h>  // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST
 #include <string>  // for allocator
 
 #include "ftxui/dom/elements.hpp"   // for operator|, text, bold, Element

src/ftxui/dom/border_test.cpp

@@ -1,11 +1,9 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <string>  // for allocator, string
-#include <string>                   // for allocator, string
 
 #include "ftxui/dom/elements.hpp"  // for text, operator|, Element, borderStyled, borderWith, window, border, borderDouble, borderEmpty, borderHeavy, borderLight, borderRounded, DOUBLE
 #include "ftxui/dom/node.hpp"      // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen, Pixel
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/canvas_test.cpp

@@ -1,7 +1,6 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <stdint.h>  // for uint32_t
-#include <stdint.h>                 // for uint32_t
+#include <string>    // for allocator, string
-#include <string>                   // for allocator, string
 
 #include "ftxui/dom/canvas.hpp"    // for Canvas
 #include "ftxui/dom/elements.hpp"  // for canvas
@@ -9,7 +8,6 @@
 #include "ftxui/screen/color.hpp"  // for Color, Color::Black, Color::Blue, Color::Red, Color::White, Color::Yellow, Color::Cyan, Color::Green
 #include "ftxui/screen/screen.hpp"    // for Screen
 #include "ftxui/screen/terminal.hpp"  // for SetColorSupport, Color, TrueColor
-#include "gtest/gtest_pred_impl.h"    // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/color_test.cpp

@@ -1,12 +1,10 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestPartResult, TestFactoryImpl
+#include <string>  // for allocator
-#include <string>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"  // for operator|, text, bgcolor, color, Element
 #include "ftxui/dom/node.hpp"      // for Render
 #include "ftxui/screen/color.hpp"   // for Color, Color::Red
 #include "ftxui/screen/screen.hpp"  // for Screen, Pixel
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/dbox_test.cpp

@@ -1,11 +1,9 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <string>  // for allocator
-#include <string>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"  // for filler, operator|, text, border, dbox, hbox, vbox, Element
 #include "ftxui/dom/node.hpp"       // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/dim_test.cpp

@@ -1,6 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <gtest/gtest.h>  // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST
 #include <string>  // for allocator
 
 #include "ftxui/dom/elements.hpp"   // for operator|, text, dim, Element

src/ftxui/dom/flexbox_helper_test.cpp

@@ -1,10 +1,8 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
 #include <ftxui/dom/flexbox_config.hpp>  // for FlexboxConfig, FlexboxConfig::Direction, FlexboxConfig::Direction::Column, FlexboxConfig::Direction::ColumnInversed, FlexboxConfig::Direction::Row, FlexboxConfig::Direction::RowInversed
 #include <memory>                        // for allocator_traits<>::value_type
 
 #include "ftxui/dom/flexbox_helper.hpp"
-#include "gtest/gtest_pred_impl.h"  // for EXPECT_EQ, Test, TEST
 
 namespace ftxui {
 

src/ftxui/dom/flexbox_test.cpp

@@ -1,12 +1,10 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <string>  // for allocator
-#include <string>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"        // for text, flexbox
 #include "ftxui/dom/flexbox_config.hpp"  // for FlexboxConfig, FlexboxConfig::Direction, FlexboxConfig::AlignContent, FlexboxConfig::JustifyContent, FlexboxConfig::Direction::Column, FlexboxConfig::AlignItems, FlexboxConfig::JustifyContent::SpaceAround, FlexboxConfig::AlignContent::Center, FlexboxConfig::AlignContent::FlexEnd, FlexboxConfig::AlignContent::SpaceAround, FlexboxConfig::AlignContent::SpaceBetween, FlexboxConfig::AlignContent::SpaceEvenly, FlexboxConfig::AlignItems::Center, FlexboxConfig::AlignItems::FlexEnd, FlexboxConfig::Direction::ColumnInversed, FlexboxConfig::Direction::Row, FlexboxConfig::Direction::RowInversed, FlexboxConfig::JustifyContent::Center, FlexboxConfig::JustifyContent::SpaceBetween
 #include "ftxui/dom/node.hpp"            // for Render
 #include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/gauge_test.cpp

@@ -1,11 +1,9 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <memory>  // for allocator
-#include <memory>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"   // for gauge, gaugeUp
 #include "ftxui/dom/node.hpp"       // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/gridbox_test.cpp

@@ -1,15 +1,13 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <stddef.h>   // for size_t
-#include <stddef.h>                 // for size_t
+#include <algorithm>  // for remove
-#include <algorithm>                // for remove
+#include <memory>     // for shared_ptr
-#include <memory>                   // for shared_ptr
+#include <string>     // for allocator, basic_string, string
-#include <string>                   // for allocator, basic_string, string
+#include <vector>     // for vector
-#include <vector>                   // for vector
 
 #include "ftxui/dom/elements.hpp"  // for text, operator|, Element, flex, Elements, flex_grow, flex_shrink, vtext, gridbox, vbox, focus, operator|=, border, frame
 #include "ftxui/dom/node.hpp"      // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for Test, TEST, EXPECT_EQ
 
 namespace ftxui {
 

src/ftxui/dom/hbox_test.cpp

@@ -1,14 +1,12 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <stddef.h>  // for size_t
-#include <stddef.h>                 // for size_t
+#include <string>    // for string, allocator
-#include <string>                   // for string, allocator
+#include <vector>    // for vector
-#include <vector>                   // for vector
 
 #include "ftxui/dom/elements.hpp"  // for text, operator|, hbox, Element, flex_grow, flex_shrink
 #include "ftxui/dom/node.hpp"       // for Render
 #include "ftxui/screen/color.hpp"   // for ftxui
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 using namespace ftxui;

src/ftxui/dom/scroll_indicator_test.cpp

@@ -1,13 +1,11 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
+#include <memory>   // for shared_ptr
-#include <memory>                   // for shared_ptr
+#include <string>   // for allocator, to_string, string
-#include <string>                   // for allocator, to_string, string
+#include <utility>  // for move
-#include <utility>                  // for move
 
 #include "ftxui/dom/elements.hpp"  // for operator|, Element, operator|=, text, vbox, Elements, border, focus, frame, vscroll_indicator
 #include "ftxui/dom/node.hpp"      // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for EXPECT_EQ, Test, TEST
 
 namespace ftxui {
 

src/ftxui/dom/separator_test.cpp

@@ -1,11 +1,9 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <string>  // for allocator, string
-#include <string>                   // for allocator, string
 
 #include "ftxui/dom/elements.hpp"  // for text, vbox, separator, separatorDouble, separatorEmpty, separatorHeavy, separatorLight, separatorStyled, DOUBLE
 #include "ftxui/dom/node.hpp"      // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen, Pixel
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/spinner_test.cpp

@@ -1,11 +1,9 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <string>  // for allocator
-#include <string>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"   // for spinner
 #include "ftxui/dom/node.hpp"       // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/table_test.cpp

@@ -1,12 +1,10 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <memory>  // for allocator
-#include <memory>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"  // for LIGHT, flex, center, EMPTY, DOUBLE
 #include "ftxui/dom/node.hpp"      // for Render
 #include "ftxui/dom/table.hpp"
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/text_test.cpp

@@ -1,11 +1,9 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <string>  // for allocator, string
-#include <string>                   // for allocator, string
 
 #include "ftxui/dom/elements.hpp"   // for text, operator|, border, Element
 #include "ftxui/dom/node.hpp"       // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 

src/ftxui/dom/underlined_test.cpp

@@ -1,6 +1,4 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <gtest/gtest.h>  // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST
 #include <string>  // for allocator
 
 #include "ftxui/dom/elements.hpp"   // for operator|, text, underlined, Element

src/ftxui/dom/vbox_test.cpp

@@ -1,14 +1,12 @@
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <stddef.h>   // for size_t
-#include <stddef.h>                 // for size_t
+#include <algorithm>  // for remove
-#include <algorithm>                // for remove
+#include <string>     // for string, allocator, basic_string
-#include <string>                   // for string, allocator, basic_string
+#include <vector>     // for vector
-#include <vector>                   // for vector
 
 #include "ftxui/dom/elements.hpp"  // for vtext, operator|, vbox, Element, flex_grow, flex_shrink
 #include "ftxui/dom/node.hpp"       // for Render
 #include "ftxui/screen/screen.hpp"  // for Screen
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 namespace ftxui {
 namespace {

src/ftxui/screen/color_test.cpp

@@ -1,8 +1,6 @@
 #include "ftxui/screen/color.hpp"
-#include <gtest/gtest-message.h>  // for Message
+#include <gtest/gtest.h>
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
 #include "ftxui/screen/terminal.hpp"
-#include "gtest/gtest_pred_impl.h"  // for EXPECT_EQ, Test, TEST
 
 namespace ftxui {
 

src/ftxui/screen/string_test.cpp

@@ -1,9 +1,6 @@
-#include <gtest/gtest-message.h>  // for Message
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
-#include <string>                   // for allocator, string
-
 #include "ftxui/screen/string.hpp"
-#include "gtest/gtest_pred_impl.h"  // for EXPECT_EQ, Test, TEST
+#include <gtest/gtest.h>
+#include <string>  // for allocator, string
 
 namespace ftxui {