Skip to content

Commit 3c1bdfd

Browse files
FrozenLemonTeeFrozenLemonTee
committed
refactor: Fix typo of namespace in tests/examples
1 parent 74a1c32 commit 3c1bdfd

3 files changed

Lines changed: 43 additions & 44 deletions

File tree

‎examples/basic.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
#include <iostream>
22

3-
import mcpplibs.primitive;
3+
import mcpplibs.primitives;
44

55
int main() {
6-
using namespace mcpplibs::primitive;
7-
using namespace mcpplibs::primitive::policy;
6+
using namespace mcpplibs::primitives;
7+
using namespace mcpplibs::primitives::policy;
88

9-
std::cout << "=== mcpplibs.primitive traits & policy example ===\n";
9+
std::cout << "=== mcpplibs.primitives traits & policy example ===\n";
1010
std::cout << std::boolalpha;
1111
std::cout << "int is std_integer: " << std_integer<int> << "\n";
1212
std::cout << "double is std_floating: " << std_floating<double> << "\n";
1313
std::cout << "int is underlying_type: " << underlying_type<int> << "\n";
1414

1515
std::cout
1616
<< "default value policy is unchecked_value: "
17-
<< std::is_same_v<::mcpplibs::primitives::default_value_policy,
18-
::mcpplibs::primitive::policy::unchecked_value> << "\n";
17+
<< std::is_same_v<default_value_policy, unchecked_value> << "\n";
1918

2019
std::cout << "checked_value is a policy_type: "
2120
<< policy_type<checked_value> << "\n";
2221
std::cout << "checked_value category == value: "
23-
<< (policy::traits<checked_value>::kind == policy::category::value)
22+
<< (traits<checked_value>::kind == category::value)
2423
<< "\n";
2524

2625
return 0;

‎tests/basic/test_policies.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include <gtest/gtest.h>
22

3-
import mcpplibs.primitive;
3+
import mcpplibs.primitives;
44

55
namespace {} // namespace
66

7-
using namespace mcpplibs::primitive;
7+
using namespace mcpplibs::primitives;
88

99
TEST(PolicyTraitsTest, BuiltinPoliciesHaveCategories) {
1010
using namespace policy;
@@ -41,10 +41,10 @@ TEST(PolicyTraitsTest, BuiltinPoliciesHaveCategories) {
4141
EXPECT_FALSE((policy_type<int>));
4242

4343
EXPECT_TRUE((std::is_same_v<::mcpplibs::primitives::default_value_policy,
44-
::mcpplibs::primitive::policy::unchecked_value>));
44+
::mcpplibs::primitives::policy::unchecked_value>));
4545
EXPECT_TRUE(
4646
(std::is_same_v<::mcpplibs::primitives::default_type_policy,
47-
::mcpplibs::primitive::policy::transparent_type>));
47+
::mcpplibs::primitives::policy::transparent_type>));
4848
}
4949

5050
// Use the existing test runner main from other test translation unit.

‎tests/basic/test_templates.cpp‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <gtest/gtest.h>
22

3-
import mcpplibs.primitive;
3+
import mcpplibs.primitives;
44

55
namespace {
66

@@ -23,12 +23,12 @@ struct BadKind {
2323
} // namespace
2424

2525
template <>
26-
struct mcpplibs::primitive::underlying::traits<UserInteger> {
26+
struct mcpplibs::primitives::underlying::traits<UserInteger> {
2727
using value_type = UserInteger;
2828
using rep_type = int;
2929

3030
static constexpr bool enabled = true;
31-
static constexpr auto kind = mcpplibs::primitive::underlying::category::integer;
31+
static constexpr auto kind = category::integer;
3232

3333
static constexpr rep_type to_rep(value_type value) noexcept { return value.value; }
3434

@@ -38,12 +38,12 @@ struct mcpplibs::primitive::underlying::traits<UserInteger> {
3838
};
3939

4040
template <>
41-
struct mcpplibs::primitive::underlying::traits<BadRep> {
41+
struct mcpplibs::primitives::underlying::traits<BadRep> {
4242
using value_type = BadRep;
4343
using rep_type = BadRep;
4444

4545
static constexpr bool enabled = true;
46-
static constexpr auto kind = mcpplibs::primitive::underlying::category::integer;
46+
static constexpr auto kind = category::integer;
4747

4848
static constexpr rep_type to_rep(value_type value) noexcept { return value; }
4949

@@ -53,12 +53,12 @@ struct mcpplibs::primitive::underlying::traits<BadRep> {
5353
};
5454

5555
template <>
56-
struct mcpplibs::primitive::underlying::traits<BadKind> {
56+
struct mcpplibs::primitives::underlying::traits<BadKind> {
5757
using value_type = BadKind;
5858
using rep_type = int;
5959

6060
static constexpr bool enabled = true;
61-
static constexpr auto kind = mcpplibs::primitive::underlying::category::floating;
61+
static constexpr auto kind = category::floating;
6262

6363
static constexpr rep_type to_rep(value_type value) noexcept { return value.value; }
6464

@@ -68,45 +68,45 @@ struct mcpplibs::primitive::underlying::traits<BadKind> {
6868
};
6969

7070
TEST(PrimitiveTraitsTest, StandardTypeConcepts) {
71-
EXPECT_TRUE((mcpplibs::primitive::std_integer<int>));
72-
EXPECT_TRUE((mcpplibs::primitive::std_integer<long long>));
73-
EXPECT_FALSE((mcpplibs::primitive::std_integer<bool>));
74-
EXPECT_FALSE((mcpplibs::primitive::std_integer<char>));
71+
EXPECT_TRUE((mcpplibs::primitives::std_integer<int>));
72+
EXPECT_TRUE((mcpplibs::primitives::std_integer<long long>));
73+
EXPECT_FALSE((mcpplibs::primitives::std_integer<bool>));
74+
EXPECT_FALSE((mcpplibs::primitives::std_integer<char>));
7575

76-
EXPECT_TRUE((mcpplibs::primitive::std_floating<float>));
77-
EXPECT_TRUE((mcpplibs::primitive::std_floating<double>));
78-
EXPECT_TRUE((mcpplibs::primitive::std_floating<long double>));
76+
EXPECT_TRUE((mcpplibs::primitives::std_floating<float>));
77+
EXPECT_TRUE((mcpplibs::primitives::std_floating<double>));
78+
EXPECT_TRUE((mcpplibs::primitives::std_floating<long double>));
7979

80-
EXPECT_TRUE((mcpplibs::primitive::std_bool<bool>));
81-
EXPECT_FALSE((mcpplibs::primitive::std_bool<int>));
80+
EXPECT_TRUE((mcpplibs::primitives::std_bool<bool>));
81+
EXPECT_FALSE((mcpplibs::primitives::std_bool<int>));
8282

83-
EXPECT_TRUE((mcpplibs::primitive::std_char<char>));
84-
EXPECT_TRUE((mcpplibs::primitive::std_char<char8_t>));
85-
EXPECT_TRUE((mcpplibs::primitive::std_char<wchar_t>));
83+
EXPECT_TRUE((mcpplibs::primitives::std_char<char>));
84+
EXPECT_TRUE((mcpplibs::primitives::std_char<char8_t>));
85+
EXPECT_TRUE((mcpplibs::primitives::std_char<wchar_t>));
8686

87-
EXPECT_TRUE((mcpplibs::primitive::std_underlying_type<int>));
88-
EXPECT_TRUE((mcpplibs::primitive::std_underlying_type<double>));
89-
EXPECT_FALSE((mcpplibs::primitive::std_underlying_type<void*>));
87+
EXPECT_TRUE((mcpplibs::primitives::std_underlying_type<int>));
88+
EXPECT_TRUE((mcpplibs::primitives::std_underlying_type<double>));
89+
EXPECT_FALSE((mcpplibs::primitives::std_underlying_type<void*>));
9090
}
9191

9292
TEST(PrimitiveTraitsTest, UnderlyingTraitsDefaultsAndCustomRegistration) {
93-
EXPECT_TRUE((mcpplibs::primitive::underlying_type<int>));
94-
EXPECT_EQ(mcpplibs::primitive::underlying::traits<int>::kind,
95-
mcpplibs::primitive::underlying::category::integer);
93+
EXPECT_TRUE((mcpplibs::primitives::underlying_type<int>));
94+
EXPECT_EQ(mcpplibs::primitives::underlying::traits<int>::kind,
95+
mcpplibs::primitives::underlying::category::integer);
9696

97-
EXPECT_TRUE((mcpplibs::primitive::underlying_type<UserInteger>));
98-
EXPECT_EQ(mcpplibs::primitive::underlying::traits<UserInteger>::to_rep(UserInteger{7}), 7);
97+
EXPECT_TRUE((mcpplibs::primitives::underlying_type<UserInteger>));
98+
EXPECT_EQ(mcpplibs::primitives::underlying::traits<UserInteger>::to_rep(UserInteger{7}), 7);
9999

100-
EXPECT_FALSE((mcpplibs::primitive::underlying_type<NotRegistered>));
101-
EXPECT_FALSE((mcpplibs::primitive::underlying::traits<NotRegistered>::enabled));
100+
EXPECT_FALSE((mcpplibs::primitives::underlying_type<NotRegistered>));
101+
EXPECT_FALSE((mcpplibs::primitives::underlying::traits<NotRegistered>::enabled));
102102
}
103103

104104
TEST(PrimitiveTraitsTest, UnderlyingTypeRequiresValidRepTypeAndCategoryConsistency) {
105-
EXPECT_TRUE((mcpplibs::primitive::underlying::traits<BadRep>::enabled));
106-
EXPECT_FALSE((mcpplibs::primitive::underlying_type<BadRep>));
105+
EXPECT_TRUE((mcpplibs::primitives::underlying::traits<BadRep>::enabled));
106+
EXPECT_FALSE((mcpplibs::primitives::underlying_type<BadRep>));
107107

108-
EXPECT_TRUE((mcpplibs::primitive::underlying::traits<BadKind>::enabled));
109-
EXPECT_FALSE((mcpplibs::primitive::underlying_type<BadKind>));
108+
EXPECT_TRUE((mcpplibs::primitives::underlying::traits<BadKind>::enabled));
109+
EXPECT_FALSE((mcpplibs::primitives::underlying_type<BadKind>));
110110
}
111111

112112
int main(int argc, char **argv) {

0 commit comments

Comments
 (0)