mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-26 22:57:00 +02:00
73019c204d
grep -r --include \*.h --include \*.cpp "= std::" * | grep -v auto | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return" | grep -v double | grep -v si64 | grep -v si32 | grep -v ui32 | grep \< | grep -v float | tr -d '\t' | grep -v assert > redundant_types.txt
import re
with open("redundant_types.txt") as f:
for line in f:
line = line.strip()
path = line.split(":", 1)[0]
original_code = ":".join(line.split(":")[1:]).strip()
print()
print(path)
print(original_code)
prefix = "auto "
if original_code.startswith("static"):
static = True
else:
static = False
cpp_type = " ".join(original_code.split("=")[0].strip().split(" ")[0:-1])
print(cpp_type)
if static:
new_code = "static auto "+ " ".join(original_code.split(" ")[2:])
else:
new_code = "auto "+ " ".join(original_code.split(" ")[1:])
print(new_code)
if True:
with open(path, "r") as f:
filedata = f.read()
filedata = filedata.replace(original_code, new_code)
with open(path, "w") as f:
f.write(filedata)
117 lines
2.9 KiB
C++
117 lines
2.9 KiB
C++
/*
|
|
* CRmgTemplateTest.cpp, part of VCMI engine
|
|
*
|
|
* Authors: listed in file AUTHORS in main folder
|
|
*
|
|
* License: GNU General Public License v2.0 or later
|
|
* Full text of license available in license.txt file, in main folder
|
|
*
|
|
*/
|
|
#include "StdInc.h"
|
|
|
|
#include "../../lib/JsonNode.h"
|
|
#include "../../lib/filesystem/ResourceID.h"
|
|
|
|
#include "../../lib/rmg/CRmgTemplate.h"
|
|
|
|
#include "../../lib/serializer/JsonSerializer.h"
|
|
#include "../../lib/serializer/JsonDeserializer.h"
|
|
|
|
#include "../JsonComparer.h"
|
|
|
|
|
|
namespace test
|
|
{
|
|
using namespace ::rmg;
|
|
using namespace ::testing;
|
|
|
|
class CRmgTemplateTest : public Test
|
|
{
|
|
public:
|
|
const std::string TEST_DATA_PATH = "test/rmg/";
|
|
|
|
protected:
|
|
|
|
void testLoadSave(const std::string & id, const JsonNode & config)
|
|
{
|
|
auto subject = std::make_shared<CRmgTemplate>();
|
|
subject->setId(id);
|
|
|
|
{
|
|
JsonDeserializer handler(nullptr, config);
|
|
subject->serializeJson(handler);
|
|
}
|
|
|
|
EXPECT_FALSE(subject->getName().empty());
|
|
|
|
for(const auto & idAndZone : subject->getZones())
|
|
{
|
|
auto thisZone = idAndZone.second;
|
|
if(thisZone->getMinesLikeZone() != ZoneOptions::NO_ZONE)
|
|
{
|
|
auto otherZoneId = thisZone->getMinesLikeZone();
|
|
|
|
const auto otherZone = subject->getZones().at(otherZoneId);
|
|
GTEST_ASSERT_NE(otherZone, nullptr);
|
|
EXPECT_THAT(thisZone->getMinesInfo(), ContainerEq(otherZone->getMinesInfo()));
|
|
}
|
|
|
|
if(thisZone->getTerrainTypeLikeZone() != ZoneOptions::NO_ZONE)
|
|
{
|
|
auto otherZoneId = thisZone->getTerrainTypeLikeZone();
|
|
|
|
const auto otherZone = subject->getZones().at(otherZoneId);
|
|
GTEST_ASSERT_NE(otherZone, nullptr);
|
|
EXPECT_THAT(thisZone->getTerrainTypes(), ContainerEq(otherZone->getTerrainTypes()));
|
|
}
|
|
|
|
if(thisZone->getTreasureLikeZone() != ZoneOptions::NO_ZONE)
|
|
{
|
|
auto otherZoneId = thisZone->getTreasureLikeZone();
|
|
|
|
const auto otherZone = subject->getZones().at(otherZoneId);
|
|
GTEST_ASSERT_NE(otherZone, nullptr);
|
|
EXPECT_THAT(thisZone->getTreasureInfo(), ContainerEq(otherZone->getTreasureInfo()));
|
|
}
|
|
}
|
|
|
|
for(const auto & connection : subject->getConnections())
|
|
{
|
|
auto id1 = connection.getZoneA();
|
|
auto id2 = connection.getZoneB();
|
|
|
|
auto zone1 = subject->getZones().at(id1);
|
|
auto zone2 = subject->getZones().at(id2);
|
|
|
|
EXPECT_THAT(zone1->getConnections(), Contains(id2));
|
|
EXPECT_THAT(zone2->getConnections(), Contains(id1));
|
|
}
|
|
|
|
JsonNode actual(JsonNode::JsonType::DATA_STRUCT);
|
|
|
|
{
|
|
JsonSerializer handler(nullptr, actual);
|
|
subject->serializeJson(handler);
|
|
}
|
|
|
|
JsonComparer cmp(false);
|
|
cmp.compare(id, actual, config);
|
|
}
|
|
|
|
|
|
};
|
|
|
|
TEST_F(CRmgTemplateTest, SerializeCycle)
|
|
{
|
|
const std::string testFilePath = TEST_DATA_PATH + "1.json";
|
|
ResourceID testFileRes(testFilePath);
|
|
JsonNode testData(testFileRes);
|
|
|
|
ASSERT_FALSE((testData.Struct().empty()));
|
|
|
|
for(const auto & idAndConfig : testData.Struct())
|
|
testLoadSave(idAndConfig.first, idAndConfig.second);
|
|
}
|
|
|
|
}
|