mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 16:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: IocContainer: Don't delete TlsIndex.

Browse Source 
Several unit tests can run in parallel.
This commit is contained in:
Nodir Temirkhodjaev 2021-06-03 17:24:19 +03:00
parent 121619a939
commit 4a75936f97
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/UtilTest/tst_ioccontainer.h
View File

@ -88,8 +88,10 @@ TEST_F(IocContainerTest, insert)
container.setService<IocTest::B>(b); container.setService<IocTest::B>(b);
ASSERT_EQ(container.resolve<IocTest::A>(), a2); ASSERT_EQ(container.resolve<IocTest::A>(), a2);
ASSERT_EQ(container.resolve<IocTest::B>(), &b);
ASSERT_TRUE(container.pinToThread()); ASSERT_TRUE(container.pinToThread());
ASSERT_EQ(IoC<IocTest::A>(), a2); ASSERT_EQ(IoC<IocTest::A>(), a2);
ASSERT_EQ(IoC<IocTest::B>(), &b);
} }
TEST_F(IocContainerTest, setUp) TEST_F(IocContainerTest, setUp)

4
src/ui/util/ioc/ioccontainer.cpp
View File

@ -22,6 +22,7 @@ void createTlsIndex()
} }
} }
#if 0
void deleteTlsIndex() void deleteTlsIndex()
{ {
if (g_tlsIndex != -1) { if (g_tlsIndex != -1) {
@ -29,6 +30,7 @@ void deleteTlsIndex()
g_tlsIndex = -1; g_tlsIndex = -1;
} }
} }
#endif
} }
@ -37,8 +39,6 @@ IocContainer::IocContainer(QObject *parent) : QObject(parent) { }
IocContainer::~IocContainer() IocContainer::~IocContainer()
{ {
autoDeleteAll(); autoDeleteAll();
deleteTlsIndex();
} }
void IocContainer::setObject(int typeId, IocObject *obj, quint8 flags) void IocContainer::setObject(int typeId, IocObject *obj, quint8 flags)