maj/StorytellersBestFriend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactors constants out of Ranks.h.

Browse Source
This commit is contained in:
Tom Hicks
2023-04-25 13:42:35 -07:00
parent dc4295bd86
commit 34aa82bf73
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sbf-cpp/Ranks.cpp
View File

@@ -11,6 +11,22 @@ using std::string;
using std::vector;
} // End namespace
const std::string kRankPrimaryLabel = "Primary";
const std::string kRankSecondaryLabel = "Secondary";
const std::string kRankTertiaryLabel = "Tertiary";
const int kRanksCount = 3;
const RankType kRankPrimary = {kRankPrimaryId, kRankPrimaryLabel};
const RankType kRankSecondary = {kRankSecondaryId, kRankSecondaryLabel};
const RankType kRankTertiary = {kRankTertiaryId, kRankTertiaryLabel};
const RankType kRankUnknown = {0, ""};
const RankType kRanks[]{
kRankUnknown,
kRankPrimary,
kRankSecondary,
kRankTertiary,
};
ostream& operator<<(ostream& os, const RankType& rank) {
os << "Rank: {id: " << rank.id << ", label: \"" << rank.label << "\"}";
return os;

16
sbf-cpp/Ranks.h
View File

@@ -16,30 +16,14 @@
*/
namespace SBF {
const int kRankPrimaryId = 1;
const std::string kRankPrimaryLabel = "Primary";
const int kRankSecondaryId = 2;
const std::string kRankSecondaryLabel = "Secondary";
const int kRankTertiaryId = 3;
const std::string kRankTertiaryLabel = "Tertiary";
const int kRanksCount = 3;
struct RankType {
int id;
std::string label;
};
const RankType kRankPrimary = {kRankPrimaryId, kRankPrimaryLabel};
const RankType kRankSecondary = {kRankSecondaryId, kRankSecondaryLabel};
const RankType kRankTertiary = {kRankTertiaryId, kRankTertiaryLabel};
const RankType kRankUnknown = {0, ""};
const RankType kRanks[]{
kRankUnknown,
kRankPrimary,
kRankSecondary,
kRankTertiary,
};
/// @brief Writes a rank to an ostream.
/// @param os The ostream to write to.
/// @param rank The rank to write.

15
sbf-cpp/Ranks_test.cpp
View File

@@ -14,6 +14,21 @@ using namespace Test;
using namespace std;
} // End namespace
const std::string kRankPrimaryLabel = "Primary";
const std::string kRankSecondaryLabel = "Secondary";
const std::string kRankTertiaryLabel = "Tertiary";
const RankType kRankPrimary = {kRankPrimaryId, kRankPrimaryLabel};
const RankType kRankSecondary = {kRankSecondaryId, kRankSecondaryLabel};
const RankType kRankTertiary = {kRankTertiaryId, kRankTertiaryLabel};
const RankType kRankUnknown = {0, ""};
const RankType kRanks[]{
kRankUnknown,
kRankPrimary,
kRankSecondary,
kRankTertiary,
};
TestResults test_GetRank() {
return execute_suite<RankType, int>(make_test_suite(
"SBF::GetRank",