From 88746ddf94661ee8cd011791c4b9f8be9feb03dd Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 16 Aug 2022 01:20:59 +0300 Subject: test: yaml-parser: Simplify code by centralizing parse error checks Centralize most parse failure checks in a single function to avoid a larger number of copies of nearly identical checks. Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder Reviewed-by: Jacopo Mondi --- test/yaml-parser.cpp | 301 ++++++++++++++++----------------------------------- 1 file changed, 91 insertions(+), 210 deletions(-) (limited to 'test') diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp index 93ba88b8..6729e1bd 100644 --- a/test/yaml-parser.cpp +++ b/test/yaml-parser.cpp @@ -72,132 +72,148 @@ protected: return TestPass; } - int run() + enum class Type { + String, + Int32, + UInt32, + Double, + Size, + List, + Dictionary, + }; + + int testObjectType(const YamlObject &obj, const char *name, Type type) { - /* Test invalid YAML file */ - File file{ invalidYamlFile_ }; - if (!file.open(File::OpenModeFlag::ReadOnly)) { - cerr << "Fail to open invalid YAML file" << std::endl; - return TestFail; - } + bool isList = type == Type::List || type == Type::Size; + bool isScalar = !isList && type != Type::Dictionary; + bool isInteger = type == Type::Int32 || type == Type::UInt32; + bool isSigned = type == Type::Int32; - std::unique_ptr root = YamlParser::parse(file); - if (root) { - cerr << "Invalid YAML file parse successfully" << std::endl; + if ((isScalar && !obj.isValue()) || (!isScalar && obj.isValue())) { + std::cerr + << "Object " << name << " type mismatch when compared to " + << "value" << std::endl; return TestFail; } - /* Test YAML file */ - file.close(); - file.setFileName(testYamlFile_); - if (!file.open(File::OpenModeFlag::ReadOnly)) { - cerr << "Fail to open test YAML file" << std::endl; + if ((isList && !obj.isList()) || (!isList && obj.isList())) { + std::cerr + << "Object " << name << " type mismatch when compared to " + << "list" << std::endl; return TestFail; } - root = YamlParser::parse(file); - - if (!root) { - cerr << "Fail to parse test YAML file: " << std::endl; + if ((type == Type::Dictionary && !obj.isDictionary()) || + (type != Type::Dictionary && obj.isDictionary())) { + std::cerr + << "Object " << name << " type mismatch when compared to " + << "dictionary" << std::endl; return TestFail; } - if (!root->isDictionary()) { - cerr << "YAML root is not dictionary" << std::endl; + if (!isScalar && obj.get()) { + std::cerr + << "Object " << name << " didn't fail to parse as " + << "string" << std::endl; return TestFail; } - if (!root->contains("string")) { - cerr << "Missing string object in YAML root" << std::endl; + if (!isInteger && obj.get()) { + std::cerr + << "Object " << name << " didn't fail to parse as " + << "int32_t" << std::endl; return TestFail; } - if (!root->contains("double")) { - cerr << "Missing double object in YAML root" << std::endl; + if ((!isInteger || isSigned) && obj.get()) { + std::cerr + << "Object " << name << " didn't fail to parse as " + << "uint32_t" << std::endl; return TestFail; } - if (!root->contains("int32_t")) { - cerr << "Missing int32_t object in YAML root" << std::endl; + if (!isInteger && type != Type::Double && obj.get()) { + std::cerr + << "Object " << name << " didn't fail to parse as " + << "double" << std::endl; return TestFail; } - if (!root->contains("uint32_t")) { - cerr << "Missing uint32_t object in YAML root" << std::endl; + if (type != Type::Size && obj.get()) { + std::cerr + << "Object " << name << " didn't fail to parse as " + << "Size" << std::endl; return TestFail; } - if (!root->contains("size")) { - cerr << "Missing Size object in YAML root" << std::endl; - return TestFail; - } + return TestPass; + } - if (!root->contains("list")) { - cerr << "Missing list object in YAML root" << std::endl; + int run() + { + /* Test invalid YAML file */ + File file{ invalidYamlFile_ }; + if (!file.open(File::OpenModeFlag::ReadOnly)) { + cerr << "Fail to open invalid YAML file" << std::endl; return TestFail; } - if (!root->contains("dictionary")) { - cerr << "Missing dictionary object in YAML root" << std::endl; + std::unique_ptr root = YamlParser::parse(file); + if (root) { + cerr << "Invalid YAML file parse successfully" << std::endl; return TestFail; } - if (!root->contains("level1")) { - cerr << "Missing leveled object in YAML root" << std::endl; + /* Test YAML file */ + file.close(); + file.setFileName(testYamlFile_); + if (!file.open(File::OpenModeFlag::ReadOnly)) { + cerr << "Fail to open test YAML file" << std::endl; return TestFail; } - /* Test string object */ - auto &strObj = (*root)["string"]; + root = YamlParser::parse(file); - if (strObj.isDictionary()) { - cerr << "String object parse as Dictionary" << std::endl; + if (!root) { + cerr << "Fail to parse test YAML file: " << std::endl; return TestFail; } - if (strObj.isList()) { - cerr << "String object parse as List" << std::endl; + if (!root->isDictionary()) { + cerr << "YAML root is not dictionary" << std::endl; return TestFail; } - if (strObj.get().value_or("") != "libcamera" || - strObj.get("") != "libcamera") { - cerr << "String object parse as wrong content" << std::endl; - return TestFail; - } + std::vector rootElemNames = { + "string", "double", "int32_t", "uint32_t", "size", + "list", "dictionary", "level1", + }; - if (strObj.get()) { - cerr << "String object parse as integer" << std::endl; - return TestFail; + for (const char *name : rootElemNames) { + if (!root->contains(name)) { + cerr << "Missing " << name << " object in YAML root" + << std::endl; + return TestFail; + } } - if (strObj.get()) { - cerr << "String object parse as unsigned integer" << std::endl; - return TestFail; - } + /* Test string object */ + auto &strObj = (*root)["string"]; - if (strObj.get()) { - cerr << "String object parse as double" << std::endl; + if (testObjectType(strObj, "string", Type::String) != TestPass) return TestFail; - } - if (strObj.get()) { - cerr << "String object parse as Size" << std::endl; + if (strObj.get().value_or("") != "libcamera" || + strObj.get("") != "libcamera") { + cerr << "String object parse as wrong content" << std::endl; return TestFail; } /* Test int32_t object */ auto &int32Obj = (*root)["int32_t"]; - if (int32Obj.isDictionary()) { - cerr << "Integer object parse as Dictionary" << std::endl; - return TestFail; - } - - if (int32Obj.isList()) { - cerr << "Integer object parse as Integer" << std::endl; + if (testObjectType(int32Obj, "int32_t", Type::Int32) != TestPass) return TestFail; - } if (int32Obj.get().value_or(0) != -100 || int32Obj.get(0) != -100) { @@ -217,28 +233,11 @@ protected: return TestFail; } - if (int32Obj.get()) { - cerr << "Negative integer object parse as unsigned integer" << std::endl; - return TestFail; - } - - if (int32Obj.get()) { - cerr << "Integer object parse as Size" << std::endl; - return TestFail; - } - /* Test uint32_t object */ auto &uint32Obj = (*root)["uint32_t"]; - if (uint32Obj.isDictionary()) { - cerr << "Unsigned integer object parse as Dictionary" << std::endl; + if (testObjectType(uint32Obj, "uint32_t", Type::UInt32) != TestPass) return TestFail; - } - - if (uint32Obj.isList()) { - cerr << "Unsigned integer object parse as List" << std::endl; - return TestFail; - } if (uint32Obj.get().value_or(0) != 100 || uint32Obj.get(0) != 100) { @@ -264,23 +263,11 @@ protected: return TestFail; } - if (uint32Obj.get()) { - cerr << "Unsigned integer object parsed as Size" << std::endl; - return TestFail; - } - /* Test double value */ auto &doubleObj = (*root)["double"]; - if (doubleObj.isDictionary()) { - cerr << "Double object parse as Dictionary" << std::endl; + if (testObjectType(doubleObj, "double", Type::Double) != TestPass) return TestFail; - } - - if (doubleObj.isList()) { - cerr << "Double object parse as List" << std::endl; - return TestFail; - } if (doubleObj.get().value_or("") != "3.14159" || doubleObj.get("") != "3.14159") { @@ -294,53 +281,11 @@ protected: return TestFail; } - if (doubleObj.get()) { - cerr << "Double object parse as integer" << std::endl; - return TestFail; - } - - if (doubleObj.get()) { - cerr << "Double object parse as unsigned integer" << std::endl; - return TestFail; - } - - if (doubleObj.get()) { - cerr << "Double object parse as Size" << std::endl; - return TestFail; - } - /* Test Size value */ auto &sizeObj = (*root)["size"]; - if (sizeObj.isDictionary()) { - cerr << "Size object parse as Dictionary" << std::endl; + if (testObjectType(sizeObj, "size", Type::Size) != TestPass) return TestFail; - } - - if (!sizeObj.isList()) { - cerr << "Size object parse as List" << std::endl; - return TestFail; - } - - if (sizeObj.get()) { - cerr << "Size object parse as string" << std::endl; - return TestFail; - } - - if (sizeObj.get()) { - cerr << "Size object parse as double" << std::endl; - return TestFail; - } - - if (sizeObj.get()) { - cerr << "Size object parse as integer" << std::endl; - return TestFail; - } - - if (sizeObj.get()) { - cerr << "Size object parse as unsigned integer" << std::endl; - return TestFail; - } if (sizeObj.get().value_or(Size(0, 0)) != Size(1920, 1080) || sizeObj.get(Size(0, 0)) != Size(1920, 1080)) { @@ -351,40 +296,8 @@ protected: /* Test list object */ auto &listObj = (*root)["list"]; - if (listObj.isDictionary()) { - cerr << "List object parse as Dictionary" << std::endl; + if (testObjectType(listObj, "list", Type::List) != TestPass) return TestFail; - } - - if (!listObj.isList()) { - cerr << "List object fail to parse as List" << std::endl; - return TestFail; - } - - if (listObj.get()) { - cerr << "List object parse as string" << std::endl; - return TestFail; - } - - if (listObj.get()) { - cerr << "List object parse as double" << std::endl; - return TestFail; - } - - if (listObj.get()) { - cerr << "List object parse as integer" << std::endl; - return TestFail; - } - - if (listObj.get()) { - cerr << "List object parse as unsigne integer" << std::endl; - return TestFail; - } - - if (listObj.get()) { - cerr << "String list object parse as Size" << std::endl; - return TestFail; - } static constexpr std::array listValues{ "James", @@ -424,40 +337,8 @@ protected: /* Test dictionary object */ auto &dictObj = (*root)["dictionary"]; - if (!dictObj.isDictionary()) { - cerr << "Dictionary object fail to parse as Dictionary" << std::endl; - return TestFail; - } - - if (dictObj.isList()) { - cerr << "Dictionary object parse as List" << std::endl; - return TestFail; - } - - if (dictObj.get()) { - cerr << "Dictionary object parse as string" << std::endl; - return TestFail; - } - - if (dictObj.get()) { - cerr << "Dictionary object parse as double" << std::endl; - return TestFail; - } - - if (dictObj.get()) { - cerr << "Dictionary object parse as integer" << std::endl; - return TestFail; - } - - if (dictObj.get()) { - cerr << "Dictionary object parse as unsigned integer" << std::endl; + if (testObjectType(dictObj, "dictionary", Type::Dictionary) != TestPass) return TestFail; - } - - if (dictObj.get()) { - cerr << "Dictionary object parse as Size" << std::endl; - return TestFail; - } static constexpr std::array, 3> dictValues{ { { "a", 1 }, -- cgit v1.2.1