From eee1bd4e46cbbe8f3db593392b3694d37ffa5b8d Mon Sep 17 00:00:00 2001 From: klugier Date: Sun, 6 Sep 2020 11:32:01 +0000 Subject: [PATCH] Bazzar: Google test example packages naming simplification. git-svn-id: svn://ultimatepp.org/upp/trunk@14993 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- .../GmockExample.upp} | 0 .../GoogleMockExample.cpp | 0 .../GoogleTestUIExample.upp | 19 ------------------- .../GtestExample.upp} | 8 ++++---- .../StringTest.cpp | 0 .../StringTest.h | 0 .../main.cpp | 0 .../AppWindow.cpp | 0 .../AppWindow.h | 2 +- bazaar/GtestUIExample/GtestUIExample.upp | 19 +++++++++++++++++++ .../TestAppWindow.cpp | 3 +-- .../TestMain.cpp | 2 +- .../main.cpp | 2 +- 13 files changed, 27 insertions(+), 28 deletions(-) rename bazaar/{GoogleMockExample/GoogleMockExample.upp => GmockExample/GmockExample.upp} (100%) rename bazaar/{GoogleMockExample => GmockExample}/GoogleMockExample.cpp (100%) delete mode 100644 bazaar/GoogleTestUIExample/GoogleTestUIExample.upp rename bazaar/{GoogleTestExample/GoogleTestExample.upp => GtestExample/GtestExample.upp} (88%) rename bazaar/{GoogleTestExample => GtestExample}/StringTest.cpp (100%) rename bazaar/{GoogleTestExample => GtestExample}/StringTest.h (100%) rename bazaar/{GoogleTestExample => GtestExample}/main.cpp (100%) rename bazaar/{GoogleTestUIExample => GtestUIExample}/AppWindow.cpp (100%) rename bazaar/{GoogleTestUIExample => GtestUIExample}/AppWindow.h (87%) create mode 100644 bazaar/GtestUIExample/GtestUIExample.upp rename bazaar/{GoogleTestUIExample => GtestUIExample}/TestAppWindow.cpp (90%) rename bazaar/{GoogleTestUIExample => GtestUIExample}/TestMain.cpp (64%) rename bazaar/{GoogleTestUIExample => GtestUIExample}/main.cpp (69%) diff --git a/bazaar/GoogleMockExample/GoogleMockExample.upp b/bazaar/GmockExample/GmockExample.upp similarity index 100% rename from bazaar/GoogleMockExample/GoogleMockExample.upp rename to bazaar/GmockExample/GmockExample.upp diff --git a/bazaar/GoogleMockExample/GoogleMockExample.cpp b/bazaar/GmockExample/GoogleMockExample.cpp similarity index 100% rename from bazaar/GoogleMockExample/GoogleMockExample.cpp rename to bazaar/GmockExample/GoogleMockExample.cpp diff --git a/bazaar/GoogleTestUIExample/GoogleTestUIExample.upp b/bazaar/GoogleTestUIExample/GoogleTestUIExample.upp deleted file mode 100644 index 9293d6fe3..000000000 --- a/bazaar/GoogleTestUIExample/GoogleTestUIExample.upp +++ /dev/null @@ -1,19 +0,0 @@ -description "Automate UI testing with Google Test\377"; - -uses - CtrlLib; - -uses(TESTING_GOOGLE_TEST_UI_EXAMPLE) plugin/gmock; - -file - AppWindow.h, - AppWindow.cpp, - main.cpp, - Tests readonly separator, - TestAppWindow.cpp, - TestMain.cpp; - -mainconfig - "" = "GUI", - "" = "GUI TESTING_GOOGLE_TEST_UI_EXAMPLE"; - diff --git a/bazaar/GoogleTestExample/GoogleTestExample.upp b/bazaar/GtestExample/GtestExample.upp similarity index 88% rename from bazaar/GoogleTestExample/GoogleTestExample.upp rename to bazaar/GtestExample/GtestExample.upp index 7e64bfa71..c74d05fa2 100644 --- a/bazaar/GoogleTestExample/GoogleTestExample.upp +++ b/bazaar/GtestExample/GtestExample.upp @@ -5,11 +5,11 @@ uses Core; file - Tests readonly separator, - StringTest.h, - StringTest.cpp, Init readonly separator, - main.cpp; + main.cpp, + Tests readonly separator, + StringTest.cpp, + StringTest.h; mainconfig "" = ""; diff --git a/bazaar/GoogleTestExample/StringTest.cpp b/bazaar/GtestExample/StringTest.cpp similarity index 100% rename from bazaar/GoogleTestExample/StringTest.cpp rename to bazaar/GtestExample/StringTest.cpp diff --git a/bazaar/GoogleTestExample/StringTest.h b/bazaar/GtestExample/StringTest.h similarity index 100% rename from bazaar/GoogleTestExample/StringTest.h rename to bazaar/GtestExample/StringTest.h diff --git a/bazaar/GoogleTestExample/main.cpp b/bazaar/GtestExample/main.cpp similarity index 100% rename from bazaar/GoogleTestExample/main.cpp rename to bazaar/GtestExample/main.cpp diff --git a/bazaar/GoogleTestUIExample/AppWindow.cpp b/bazaar/GtestUIExample/AppWindow.cpp similarity index 100% rename from bazaar/GoogleTestUIExample/AppWindow.cpp rename to bazaar/GtestUIExample/AppWindow.cpp diff --git a/bazaar/GoogleTestUIExample/AppWindow.h b/bazaar/GtestUIExample/AppWindow.h similarity index 87% rename from bazaar/GoogleTestUIExample/AppWindow.h rename to bazaar/GtestUIExample/AppWindow.h index 462f1e068..a0ba7a185 100644 --- a/bazaar/GoogleTestUIExample/AppWindow.h +++ b/bazaar/GtestUIExample/AppWindow.h @@ -13,7 +13,7 @@ namespace Upp public: AppWindow(); - protected: + private: virtual void OnButtonClick(); }; } diff --git a/bazaar/GtestUIExample/GtestUIExample.upp b/bazaar/GtestUIExample/GtestUIExample.upp new file mode 100644 index 000000000..5c59bc036 --- /dev/null +++ b/bazaar/GtestUIExample/GtestUIExample.upp @@ -0,0 +1,19 @@ +description "Automate UI testing with Google Test and Google Mock\377"; + +uses + CtrlLib; + +uses(TESTING_GTEST_UI_EXAMPLE) plugin/gmock; + +file + AppWindow.h, + AppWindow.cpp, + main.cpp, + Tests readonly separator, + TestAppWindow.cpp, + TestMain.cpp; + +mainconfig + "" = "GUI", + "" = "GUI TESTING_GTEST_UI_EXAMPLE"; + diff --git a/bazaar/GoogleTestUIExample/TestAppWindow.cpp b/bazaar/GtestUIExample/TestAppWindow.cpp similarity index 90% rename from bazaar/GoogleTestUIExample/TestAppWindow.cpp rename to bazaar/GtestUIExample/TestAppWindow.cpp index d55ec0127..6c5aea8fd 100644 --- a/bazaar/GoogleTestUIExample/TestAppWindow.cpp +++ b/bazaar/GtestUIExample/TestAppWindow.cpp @@ -1,9 +1,8 @@ -#ifdef flagTESTING_GOOGLE_TEST_UI_EXAMPLE +#ifdef flagTESTING_GTEST_UI_EXAMPLE #include "AppWindow.h" #include -#include using namespace Upp; diff --git a/bazaar/GoogleTestUIExample/TestMain.cpp b/bazaar/GtestUIExample/TestMain.cpp similarity index 64% rename from bazaar/GoogleTestUIExample/TestMain.cpp rename to bazaar/GtestUIExample/TestMain.cpp index e00e6d027..cf9a5e130 100644 --- a/bazaar/GoogleTestUIExample/TestMain.cpp +++ b/bazaar/GtestUIExample/TestMain.cpp @@ -1,4 +1,4 @@ -#ifdef flagTESTING_GOOGLE_TEST_UI_EXAMPLE +#ifdef flagTESTING_GTEST_UI_EXAMPLE #include #include diff --git a/bazaar/GoogleTestUIExample/main.cpp b/bazaar/GtestUIExample/main.cpp similarity index 69% rename from bazaar/GoogleTestUIExample/main.cpp rename to bazaar/GtestUIExample/main.cpp index 21c34c6eb..8537dc55c 100644 --- a/bazaar/GoogleTestUIExample/main.cpp +++ b/bazaar/GtestUIExample/main.cpp @@ -4,7 +4,7 @@ using namespace Upp; -#ifndef flagTESTING_GOOGLE_TEST_UI_EXAMPLE +#ifndef flagTESTING_GTEST_UI_EXAMPLE GUI_APP_MAIN { AppWindow().Run();