Mercurial > hg > orthanc-stone
diff UnitTestsSources/GenericToolboxTests.cpp @ 1331:ab81ee8fce1f broker
- Viewport is not passed and stored as a shared_ptr instead
of raw reference.
- ViewportController can now be injected with an undo
stack (not a ctor param anymore, as a preparation for the
move of the undo stack to an interactor)
- Added (temp) flag to disable emscripten events registration
in the WebAssemblyViewport (because legacy client code
deals with them directly)
- Added emscripten_clear_timeout in ~WebGLViewportsRegistry
- Removed GenericToolbox::HoldingRef whose responsibility is
better served with proper callback un-registration.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 30 Mar 2020 14:23:46 +0200 |
| parents | 8d3e669f01a2 |
| children | 5630c2fb7b0f |
line wrap: on
line diff
--- a/UnitTestsSources/GenericToolboxTests.cpp Mon Mar 30 08:47:30 2020 +0200 +++ b/UnitTestsSources/GenericToolboxTests.cpp Mon Mar 30 14:23:46 2020 +0200 @@ -4245,50 +4245,9 @@ EXPECT_EQ(0, blue); } -static int Test_GenericToolbox_HoldingRef_ctor_trace = 100; -static int Test_GenericToolbox_HoldingRef_dtor_trace = 1000; - -class Test_GenericToolbox_HoldingRef : public boost::enable_shared_from_this<Test_GenericToolbox_HoldingRef> -{ -public: - Test_GenericToolbox_HoldingRef() : answer_(42) { Test_GenericToolbox_HoldingRef_ctor_trace++; } - unsigned int answer_; - - ~Test_GenericToolbox_HoldingRef() - { - Test_GenericToolbox_HoldingRef_dtor_trace--; - } -}; - -TEST(GenericToolbox, HoldingRef) -{ - using namespace OrthancStone::GenericToolbox; - - void* userData = NULL; - - { - boost::shared_ptr<Test_GenericToolbox_HoldingRef> test(new Test_GenericToolbox_HoldingRef() ); - Test_GenericToolbox_HoldingRef* This = test.get(); - userData = HoldingRef<Test_GenericToolbox_HoldingRef>::Wrap(This); - EXPECT_EQ(42u,This->answer_); - This->answer_ = 0xdeadbeef; - EXPECT_EQ(0xdeadbeef,This->answer_); - } - - EXPECT_EQ(101,Test_GenericToolbox_HoldingRef_ctor_trace); - EXPECT_EQ(1000,Test_GenericToolbox_HoldingRef_dtor_trace); - - { - boost::shared_ptr<Test_GenericToolbox_HoldingRef> test2 = HoldingRef<Test_GenericToolbox_HoldingRef>::Unwrap(userData); - EXPECT_EQ(0xdeadbeef,test2->answer_); - } - - EXPECT_EQ(999,Test_GenericToolbox_HoldingRef_dtor_trace); // make sure wrapper was deleted once -} - - - - - - - + + + + + +