feat(cpp-object-oriented-modular-refactoring): step 3 - foundation-google-style
This commit is contained in:
@@ -63,37 +63,37 @@ TEST(InpSyntax, RejectsMalformedOrOrphanData) {
|
||||
std::filesystem::remove(missingPath, removeError);
|
||||
|
||||
const auto unreadable = fesa::AbaqusInputReader{}.read(missingPath);
|
||||
ASSERT_FALSE(unreadable.hasValue());
|
||||
ASSERT_FALSE(unreadable.HasValue());
|
||||
EXPECT_EQ(
|
||||
unreadable.status().failureCategory(),
|
||||
fesa::FailureCategory::input);
|
||||
ASSERT_EQ(unreadable.status().diagnostics().size(), 1U);
|
||||
EXPECT_EQ(unreadable.status().diagnostics()[0].code,
|
||||
unreadable.GetStatus().Category(),
|
||||
fesa::FailureCategory::kInput);
|
||||
ASSERT_EQ(unreadable.GetStatus().Diagnostics().size(), 1U);
|
||||
EXPECT_EQ(unreadable.GetStatus().Diagnostics()[0].code,
|
||||
"input-file-unreadable");
|
||||
|
||||
const TemporaryInputFile malformed{"malformed-keyword", "*, name=value\n"};
|
||||
const auto malformedResult =
|
||||
fesa::AbaqusInputReader{}.read(malformed.path());
|
||||
ASSERT_FALSE(malformedResult.hasValue());
|
||||
ASSERT_FALSE(malformedResult.HasValue());
|
||||
EXPECT_EQ(
|
||||
malformedResult.status().failureCategory(),
|
||||
fesa::FailureCategory::input);
|
||||
ASSERT_EQ(malformedResult.status().diagnostics().size(), 1U);
|
||||
EXPECT_EQ(malformedResult.status().diagnostics()[0].code,
|
||||
malformedResult.GetStatus().Category(),
|
||||
fesa::FailureCategory::kInput);
|
||||
ASSERT_EQ(malformedResult.GetStatus().Diagnostics().size(), 1U);
|
||||
EXPECT_EQ(malformedResult.GetStatus().Diagnostics()[0].code,
|
||||
"malformed-keyword");
|
||||
EXPECT_EQ(malformedResult.status().diagnostics()[0].location.line, 1U);
|
||||
EXPECT_EQ(malformedResult.GetStatus().Diagnostics()[0].location.line, 1U);
|
||||
|
||||
const TemporaryInputFile orphan{
|
||||
"orphan-data", "** comment\n\norphan, data\n"};
|
||||
const auto orphanResult = fesa::AbaqusInputReader{}.read(orphan.path());
|
||||
ASSERT_FALSE(orphanResult.hasValue());
|
||||
ASSERT_FALSE(orphanResult.HasValue());
|
||||
EXPECT_EQ(
|
||||
orphanResult.status().failureCategory(),
|
||||
fesa::FailureCategory::input);
|
||||
ASSERT_EQ(orphanResult.status().diagnostics().size(), 1U);
|
||||
EXPECT_EQ(orphanResult.status().diagnostics()[0].code,
|
||||
orphanResult.GetStatus().Category(),
|
||||
fesa::FailureCategory::kInput);
|
||||
ASSERT_EQ(orphanResult.GetStatus().Diagnostics().size(), 1U);
|
||||
EXPECT_EQ(orphanResult.GetStatus().Diagnostics()[0].code,
|
||||
"orphan-data-line");
|
||||
EXPECT_EQ(orphanResult.status().diagnostics()[0].location.line, 3U);
|
||||
EXPECT_EQ(orphanResult.GetStatus().Diagnostics()[0].location.line, 3U);
|
||||
}
|
||||
|
||||
TEST(InpSyntax, ReadsLegacyCantileverWithoutMutation) {
|
||||
@@ -105,23 +105,23 @@ TEST(InpSyntax, ReadsLegacyCantileverWithoutMutation) {
|
||||
|
||||
const auto result = fesa::AbaqusInputReader{}.read(inputPath);
|
||||
|
||||
ASSERT_TRUE(result.hasValue());
|
||||
EXPECT_EQ(result.value().sourceContentIdentity,
|
||||
ASSERT_TRUE(result.HasValue());
|
||||
EXPECT_EQ(result.Value().sourceContentIdentity,
|
||||
"fnv1a64:04543464cc970405");
|
||||
EXPECT_EQ(result.value().sourcePath,
|
||||
EXPECT_EQ(result.Value().sourcePath,
|
||||
std::filesystem::absolute(inputPath).lexically_normal());
|
||||
ASSERT_EQ(result.value().blocks.size(), 30U);
|
||||
EXPECT_EQ(result.value().blocks.front().canonicalName, "HEADING");
|
||||
EXPECT_EQ(result.value().blocks.front().location.line, 1U);
|
||||
EXPECT_EQ(result.value().blocks.back().canonicalName, "END STEP");
|
||||
ASSERT_EQ(result.Value().blocks.size(), 30U);
|
||||
EXPECT_EQ(result.Value().blocks.front().canonicalName, "HEADING");
|
||||
EXPECT_EQ(result.Value().blocks.front().location.line, 1U);
|
||||
EXPECT_EQ(result.Value().blocks.back().canonicalName, "END STEP");
|
||||
|
||||
const auto element = std::find_if(
|
||||
result.value().blocks.begin(),
|
||||
result.value().blocks.end(),
|
||||
result.Value().blocks.begin(),
|
||||
result.Value().blocks.end(),
|
||||
[](const fesa::KeywordBlock& block) {
|
||||
return block.canonicalName == "ELEMENT";
|
||||
});
|
||||
ASSERT_NE(element, result.value().blocks.end());
|
||||
ASSERT_NE(element, result.Value().blocks.end());
|
||||
ASSERT_EQ(element->parameters.size(), 1U);
|
||||
EXPECT_EQ(element->parameters[0].name, "TYPE");
|
||||
ASSERT_TRUE(element->parameters[0].value.has_value());
|
||||
|
||||
Reference in New Issue
Block a user