Bazzar: Google test example packages naming simplification.

git-svn-id: svn://ultimatepp.org/upp/trunk@14993 f0d560ea-af0d-0410-9eb7-867de7ffcac7

bazaar/GoogleTestUIExample/GoogleTestUIExample.upp

@@ -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";
-

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
 	"" = "";

bazaar/GtestUIExample/AppWindow.h

@@ -13,7 +13,7 @@ namespace Upp
 	public:
 		AppWindow();
 	
-	protected:
+	private:
 		virtual void OnButtonClick();
 	};
 }

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";
+

bazaar/GtestUIExample/TestAppWindow.cpp

@@ -1,9 +1,8 @@
-#ifdef flagTESTING_GOOGLE_TEST_UI_EXAMPLE
+#ifdef flagTESTING_GTEST_UI_EXAMPLE
 
 #include "AppWindow.h"
 
 #include <plugin/gmock/gmock.h>
-#include <memory>
 
 using namespace Upp;
 

bazaar/GtestUIExample/TestMain.cpp

@@ -1,4 +1,4 @@
-#ifdef flagTESTING_GOOGLE_TEST_UI_EXAMPLE
+#ifdef flagTESTING_GTEST_UI_EXAMPLE
 
 #include <CtrlLib/CtrlLib.h>
 #include <plugin/gtest/gtest.h>

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();