Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11362 from WenhaiLin/v3-autotest 

Test automation support: Fixed may not to restore TestList to the original position.
This commit is contained in:
minggo 2015-04-09 16:51:59 +08:00
parent 4e4b8bcea0 8b839edfde
commit 96f446ad93
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/cpp-tests/Classes/BaseTest.cpp
View File

@ -128,6 +128,7 @@ protected:
TestList::TestList()
{
_isTestList = true;
_shouldRestoreTableOffset = false;
}
void TestList::addTest(const std::string& testName, std::function<TestBase*()> callback)
@ -156,7 +157,7 @@ void TestList::runThisTest()
scene->addChild(tableView);
tableView->reloadData();
if (_tableOffset != Vec2::ZERO)
if (_shouldRestoreTableOffset)
{
tableView->setContentOffset(_tableOffset);
}
@ -217,7 +218,7 @@ void TestList::tableCellTouched(TableView* table, TableViewCell* cell)
if (test->getChildTestCount() > 0)
{
_tableOffset = table->getContentOffset();
_shouldRestoreTableOffset = true;
_cellTouchEnabled = false;
test->setTestParent(this);
test->runThisTest();

1
tests/cpp-tests/Classes/BaseTest.h
View File

@ -195,6 +195,7 @@ public:
private:
std::vector<std::function<TestBase*()>> _testCallbacks;
bool _cellTouchEnabled;
bool _shouldRestoreTableOffset;
cocos2d::Vec2 _tableOffset;
friend class TestController;
};