From 36c58ad295b520add049a34350eea978cb901724 Mon Sep 17 00:00:00 2001 From: Vladislav Kalugin Date: Thu, 14 Dec 2023 17:39:45 +0300 Subject: [PATCH] Fix compare char with string literal in for --- server/src/visitors/AbstractValueViewVisitor.cpp | 1 + server/src/visitors/ParametrizedAssertsVisitor.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/src/visitors/AbstractValueViewVisitor.cpp b/server/src/visitors/AbstractValueViewVisitor.cpp index 184ab1fe..7923e366 100644 --- a/server/src/visitors/AbstractValueViewVisitor.cpp +++ b/server/src/visitors/AbstractValueViewVisitor.cpp @@ -76,6 +76,7 @@ namespace visitor { visitArrayElementAfter(newType, newName, newView, newAccess, depth + 1); } } + void AbstractValueViewVisitor::visitCString(const types::Type &type, const std::string &name, const tests::AbstractValueView *view, diff --git a/server/src/visitors/ParametrizedAssertsVisitor.cpp b/server/src/visitors/ParametrizedAssertsVisitor.cpp index 265570aa..2d939e43 100644 --- a/server/src/visitors/ParametrizedAssertsVisitor.cpp +++ b/server/src/visitors/ParametrizedAssertsVisitor.cpp @@ -90,7 +90,7 @@ namespace visitor { PrinterUtils::ACTUAL, functionCall, std::nullopt, true, additionalPointersCount); printer->strDeclareVar(type.typeName(), - PrinterUtils::fillVarName(access, PrinterUtils::EXPECTED), value); + PrinterUtils::fillVarName(access, PrinterUtils::EXPECTED), value); } else { printer->ss << value << NL; } @@ -110,7 +110,8 @@ namespace visitor { additionalPointersCount); const auto >estMacro = predicateMapping.at(predicate); auto signature = - processExpect(type, gtestMacro, {view->getEntryValue(printer), getDecorateActualVarName(access)}); + processExpect(type, gtestMacro, + {view->getEntryValue(printer), getDecorateActualVarName(access)}); signature = changeSignatureToNullCheck(signature, type, view, access); printer->strFunctionCall(signature.name, signature.args, SCNL, std::nullopt, true, 0, std::nullopt, inUnion); @@ -121,7 +122,8 @@ namespace visitor { } const auto >estMacro = predicateMapping.at(predicate); auto signature = processExpect(type, gtestMacro, - {getDecorateActualVarName(access), view->getEntryValue(printer)}); + {getDecorateActualVarName(access), + PrinterUtils::fillVarName(access, PrinterUtils::EXPECTED)}); signature = changeSignatureToNullCheck(signature, type, view, access); printer->strFunctionCall(signature.name, signature.args, SCNL, std::nullopt, true, 0, std::nullopt, inUnion);