kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #21462 from hyarion/minor-unit-fixes

Browse Source 
Base: Add some tests for units and minor fixes
This commit is contained in:
Kacper Donat
2025-05-20 15:59:52 +02:00
committed by GitHub
parent 2d413d271c 9efd6baee9
commit 448976dfc5
2 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Base/UnitsApiPy.cpp
View File

@@ -89,9 +89,7 @@ PyObject* UnitsApi::sParseQuantity(PyObject* /*self*/, PyObject* args)
return new QuantityPy(new Quantity(Quantity::parse(str)));
}
catch (const ParserError&) {
PyErr_Format(PyExc_ValueError,
"invalid unit expression: '%s'\n",
std::string {pstr}.c_str());
PyErr_Format(PyExc_ValueError, "invalid unit expression: '%s'\n", str.c_str());
return nullptr;
}
}

41
tests/src/Base/SchemaTests.cpp
View File

@@ -315,18 +315,51 @@ TEST_F(SchemaTest, imperial_building_special_function_length_foot)
EXPECT_EQ(result, expect);
}
/*
* QuantityParser::yyparse() is crashing on the >>1' 2" + 1/4"<< input,
* so disable this test
TEST_F(SchemaTest, imperial_building_special_function_zero_length)
{
const auto result = set("ImperialBuilding", Unit::Length, 0.0);
const auto expect = Tools::escapeQuotesFromString("0");
EXPECT_EQ(result, expect);
}
TEST_F(SchemaTest, imperial_building_special_function_length_negative_fraction_only)
{
constexpr auto val {(-1.0 / 8.0) * 25.4}; // -1/8 inch in mm
const auto result = set("ImperialBuilding", Unit::Length, val);
const auto expect = Tools::escapeQuotesFromString("-1/8\"");
EXPECT_EQ(result, expect);
}
TEST_F(SchemaTest, imperial_building_special_function_negative_inches_and_fraction)
{
constexpr auto val {-2.5 * 25.4}; // -2.5 inches in mm
const auto result = set("ImperialBuilding", Unit::Length, val);
const auto expect = Tools::escapeQuotesFromString("-2\" - 1/2\"");
EXPECT_EQ(result, expect);
}
TEST_F(SchemaTest, imperial_building_special_function_high_precision_rounding)
{
constexpr auto val {25.396}; // Very close to exactly 1 inch
const auto result = set("ImperialBuilding", Unit::Length, val);
const auto expect = Tools::escapeQuotesFromString("1\"");
EXPECT_EQ(result, expect);
}
TEST_F(SchemaTest, imperial_building_special_function_length)
{
GTEST_SKIP() << "QuantityParser::yyparse() is crashing on the >>1' 2\" + 1/4\"<< input, "
"so disable this test";
constexpr auto val {360.6};
const auto result = set("ImperialBuilding", Unit::Length, val);
const auto expect = Tools::escapeQuotesFromString("1' 2\" + 1/4\"");
EXPECT_EQ(result, expect);
}
*/
TEST_F(SchemaTest, imperial_building_special_function_length_neg)
{