diff options
Diffstat (limited to 'test/unit')
-rw-r--r-- | test/unit/math/geometry_test.cpp | 2 | ||||
-rw-r--r-- | test/unit/math/matrix_test.cpp | 2 | ||||
-rw-r--r-- | test/unit/math/vector_test.cpp | 2 | ||||
-rw-r--r-- | test/unit/ui/edit_test.cpp | 9 | ||||
-rw-r--r-- | test/unit/ui/mocks/text_mock.h | 3 | ||||
-rw-r--r-- | test/unit/ui/stubs/app_stub.cpp | 14 | ||||
-rw-r--r-- | test/unit/ui/stubs/engine_stub.cpp | 16 | ||||
-rw-r--r-- | test/unit/ui/stubs/particle_stub.cpp | 2 | ||||
-rw-r--r-- | test/unit/ui/stubs/robotmain_stub.cpp | 2 |
9 files changed, 32 insertions, 20 deletions
diff --git a/test/unit/math/geometry_test.cpp b/test/unit/math/geometry_test.cpp index f50df4e..7c3e26a 100644 --- a/test/unit/math/geometry_test.cpp +++ b/test/unit/math/geometry_test.cpp @@ -14,8 +14,6 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. -// math/test/geometry_test.cpp - /* Unit tests for functions in geometry.h */ #include "math/func.h" diff --git a/test/unit/math/matrix_test.cpp b/test/unit/math/matrix_test.cpp index 6ae2c6b..5f5c3af 100644 --- a/test/unit/math/matrix_test.cpp +++ b/test/unit/math/matrix_test.cpp @@ -14,8 +14,6 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. -// math/test/matrix_test.cpp - /* Unit tests for Matrix struct diff --git a/test/unit/math/vector_test.cpp b/test/unit/math/vector_test.cpp index 199f4c3..41bac74 100644 --- a/test/unit/math/vector_test.cpp +++ b/test/unit/math/vector_test.cpp @@ -14,8 +14,6 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. -// math/test/vector_test.cpp - /* Unit tests for Vector struct diff --git a/test/unit/ui/edit_test.cpp b/test/unit/ui/edit_test.cpp index f878f4b..2f31a89 100644 --- a/test/unit/ui/edit_test.cpp +++ b/test/unit/ui/edit_test.cpp @@ -13,19 +13,17 @@ public: virtual void SetUp() { - m_engine = new Gfx::CEngine(&m_iMan, NULL); + m_engine = new Gfx::CEngine(nullptr); - m_iMan.AddInstance(CLASS_ENGINE, m_engine); m_edit = new Ui::CEdit; } virtual void TearDown() { - m_iMan.DeleteInstance(CLASS_ENGINE, m_engine); delete m_engine; - m_engine = NULL; + m_engine = nullptr; delete m_edit; - m_edit = NULL; + m_edit = nullptr; } virtual ~CEditTest() @@ -34,7 +32,6 @@ public: }; protected: - CInstanceManager m_iMan; CApplication m_app; Gfx::CEngine * m_engine; Ui::CEdit * m_edit; diff --git a/test/unit/ui/mocks/text_mock.h b/test/unit/ui/mocks/text_mock.h index f0ad339..9289481 100644 --- a/test/unit/ui/mocks/text_mock.h +++ b/test/unit/ui/mocks/text_mock.h @@ -1,4 +1,5 @@ #include "common/logger.h" + #include "graphics/engine/text.h" #include <gmock/gmock.h> @@ -6,7 +7,7 @@ class CTextMock : public Gfx::CText { public: - CTextMock(CInstanceManager *iMan, Gfx::CEngine* engine) : CText(iMan, engine) + CTextMock(Gfx::CEngine* engine) : CText(engine) { } diff --git a/test/unit/ui/stubs/app_stub.cpp b/test/unit/ui/stubs/app_stub.cpp index 70d9e82..094806f 100644 --- a/test/unit/ui/stubs/app_stub.cpp +++ b/test/unit/ui/stubs/app_stub.cpp @@ -1,7 +1,8 @@ #include "app/app.h" + #include "graphics/opengl/gldevice.h" -template<> CApplication* CSingleton<CApplication>::mInstance = nullptr; +template<> CApplication* CSingleton<CApplication>::m_instance = nullptr; namespace Gfx { @@ -10,6 +11,8 @@ GLDeviceConfig::GLDeviceConfig() } } /* Gfx */ + + CApplication::CApplication() { } @@ -23,4 +26,13 @@ std::string CApplication::GetDataFilePath(DataDir /* dataDir */, const std::stri return subpath; } +CSoundInterface* CApplication::GetSound() +{ + return nullptr; +} + +CEventQueue* CApplication::GetEventQueue() +{ + return nullptr; +} diff --git a/test/unit/ui/stubs/engine_stub.cpp b/test/unit/ui/stubs/engine_stub.cpp index de7bbe7..40886da 100644 --- a/test/unit/ui/stubs/engine_stub.cpp +++ b/test/unit/ui/stubs/engine_stub.cpp @@ -1,20 +1,28 @@ #include "graphics/engine/engine.h" #include "graphics/engine/text.h" + #include "mocks/text_mock.h" +template<> Gfx::CEngine* CSingleton<Gfx::CEngine>::m_instance = nullptr; + namespace Gfx { -CEngine::CEngine(CInstanceManager* iMan, CApplication* app) : - m_iMan(iMan), m_app(app) +CEngine::CEngine(CApplication* app) : + m_app(app) { - m_text = new CTextMock(m_iMan, this); + m_text = new CTextMock(this); m_text->Create(); } CEngine::~CEngine() { delete m_text; - m_text = NULL; + m_text = nullptr; +} + +CParticle* CEngine::GetParticle() +{ + return nullptr; } Math::Point CEngine::WindowToInterfaceSize(Math::IntPoint size) diff --git a/test/unit/ui/stubs/particle_stub.cpp b/test/unit/ui/stubs/particle_stub.cpp index c3bf6dc..34cf973 100644 --- a/test/unit/ui/stubs/particle_stub.cpp +++ b/test/unit/ui/stubs/particle_stub.cpp @@ -7,7 +7,7 @@ namespace Gfx { -CParticle::CParticle(CInstanceManager* /*iMan*/, CEngine* /*engine*/) +CParticle::CParticle(CEngine* /*engine*/) { } diff --git a/test/unit/ui/stubs/robotmain_stub.cpp b/test/unit/ui/stubs/robotmain_stub.cpp index a36b1a1..c332d5a 100644 --- a/test/unit/ui/stubs/robotmain_stub.cpp +++ b/test/unit/ui/stubs/robotmain_stub.cpp @@ -1,7 +1,7 @@ #include "object/robotmain.h" -template<> CRobotMain* CSingleton<CRobotMain>::mInstance = nullptr; +template<> CRobotMain* CSingleton<CRobotMain>::m_instance = nullptr; bool CRobotMain::GetGlint() { |