update cpp example, small fix for c++

Author: ladisgin

integration-tests/cpp-example/Refs.cpp

@@ -51,7 +51,7 @@ Point_2d operator-(Point_2d lhs, const Point_2d& rhs) {
 }
 
 
-double get_dist(const Point_2d& lhs, Point_2d& rhs) {
+double get_dist(const Point_2d& lhs, const Point_2d& rhs) {
     auto t = lhs - rhs;
     return t.get_dist_to_zero();
 }

integration-tests/cpp-example/Refs.h

@@ -6,8 +6,9 @@
 #define POINT_2D_HPP
 
 class Point_2d {
-public:
+private:
   int x;
+public:
   int y;
 
   Point_2d();
@@ -24,12 +25,15 @@ class Point_2d {
   friend Point_2d operator-(Point_2d lhs, const Point_2d& rhs);
 
   double get_dist_to_zero() const;
+  friend double get_dist(const Point_2d& lhs, const Point_2d& rhs);
+  friend void set_to_zero(Point_2d& point);
+  friend void set_abs_by_ref(Point_2d& point);
 };
 
 Point_2d operator+(const Point_2d& lhs, const Point_2d& rhs);
 Point_2d operator-(Point_2d lhs, const Point_2d& rhs);
 
-double get_dist(const Point_2d& lhs, Point_2d& rhs);
+double get_dist(const Point_2d& lhs, const Point_2d& rhs);
 
 void set_to_zero(Point_2d& point);
 

integration-tests/cpp-example/SimpleClass.cpp

@@ -2,7 +2,8 @@
  * Copyright (c) Huawei Technologies Co., Ltd. 2012-2021. All rights reserved.
  */
 
-#include "triangle.hpp"
+#include "triangle.h"
+#include "point_2d.hpp"
 #include <cmath>
 
 
@@ -35,9 +36,9 @@ double Triangle::get_perimeter() {
 }
 
 double Triangle::get_area() {
-    auto side1 = get_dist(vertex[0], vertex[1]);
-    auto side2 = get_dist(vertex[1], vertex[2]);
-    auto side3 = get_dist(vertex[2], vertex[0]);
+    double side1 = get_dist(vertex[0], vertex[1]);
+    double side2 = get_dist(vertex[1], vertex[2]);
+    double side3 = get_dist(vertex[2], vertex[0]);
     auto p = this->get_perimeter();
     return sqrt(p * (p - side1) * (p - side2) * (p - side3));
 }

integration-tests/cpp-example/SimpleClass.h

@@ -2,8 +2,6 @@
  * Copyright (c) Huawei Technologies Co., Ltd. 2012-2021. All rights reserved.
  */
 
-#include "SimpleClass.h"
-
 int main(int argc, char** argv) {
     return 0;
 }

integration-tests/cpp-example/VirtualMethods.cpp

@@ -80,7 +80,7 @@ fs::path KleePrinter::writeTmpKleeFile(
     ss << NL;
     writeStubsForStructureFields(tests);
 
-    writePrivateAccessMacros(typesHandler, tests);
+    writePrivateAccessMacros(typesHandler, tests, false);
 
     for (const auto &[methodName, testMethod] : tests.methods) {
         if (!methodFilter(testMethod)) {
@@ -354,8 +354,7 @@ void KleePrinter::genReturnDeclaration(const Tests::MethodDescription &testMetho
                           : testMethod.returnType;
     bool maybeArray = returnType.maybeReturnArray();
     bool isPointer = testMethod.returnType.isObjectPointer();
-    auto baseType = returnType.baseType();
-    ss << TAB_N() << returnType.baseType() << " " << KleeUtils::RESULT_VARIABLE_NAME;
+    strDeclareVar(returnType.baseType(), KleeUtils::RESULT_VARIABLE_NAME, std::nullopt, std::nullopt, false);
     makeBracketsForStrPredicate(predicateInfo);
     if (maybeArray) {
         size_t size = types::TypesHandler::getElementsNumberInPointerOneDim(PointerUsage::RETURN);

integration-tests/cpp-example/VirtualMethods.h

@@ -97,6 +97,8 @@ namespace printer {
         if (needDecorate()) {
             ss << NameDecorator::decorate(type) << additionalPointers << " "
                << NameDecorator::decorate(name);
+        } else if (getLanguage() == utbot::Language::CXX) {
+            ss << types::TypesHandler::cBoolToCpp(std::string(type)) << additionalPointers << " " << name;
         } else {
             ss << type << additionalPointers << " " << name;
         }
@@ -579,7 +581,7 @@ namespace printer {
                          stubName, "stub", makeStatic);
     }
 
-    void Printer::writePrivateAccessMacros(types::TypesHandler const *typesHandler, const Tests &tests) {
+    void Printer::writePrivateAccessMacros(types::TypesHandler const *typesHandler, const Tests &tests, bool onlyChangeable) {
         if (srcLanguage == utbot::Language::CXX) {
             ss << NL;
             strInclude("access_private.hpp");
@@ -588,7 +590,7 @@ namespace printer {
             for (const auto &[methodName, testMethod] : tests.methods) {
                 addAccessor(typesHandler, testMethod.returnType, checkedOnPrivate);
                 for (const auto& param : testMethod.params) {
-                    if (param.isChangeable()) {
+                    if (!onlyChangeable || param.isChangeable()) {
                         addAccessor(typesHandler, param.type, checkedOnPrivate);
                     }
                 }

integration-tests/cpp-example/build.sh

@@ -229,7 +229,7 @@ namespace printer {
                                const string& name,
                                const string& stubName, bool needToTypedef, bool makeStatic);
 
-        void writePrivateAccessMacros(types::TypesHandler const *typesHandler, const Tests &tests);
+        void writePrivateAccessMacros(types::TypesHandler const *typesHandler, const Tests &tests, bool onlyChangeable);
 
         void genStubForStructFunctionPointer(const string& structName,
                                              const string& fieldName,

integration-tests/cpp-example/cxx_lib/point_2d.cpp

@@ -176,7 +176,7 @@ void TestsPrinter::genHeaders(Tests &tests, const fs::path& generatedHeaderPath)
         }
     }
 
-    writePrivateAccessMacros(typesHandler, tests);
+    writePrivateAccessMacros(typesHandler, tests, true);
 }
 
 static string getTestName(const Tests::MethodDescription &methodDescription, int testNum) {