Skip to content

Commit 5472e4e

Browse files
NypiakaNypiaka
committed
naive_tests_fix
1 parent 57a9ec5 commit 5472e4e

File tree

6 files changed

+24
-20
lines changed

6 files changed

+24
-20
lines changed

‎server/src/utils/CLIUtils.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ createSettingsContextByOptions(const SettingsContextOptionGroup &settingsContext
6262
settingsContextOptionGroup.getTimeoutPerTest(),
6363
settingsContextOptionGroup.isDeterministicSearcherUsed(),
6464
settingsContextOptionGroup.withStubs(),
65-
settingsContextOptionGroup.getErrorMode());
65+
settingsContextOptionGroup.getErrorMode(),
66+
settingsContextOptionGroup.doDifferentVariablesOfTheSameType());
6667
}
6768

6869
std::vector<fs::path> getSourcePaths(const ProjectContextOptionGroup &projectContextOptions,

‎server/src/utils/GrpcUtils.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ namespace GrpcUtils {
3636
int32_t timeoutPerTest,
3737
bool useDeterministicSearcher,
3838
bool useStubs,
39-
ErrorMode errorMode) {
39+
ErrorMode errorMode,
40+
bool differentVariablesOfTheSameType) {
4041
auto result = std::make_unique<testsgen::SettingsContext>();
4142
result->set_generateforstaticfunctions(generateForStaticFunctions);
4243
result->set_verbose(verbose);
@@ -45,6 +46,7 @@ namespace GrpcUtils {
4546
result->set_usedeterministicsearcher(useDeterministicSearcher);
4647
result->set_usestubs(useStubs);
4748
result->set_errormode(errorMode);
49+
result->set_differentvariablesofthesametype(differentVariablesOfTheSameType);
4850
return result;
4951
}
5052

‎server/src/utils/GrpcUtils.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ namespace GrpcUtils {
2828
int32_t timeoutPerTest,
2929
bool useDeterministicSearcher,
3030
bool useStubs,
31-
ErrorMode errorMode);
31+
ErrorMode errorMode,
32+
bool differentVariablesOfTheSameType);
3233

3334
std::unique_ptr<testsgen::SnippetRequest>
3435
createSnippetRequest(std::unique_ptr<testsgen::ProjectContext> projectContext,

‎server/test/framework/Server_Tests.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace {
6060
auto projectContext = GrpcUtils::createProjectContext(
6161
projectName, suitePath, testsDirPath, buildDirRelativePath);
6262

63-
auto settingsContext = GrpcUtils::createSettingsContext(true, false, 30, 0, false, false, ErrorMode::PASSING);
63+
auto settingsContext = GrpcUtils::createSettingsContext(true, false, 30, 0, false, false, ErrorMode::PASSING, false);
6464

6565
auto request = GrpcUtils::createProjectRequest(std::move(projectContext),
6666
std::move(settingsContext),
@@ -1229,7 +1229,7 @@ namespace {
12291229
static auto coverageAndResultsWriter =
12301230
std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
12311231
CoverageAndResultsGenerator coverageGenerator{ request.get(), coverageAndResultsWriter.get() };
1232-
utbot::SettingsContext settingsContext{ true, true, 30, 0, true, false, errorMode};
1232+
utbot::SettingsContext settingsContext{ true, true, 30, 0, true, false, errorMode, false};
12331233
coverageGenerator.generate(withCoverage, settingsContext);
12341234
EXPECT_FALSE(coverageGenerator.hasExceptions());
12351235
return coverageGenerator;
@@ -1462,7 +1462,7 @@ namespace {
14621462
buildDirRelativePath, std::move(testFilter));
14631463
auto coverageAndResultsWriter = std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
14641464
CoverageAndResultsGenerator coverageGenerator{ runRequest.get(), coverageAndResultsWriter.get() };
1465-
utbot::SettingsContext settingsContext{ true, true, 45, 0, true, false, ErrorMode::FAILING };
1465+
utbot::SettingsContext settingsContext{ true, true, 45, 0, true, false, ErrorMode::FAILING, false};
14661466
coverageGenerator.generate(false, settingsContext);
14671467

14681468
ASSERT_TRUE(coverageGenerator.getCoverageMap().empty());
@@ -1508,7 +1508,7 @@ namespace {
15081508
buildDirRelativePath, std::move(testFilter));
15091509
auto coverageAndResultsWriter = std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
15101510
CoverageAndResultsGenerator coverageGenerator{runRequest.get(), coverageAndResultsWriter.get()};
1511-
utbot::SettingsContext settingsContext{true, true, 30, 0, true, false, ErrorMode::FAILING};
1511+
utbot::SettingsContext settingsContext{true, true, 30, 0, true, false, ErrorMode::FAILING, false};
15121512
coverageGenerator.generate(false, settingsContext);
15131513

15141514
ASSERT_TRUE(coverageGenerator.getCoverageMap().empty());
@@ -1556,7 +1556,7 @@ namespace {
15561556
buildDirRelativePath, std::move(testFilter));
15571557
auto coverageAndResultsWriter = std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
15581558
CoverageAndResultsGenerator coverageGenerator{runRequest.get(), coverageAndResultsWriter.get()};
1559-
utbot::SettingsContext settingsContext{true, true, 30, 0, true, false, ErrorMode::PASSING};
1559+
utbot::SettingsContext settingsContext{true, true, 30, 0, true, false, ErrorMode::PASSING, false};
15601560
coverageGenerator.generate(false, settingsContext);
15611561

15621562
ASSERT_TRUE(coverageGenerator.getCoverageMap().empty());
@@ -1602,7 +1602,7 @@ namespace {
16021602
buildDirRelativePath, std::move(testFilter));
16031603
auto coverageAndResultsWriter = std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
16041604
CoverageAndResultsGenerator coverageGenerator{runRequest.get(), coverageAndResultsWriter.get()};
1605-
utbot::SettingsContext settingsContext{true, true, 30, 0, true, false, ErrorMode::FAILING};
1605+
utbot::SettingsContext settingsContext{true, true, 30, 0, true, false, ErrorMode::FAILING, false};
16061606
coverageGenerator.generate(false, settingsContext);
16071607

16081608
ASSERT_TRUE(coverageGenerator.getCoverageMap().empty());
@@ -1648,7 +1648,7 @@ namespace {
16481648
buildDirRelativePath, std::move(testFilter));
16491649
auto coverageAndResultsWriter = std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
16501650
CoverageAndResultsGenerator coverageGenerator{runRequest.get(), coverageAndResultsWriter.get()};
1651-
utbot::SettingsContext settingsContext{true, true, 30, 0, true, false, ErrorMode::PASSING};
1651+
utbot::SettingsContext settingsContext{true, true, 30, 0, true, false, ErrorMode::PASSING, false};
16521652
coverageGenerator.generate(false, settingsContext);
16531653

16541654
ASSERT_TRUE(coverageGenerator.getCoverageMap().empty());
@@ -1721,7 +1721,7 @@ namespace {
17211721
buildDirRelativePath, std::move(testFilter));
17221722
auto coverageAndResultsWriter = std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
17231723
CoverageAndResultsGenerator coverageGenerator{ request.get(), coverageAndResultsWriter.get() };
1724-
utbot::SettingsContext settingsContext{ true, true, 15, timeout, true, false, ErrorMode::FAILING };
1724+
utbot::SettingsContext settingsContext{ true, true, 15, timeout, true, false, ErrorMode::FAILING, false};
17251725
coverageGenerator.generate(false, settingsContext);
17261726

17271727
ASSERT_TRUE(coverageGenerator.getCoverageMap().empty());
@@ -1808,7 +1808,7 @@ namespace {
18081808
CoverageAndResultsGenerator coverageGenerator{ runRequest.get(),
18091809
coverageAndResultsWriter.get() };
18101810
utbot::SettingsContext settingsContext{
1811-
true, false, 45, 0, false, false, ErrorMode::FAILING
1811+
true, false, 45, 0, false, false, ErrorMode::FAILING, false
18121812
};
18131813
coverageGenerator.generate(false, settingsContext);
18141814

@@ -1846,7 +1846,7 @@ namespace {
18461846
CoverageAndResultsGenerator coverageGenerator{ runRequest.get(),
18471847
coverageAndResultsWriter.get() };
18481848
utbot::SettingsContext settingsContext{
1849-
true, false, 15, 0, false, false, ErrorMode::FAILING
1849+
true, false, 15, 0, false, false, ErrorMode::FAILING, false
18501850
};
18511851
coverageGenerator.generate(false, settingsContext);
18521852

@@ -1888,7 +1888,7 @@ namespace {
18881888
CoverageAndResultsGenerator coverageGenerator{ runRequest.get(),
18891889
coverageAndResultsWriter.get() };
18901890
utbot::SettingsContext settingsContext{
1891-
true, false, 45, 30, false, false, ErrorMode::FAILING
1891+
true, false, 45, 30, false, false, ErrorMode::FAILING, false
18921892
};
18931893
coverageGenerator.generate(false, settingsContext);
18941894

@@ -1927,7 +1927,7 @@ namespace {
19271927
CoverageAndResultsGenerator coverageGenerator{ runRequest.get(),
19281928
coverageAndResultsWriter.get() };
19291929
utbot::SettingsContext settingsContext{
1930-
true, false, 45, 0, false, false, ErrorMode::FAILING
1930+
true, false, 45, 0, false, false, ErrorMode::FAILING, false
19311931
};
19321932
coverageGenerator.generate(false, settingsContext);
19331933

@@ -1965,7 +1965,7 @@ namespace {
19651965
CoverageAndResultsGenerator coverageGenerator{ runRequest.get(),
19661966
coverageAndResultsWriter.get() };
19671967
utbot::SettingsContext settingsContext{
1968-
true, false, 45, 0, false, false, ErrorMode::FAILING
1968+
true, false, 45, 0, false, false, ErrorMode::FAILING, false
19691969
};
19701970
coverageGenerator.generate(false, settingsContext);
19711971

‎server/test/framework/Stub_Tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ namespace {
228228
static auto coverageAndResultsWriter =
229229
std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
230230
CoverageAndResultsGenerator coverageGenerator{ runRequest.get(), coverageAndResultsWriter.get() };
231-
utbot::SettingsContext settingsContext{ true, true, 15, 0, true, true, ErrorMode::FAILING };
231+
utbot::SettingsContext settingsContext{ true, true, 15, 0, true, true, ErrorMode::FAILING, true };
232232
coverageGenerator.generate(true, settingsContext);
233233
EXPECT_FALSE(coverageGenerator.hasExceptions());
234234
}
@@ -330,7 +330,7 @@ namespace {
330330
CoverageAndResultsGenerator coverageGenerator{ runRequest.get(),
331331
coverageAndResultsWriter.get() };
332332
utbot::SettingsContext settingsContext{
333-
true, false, 45, 30, false, true, ErrorMode::FAILING
333+
true, false, 45, 30, false, true, ErrorMode::FAILING, false
334334
};
335335
coverageGenerator.generate(false, settingsContext);
336336

‎server/test/framework/TestUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ namespace testUtils {
224224
auto projectContext = GrpcUtils::createProjectContext(
225225
projectName, projectPath, projectPath / "tests", buildDirRelativePath);
226226
auto settingsContext =
227-
GrpcUtils::createSettingsContext(true, verbose, kleeTimeout, 0, false, useStubs, errorMode);
227+
GrpcUtils::createSettingsContext(true, verbose, kleeTimeout, 0, false, useStubs, errorMode, false);
228228
return GrpcUtils::createProjectRequest(std::move(projectContext),
229229
std::move(settingsContext),
230230
srcPaths,
@@ -286,7 +286,7 @@ namespace testUtils {
286286
auto projectContext =
287287
GrpcUtils::createProjectContext(projectName, projectPath, projectPath / "tests", "");
288288
// we actually don't pass all parameters except test directory and project name on client
289-
auto settingsContext = GrpcUtils::createSettingsContext(true, true, 10, 0, true, false, errorMode);
289+
auto settingsContext = GrpcUtils::createSettingsContext(true, true, 10, 0, true, false, errorMode, false);
290290
return GrpcUtils::createSnippetRequest(std::move(projectContext),
291291
std::move(settingsContext), filePath);
292292
}

0 commit comments

Comments
 (0)