mirror of
https://github.com/minetest/minetest.git
synced 2025-02-18 19:03:46 +01:00
1298374818
* Upgrade client active object mgr tests to Catch2 In addition to invoking Catch2's test runner after Minetest's homemade runner, this refactors the tests to follow the DRY principle, and gives them expressive names and clear assertions. Catch2 is already bundled with Minetest, so there are no added dependencies. * Increment failed modules count for Catch2 tests * Respect --test-module option for Catch2 tests * Improve Catch2 --test-module behavior This switches infostream to rawstream so that test runner output is displayed, and returns the correct boolean depending on the results. The tests are now found by setting the configuration instead of invoking the command line parser. * Test uniqueness of all IDS instead of just one Co-Authored-By: Lars Müller <appgurulars@gmx.de> * Include Catch2 test run in timing and logging * Flush std::cout after printing Catch results * Increment total tests run instead of hardcoding to 1 * Flush stderr before printing to stdout It's necessary to flush stderr before printing to stdout in adition to flushing stdout before printing to stderr, to make sure all output is ordered correctly. * Make Catch write to rawstream --------- Co-authored-by: Lars Müller <appgurulars@gmx.de>
90 lines
2.2 KiB
C++
90 lines
2.2 KiB
C++
/*
|
|
Minetest
|
|
Copyright (C) 2010-2018 nerzhul, Loic BLOT <loic.blot@unix-experience.fr>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU Lesser General Public License as published by
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <memory>
|
|
#include "debug.h"
|
|
#include "util/container.h"
|
|
#include "irrlichttypes.h"
|
|
#include "util/basic_macros.h"
|
|
|
|
class TestClientActiveObjectMgr;
|
|
class TestServerActiveObjectMgr;
|
|
|
|
template <typename T>
|
|
class ActiveObjectMgr
|
|
{
|
|
friend class ::TestServerActiveObjectMgr;
|
|
|
|
public:
|
|
ActiveObjectMgr() = default;
|
|
DISABLE_CLASS_COPY(ActiveObjectMgr);
|
|
|
|
virtual ~ActiveObjectMgr()
|
|
{
|
|
SANITY_CHECK(m_active_objects.empty());
|
|
// Note: Do not call clear() here. The derived class is already half
|
|
// destructed.
|
|
}
|
|
|
|
virtual void step(float dtime, const std::function<void(T *)> &f) = 0;
|
|
virtual bool registerObject(std::unique_ptr<T> obj) = 0;
|
|
virtual void removeObject(u16 id) = 0;
|
|
|
|
void clear()
|
|
{
|
|
// on_destruct could add new objects so this has to be a loop
|
|
do {
|
|
for (auto &it : m_active_objects.iter()) {
|
|
if (!it.second)
|
|
continue;
|
|
m_active_objects.remove(it.first);
|
|
}
|
|
} while (!m_active_objects.empty());
|
|
}
|
|
|
|
T *getActiveObject(u16 id)
|
|
{
|
|
return m_active_objects.get(id).get();
|
|
}
|
|
|
|
protected:
|
|
u16 getFreeId() const
|
|
{
|
|
// try to reuse id's as late as possible
|
|
static thread_local u16 last_used_id = 0;
|
|
u16 startid = last_used_id;
|
|
while (!isFreeId(++last_used_id)) {
|
|
if (last_used_id == startid)
|
|
return 0;
|
|
}
|
|
|
|
return last_used_id;
|
|
}
|
|
|
|
bool isFreeId(u16 id) const
|
|
{
|
|
return id != 0 && !m_active_objects.get(id);
|
|
}
|
|
|
|
// Note that this is ordered to fix #10985
|
|
ModifySafeMap<u16, std::unique_ptr<T>> m_active_objects;
|
|
};
|