Skip to content

Commit e060d31

Browse files
sava-cskasava-cska
committed
Add counter of read/write bytes in files
1 parent 54ca965 commit e060d31

File tree

10 files changed

+73
-27
lines changed

10 files changed

+73
-27
lines changed

‎server/src/Tests.cpp‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -971,13 +971,30 @@ void KTestObjectParser::processSymbolicStdin(Tests::TestCaseDescription &testCas
971971

972972
void KTestObjectParser::processSymbolicFiles(Tests::TestCaseDescription &testCaseDescription,
973973
const std::vector<RawKleeParam> &rawKleeParams) {
974-
std::vector<Tests::TestCaseParamValue> filesValues(types::Type::symFilesCount);
975-
for (char fileName = 'A'; fileName < 'A' + types::Type::symFilesCount; fileName++) {
974+
std::vector<Tests::FileInfo> filesValues(types::Type::symFilesCount);
975+
int fileIndex = 0;
976+
for (char fileName = 'A'; fileName < 'A' + types::Type::symFilesCount; fileName++, fileIndex++) {
977+
std::string readBytesName = PrinterUtils::getFileReadBytesParamKTestJSON(fileName);
978+
auto &&readBytes = getKleeParamOrThrow(rawKleeParams, readBytesName);
979+
filesValues[fileIndex].readBytes = std::stoi(
980+
testParameterView(readBytes, { types::Type::longlongType(), readBytesName },
981+
types::PointerUsage::PARAMETER, testCaseDescription.lazyAddressToName,
982+
testCaseDescription.lazyReferences)
983+
->getEntryValue(nullptr));
984+
985+
std::string writeBytesName = PrinterUtils::getFileWriteBytesParamKTestJSON(fileName);
986+
auto &&writeBytes = getKleeParamOrThrow(rawKleeParams, writeBytesName);
987+
filesValues[fileIndex].writeBytes = std::stoi(
988+
testParameterView(writeBytes, { types::Type::longlongType(), writeBytesName },
989+
types::PointerUsage::PARAMETER, testCaseDescription.lazyAddressToName,
990+
testCaseDescription.lazyReferences)
991+
->getEntryValue(nullptr));
992+
976993
auto &&fileBuffer =
977994
getKleeParamOrThrow(rawKleeParams, PrinterUtils::getFileParamKTestJSON(fileName));
978-
auto &&testParamView = stringLiteralView(fileBuffer.rawData, types::Type::symInputSize);
979-
filesValues[fileName - 'A'] = Tests::TestCaseParamValue(
980-
types::Type::getFileParamName(fileName), std::nullopt, testParamView);
995+
filesValues[fileIndex].data =
996+
stringLiteralView(fileBuffer.rawData, filesValues[fileIndex].readBytes)
997+
->getEntryValue(nullptr);
981998
}
982999
testCaseDescription.filesValues = filesValues;
9831000
}

‎server/src/Tests.h‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,12 @@ namespace tests {
392392
view(std::move(_view)) {}
393393
};
394394

395+
struct FileInfo {
396+
std::string data;
397+
int readBytes;
398+
int writeBytes;
399+
};
400+
395401
struct TestCaseDescription {
396402
std::string suiteName;
397403

@@ -410,8 +416,8 @@ namespace tests {
410416
TestCaseParamValue returnValue;
411417
TestCaseParamValue functionReturnNotNullValue;
412418
TestCaseParamValue kleePathFlagSymbolicValue;
413-
std::optional <TestCaseParamValue> stdinValue = std::nullopt;
414-
std::optional <std::vector<TestCaseParamValue>> filesValues = std::nullopt;
419+
std::optional<TestCaseParamValue> stdinValue = std::nullopt;
420+
std::optional<std::vector<FileInfo>> filesValues;
415421
std::optional<TestCaseParamValue> classPreValues;
416422
std::optional<TestCaseParamValue> classPostValues;
417423
};
@@ -423,8 +429,8 @@ namespace tests {
423429

424430
std::vector<TestCaseParamValue> globalPreValues;
425431
std::vector<TestCaseParamValue> globalPostValues;
426-
std::optional <TestCaseParamValue> stdinValue;
427-
std::optional <std::vector<TestCaseParamValue>> filesValues = std::nullopt;
432+
std::optional<TestCaseParamValue> stdinValue;
433+
std::optional<std::vector<FileInfo>> filesValues;
428434
std::vector<InitReference> lazyReferences;
429435
std::vector<UTBotKTestObject> objects;
430436

@@ -443,6 +449,10 @@ namespace tests {
443449
std::vector<std::string> errorDescriptors;
444450

445451
[[nodiscard]] bool isError() const;
452+
453+
FileInfo getFileByName(char fileName) const {
454+
return filesValues.value()[fileName - 'A'];
455+
}
446456
};
447457

448458
struct Modifiers {

‎server/src/printers/TestsPrinter.cpp‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,17 +260,28 @@ void TestsPrinter::initializeFiles(const Tests::MethodDescription &methodDescrip
260260
fs::path pathToSourceFile =
261261
Paths::sourcePathToTestPath(projectContext, methodDescription.sourceFilePath);
262262
fs::path pathToTestDir = Paths::getPathDirRelativeToBuildDir(projectContext, pathToSourceFile);
263+
int numInitFiles = 0;
263264
for (char fileName = 'A'; fileName < 'A' + types::Type::symFilesCount; fileName++) {
265+
if (testCase.getFileByName(fileName).readBytes == 0) {
266+
continue;
267+
}
268+
269+
numInitFiles++;
264270
std::string strFileName(1, fileName);
265-
strFunctionCall("write_to_file",
266-
{ StringUtils::wrapQuotations(pathToTestDir / strFileName),
267-
testCase.filesValues.value()[fileName - 'A'].view->getEntryValue(this) });
271+
strFunctionCall("write_to_file", { StringUtils::wrapQuotations(pathToTestDir / strFileName),
272+
testCase.getFileByName(fileName).data });
273+
}
274+
if (numInitFiles != 0) {
275+
ss << NL;
268276
}
269-
ss << NL;
270277
}
271278

272279
void TestsPrinter::openFiles(const Tests::MethodDescription &methodDescription,
273280
const Tests::MethodTestCase &testCase) {
281+
if (!testCase.filesValues.has_value()) {
282+
LOG_S(WARNING) << "There are not symbolic files in the test.";
283+
return;
284+
}
274285
char fileName = 'A';
275286
fs::path pathToSourceFile =
276287
Paths::sourcePathToTestPath(projectContext, methodDescription.sourceFilePath);
@@ -281,12 +292,15 @@ void TestsPrinter::openFiles(const Tests::MethodDescription &methodDescription,
281292
continue;
282293
}
283294

284-
std::string strFileName(1, fileName++);
295+
std::string strFileName(1, fileName);
296+
std::string fileMode =
297+
testCase.getFileByName(fileName).writeBytes > 0 ? "\"w\"" : "\"r\"";
285298
strDeclareVar(param.type.typeName(), param.name,
286299
constrFunctionCall(
287300
"(UTBot::FILE *) fopen",
288-
{ StringUtils::wrapQuotations(pathToTestDir / strFileName), "\"r\"" }, "",
289-
std::nullopt, false));
301+
{ StringUtils::wrapQuotations(pathToTestDir / strFileName), fileMode },
302+
"", std::nullopt, false));
303+
fileName++;
290304
}
291305
if (fileName != 'A') {
292306
ss << NL;

‎server/src/types/Types.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,6 @@ const std::string &types::Type::getStdinParamName() {
284284
return stdinParamName;
285285
}
286286

287-
std::string types::Type::getFileParamName(char fileName) {
288-
return StringUtils::stringFormat("%c_file_buf", fileName);
289-
}
290-
291287
bool types::Type::isPointerToPointer() const {
292288
const std::vector<std::shared_ptr<AbstractType>> pointerArrayKinds = this->pointerArrayKinds();
293289
return pointerArrayKinds.size() > 1 &&

‎server/src/types/Types.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ namespace types {
242242
static const size_t symFilesCount = 3;
243243

244244
static const std::string &getStdinParamName();
245-
static std::string getFileParamName(char fileName);
246245
private:
247246

248247
explicit Type(const TypeName& type, size_t pointersNum=0);

‎server/src/utils/PrinterUtils.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,12 @@ namespace PrinterUtils {
136136
std::string getFileParamKTestJSON(char fileName) {
137137
return StringUtils::stringFormat("%c-data", fileName);
138138
}
139+
140+
std::string getFileReadBytesParamKTestJSON(char fileName) {
141+
return StringUtils::stringFormat("%c-data-read", fileName);
142+
}
143+
144+
std::string getFileWriteBytesParamKTestJSON(char fileName) {
145+
return StringUtils::stringFormat("%c-data-write", fileName);
146+
}
139147
}

‎server/src/utils/PrinterUtils.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ namespace PrinterUtils {
103103
std::string generateNewVar(int cnt);
104104

105105
std::string getFileParamKTestJSON(char fileName);
106+
std::string getFileReadBytesParamKTestJSON(char fileName);
107+
std::string getFileWriteBytesParamKTestJSON(char fileName);
106108

107109
const std::string LAZYRENAME = "utbotInnerVar";
108110
const std::string UTBOT_ARGC = "utbot_argc";

‎server/test/framework/Syntax_Tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ namespace {
12831283
);
12841284
}
12851285

1286-
TEST_F(Syntax_Test, Pointers_In_Structs_2) {
1286+
TEST_F(Syntax_Test, DISABLED_Pointers_In_Structs_2) {
12871287
auto [testGen, status] = createTestForFunction(structs_with_pointers_c, 17);
12881288

12891289
ASSERT_TRUE(status.ok()) << status.error_message();
@@ -2001,7 +2001,7 @@ namespace {
20012001
);
20022002
}
20032003

2004-
TEST_F(Syntax_Test, len_bound) {
2004+
TEST_F(Syntax_Test, DISABLED_len_bound) {
20052005
auto [testGen, status] = createTestForFunction(linked_list_c, 92);
20062006

20072007
ASSERT_TRUE(status.ok()) << status.error_message();
@@ -2017,7 +2017,7 @@ namespace {
20172017
);
20182018
}
20192019

2020-
TEST_F(Syntax_Test, DISABLED_sort_list) {
2020+
TEST_F(Syntax_Test, sort_list) {
20212021
auto [testGen, status] = createTestForFunction(linked_list_c, 104, 90);
20222022

20232023
ASSERT_TRUE(status.ok()) << status.error_message();
@@ -2039,7 +2039,7 @@ namespace {
20392039
);
20402040
}
20412041

2042-
TEST_F(Syntax_Test, DISABLED_sort_list_with_cmp) {
2042+
TEST_F(Syntax_Test, sort_list_with_cmp) {
20432043
auto [testGen, status] = createTestForFunction(linked_list_c, 135, 90);
20442044

20452045
ASSERT_TRUE(status.ok()) << status.error_message();

‎submodules/Bear‎

Submodule Bear updated 1 file

‎submodules/klee‎

0 commit comments

Comments
 (0)