From 7188ac6da27792931f39c599e1169fa70df9dc2f Mon Sep 17 00:00:00 2001
From: NAUD Maxence <maxence.naud@cea.fr>
Date: Tue, 25 Jun 2024 21:59:40 +0000
Subject: [PATCH] Fix sascalToSnake() and snakeToPascal() static function to
accept digits Fix attributes names in cpp tests
---
src/utils/Attributes.cpp | 7 +++--
unit_tests/operator/Test_GenericOperator.cpp | 30 ++++++++++----------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/utils/Attributes.cpp b/src/utils/Attributes.cpp
index c764565b6..e79db53a6 100644
--- a/src/utils/Attributes.cpp
+++ b/src/utils/Attributes.cpp
@@ -11,7 +11,8 @@
#include "aidge/utils/Attributes.hpp"
-#include <cctype> // std::islower, std::isupper, std::tolower, std::toupper
+#include <cctype> // std::isdigit, std::islower, std::isupper, std::tolower,
+ // std::toupper
#include <string>
std::string Aidge::Attributes::snakeToPascal(const std::string& snakeCase) {
@@ -64,7 +65,7 @@ bool Aidge::Attributes::isPascalCase(const std::string& str) {
return false;
}
expectUpper = false;
- } else if (std::islower(str[i])) {
+ } else if (std::islower(str[i]) || std::isdigit(str[i])) {
expectUpper = true;
} else {
return false;
@@ -85,7 +86,7 @@ bool Aidge::Attributes::isSnakeCase(const std::string& str) {
return false;
}
lastCharWasUnderscore = true;
- } else if (!std::islower(ch)) {
+ } else if (!std::islower(ch) && !std::isdigit(ch)) {
return false;
} else {
lastCharWasUnderscore = false;
diff --git a/unit_tests/operator/Test_GenericOperator.cpp b/unit_tests/operator/Test_GenericOperator.cpp
index 8d634cc3a..41bad6974 100644
--- a/unit_tests/operator/Test_GenericOperator.cpp
+++ b/unit_tests/operator/Test_GenericOperator.cpp
@@ -20,7 +20,7 @@ using namespace Aidge;
TEST_CASE("[core/operators] GenericOp(add & get attributes)", "[Operator]") {
SECTION("INT") {
GenericOperator_Op Testop("TestOp", 1, 1, 1);
- const char* key = "intAttr";
+ const char* key = "IntAttr";
Testop.addAttr(key, int(5));
int registeredVal = Testop.getAttr<int>(key);
REQUIRE(registeredVal == 5);
@@ -28,21 +28,21 @@ TEST_CASE("[core/operators] GenericOp(add & get attributes)", "[Operator]") {
SECTION("LONG") {
GenericOperator_Op Testop("TestOp", 1, 1, 1);
long value = 3;
- const char* key = "longAttr";
+ const char* key = "LongAttr";
Testop.addAttr(key, value);
REQUIRE(Testop.getAttr<long>(key) == value);
}
SECTION("FLOAT") {
GenericOperator_Op Testop("TestOp", 1, 1, 1);
float value = 2.0;
- const char* key = "floatAttr";
+ const char* key = "FloatAttr";
Testop.addAttr(key, value);
REQUIRE(Testop.getAttr<float>(key) == value);
}
SECTION("VECTOR<BOOL>") {
GenericOperator_Op Testop("TestOp", 1, 1, 1);
std::vector<bool> value = {true, false, false, true, true};
- const char* key = "vect";
+ const char* key = "Vect";
Testop.addAttr(key, value);
REQUIRE(Testop.getAttr<std::vector<bool>>(key).size() == value.size());
@@ -53,7 +53,7 @@ TEST_CASE("[core/operators] GenericOp(add & get attributes)", "[Operator]") {
SECTION("VECTOR<INT>") {
GenericOperator_Op Testop("TestOp", 1, 1, 1);
std::vector<int> value = {1, 2, 3, 4, 5, 6, 7, 8, 9};
- const char* key = "vect";
+ const char* key = "Vect";
Testop.addAttr(key, value);
REQUIRE(Testop.getAttr<std::vector<int>>(key).size() == value.size());
@@ -66,23 +66,23 @@ TEST_CASE("[core/operators] GenericOp(add & get attributes)", "[Operator]") {
Goal : Test that the offsets are well done by adding different attributes with different size.
*/
GenericOperator_Op Testop("TestOp", 1, 1, 1);
- Testop.addAttr<long>("longAttr", 3);
- Testop.addAttr<float>("floatAttr", 2.0);
- Testop.addAttr<uint8_t>("uint8Attr", 5);
- Testop.addAttr<long long>("llAttr", 10);
- REQUIRE(Testop.getAttr<long>("longAttr") == 3);
- REQUIRE(Testop.getAttr<float>("floatAttr") == 2.0);
- REQUIRE(Testop.getAttr<uint8_t>("uint8Attr") == 5);
- REQUIRE(Testop.getAttr<long long>("llAttr") == 10);
+ Testop.addAttr<long>("LongAttr", 3);
+ Testop.addAttr<float>("FloatAttr", 2.0);
+ Testop.addAttr<uint8_t>("Uint8Attr", 5);
+ Testop.addAttr<long long>("LlAttr", 10);
+ REQUIRE(Testop.getAttr<long>("LongAttr") == 3);
+ REQUIRE(Testop.getAttr<float>("FloatAttr") == 2.0);
+ REQUIRE(Testop.getAttr<uint8_t>("Uint8Attr") == 5);
+ REQUIRE(Testop.getAttr<long long>("LlAttr") == 10);
}
}
TEST_CASE("[core/operator] GenericOp(type check)", "[Operator]") {
SECTION("WRONG TYPE FOR GETTER") {
GenericOperator_Op Testop("TestOp", 1, 1, 1);
- Testop.addAttr<long>("longAttr", 3);
+ Testop.addAttr<long>("LongAttr", 3);
// This line should raise a failled assert
- REQUIRE_THROWS(Testop.getAttr<int>("longAttribute"));
+ REQUIRE_THROWS(Testop.getAttr<int>("LongAttribute"));
}
}
--
GitLab