feat(cpp-object-oriented-modular-refactoring): step 3 - foundation-google-style
This commit is contained in:
@@ -214,25 +214,25 @@ void writeResultsFixture(
|
||||
const std::filesystem::path& input,
|
||||
const ComparisonValues& values) {
|
||||
auto parsedInput = fesa::AbaqusInputReader{}.read(input);
|
||||
if (!parsedInput.hasValue()) {
|
||||
if (!parsedInput.HasValue()) {
|
||||
throw std::runtime_error{"Reference fixture input identity read failed."};
|
||||
}
|
||||
auto domainResult = fesa::Domain::create(
|
||||
makeDefinition(input, parsedInput.value().sourceContentIdentity));
|
||||
if (!domainResult.hasValue()) {
|
||||
makeDefinition(input, parsedInput.Value().sourceContentIdentity));
|
||||
if (!domainResult.HasValue()) {
|
||||
throw std::runtime_error{"Reference fixture Domain construction failed."};
|
||||
}
|
||||
fesa::Domain domain = std::move(domainResult.value());
|
||||
fesa::Domain domain = std::move(domainResult.Value());
|
||||
auto modelResult = fesa::AnalysisModel::create(domain);
|
||||
if (!modelResult.hasValue()) {
|
||||
if (!modelResult.HasValue()) {
|
||||
throw std::runtime_error{"Reference fixture AnalysisModel construction failed."};
|
||||
}
|
||||
fesa::AnalysisModel model = std::move(modelResult.value());
|
||||
fesa::AnalysisModel model = std::move(modelResult.Value());
|
||||
auto dofsResult = fesa::DofManager::create(model);
|
||||
if (!dofsResult.hasValue()) {
|
||||
if (!dofsResult.HasValue()) {
|
||||
throw std::runtime_error{"Reference fixture DofManager construction failed."};
|
||||
}
|
||||
fesa::DofManager dofs = std::move(dofsResult.value());
|
||||
fesa::DofManager dofs = std::move(dofsResult.Value());
|
||||
fesa::AnalysisState state =
|
||||
fesa::AnalysisState::create(dofs, {"Step-1", 0U});
|
||||
|
||||
@@ -278,7 +278,7 @@ void writeResultsFixture(
|
||||
|
||||
fesa::Hdf5ResultsWriter writer;
|
||||
const fesa::Status status = writer.write(output, domain, state, {});
|
||||
if (!status.isOk()) {
|
||||
if (!status.IsOk()) {
|
||||
throw std::runtime_error{"Reference fixture HDF5 write failed."};
|
||||
}
|
||||
}
|
||||
@@ -330,10 +330,10 @@ private:
|
||||
void expectFailureCode(
|
||||
const fesa::Result<fesa::test::ComparisonReport>& result,
|
||||
const std::string& expectedCode) {
|
||||
ASSERT_FALSE(result.hasValue());
|
||||
ASSERT_FALSE(result.status().isOk());
|
||||
ASSERT_FALSE(result.status().diagnostics().empty());
|
||||
EXPECT_EQ(result.status().diagnostics().front().code, expectedCode);
|
||||
ASSERT_FALSE(result.HasValue());
|
||||
ASSERT_FALSE(result.GetStatus().IsOk());
|
||||
ASSERT_FALSE(result.GetStatus().Diagnostics().empty());
|
||||
EXPECT_EQ(result.GetStatus().Diagnostics().front().code, expectedCode);
|
||||
}
|
||||
|
||||
const fesa::test::RowDecision* findRow(
|
||||
@@ -557,8 +557,8 @@ TEST(ReferenceComparisonContract,
|
||||
|
||||
auto result = fesa::test::ReferenceComparison::compare(
|
||||
fixture.results(), fixture.legacy());
|
||||
ASSERT_TRUE(result.hasValue());
|
||||
const auto& report = result.value();
|
||||
ASSERT_TRUE(result.HasValue());
|
||||
const auto& report = result.Value();
|
||||
EXPECT_FALSE(report.passed);
|
||||
EXPECT_EQ(report.rows.size(), kExpectedRowCount);
|
||||
EXPECT_EQ(report.metrics.size(), kExpectedMetricCount);
|
||||
@@ -608,8 +608,8 @@ TEST(ReferenceComparisonContract,
|
||||
|
||||
auto result = fesa::test::ReferenceComparison::compare(
|
||||
fixture.results(), fixture.legacy());
|
||||
ASSERT_TRUE(result.hasValue());
|
||||
const auto& report = result.value();
|
||||
ASSERT_TRUE(result.HasValue());
|
||||
const auto& report = result.Value();
|
||||
ASSERT_TRUE(report.passed);
|
||||
expectExactRowInventory(report);
|
||||
ASSERT_EQ(report.metrics.size(), kExpectedMetricCount);
|
||||
@@ -658,10 +658,10 @@ TEST(ReferenceComparisonContract,
|
||||
const auto jsonB = fixture.root() / "comparison-b.json";
|
||||
ASSERT_TRUE(
|
||||
fesa::test::ReferenceComparison::writeDeterministicJson(report, jsonA)
|
||||
.isOk());
|
||||
.IsOk());
|
||||
ASSERT_TRUE(
|
||||
fesa::test::ReferenceComparison::writeDeterministicJson(report, jsonB)
|
||||
.isOk());
|
||||
.IsOk());
|
||||
const std::string first = readBytes(jsonA);
|
||||
EXPECT_EQ(first, readBytes(jsonB));
|
||||
for (const char* required : {
|
||||
@@ -690,8 +690,8 @@ TEST(ReferenceComparisonContract,
|
||||
|
||||
auto result = fesa::test::ReferenceComparison::compare(
|
||||
fixture.results(), fixture.legacy());
|
||||
ASSERT_TRUE(result.hasValue());
|
||||
const auto& report = result.value();
|
||||
ASSERT_TRUE(result.HasValue());
|
||||
const auto& report = result.Value();
|
||||
ASSERT_TRUE(report.passed);
|
||||
EXPECT_TRUE(report.physicsEvidence.endpointConsistencyPassed);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user