Skip to content

Commit dfac7a2

Browse files
committed
fixup! refactor: move path resolve to path.cc
1 parent ad2ab69 commit dfac7a2

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

src/path.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,4 @@ std::string PathResolve(Environment* env,
266266
}
267267
#endif // _WIN32
268268

269-
} // namespace node
269+
} // namespace node

src/path.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6-
#include <vector>
76
#include <string>
7+
#include <vector>
88

99
namespace node {
1010

@@ -18,7 +18,7 @@ std::string NormalizeString(const std::string_view path,
1818

1919
std::string PathResolve(Environment* env,
2020
const std::vector<std::string_view>& args);
21-
} // namespace node
21+
} // namespace node
2222

2323
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
2424

test/cctest/test_util.cc

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include "debug_utils-inl.h"
22
#include "env-inl.h"
33
#include "gtest/gtest.h"
4-
#include "node_options.h"
5-
#include "node_test_fixture.h"
64
#include "simdutf.h"
75
#include "util-inl.h"
86

@@ -16,9 +14,7 @@ using node::ToLower;
1614
using node::UncheckedCalloc;
1715
using node::UncheckedMalloc;
1816

19-
class UtilTest : public EnvironmentTestFixture {};
20-
21-
TEST_F(UtilTest, ListHead) {
17+
TEST(UtilTest, ListHead) {
2218
struct Item { node::ListNode<Item> node_; };
2319
typedef node::ListHead<Item, &Item::node_> List;
2420

@@ -72,7 +68,7 @@ TEST_F(UtilTest, ListHead) {
7268
EXPECT_FALSE(list.begin() != list.end());
7369
}
7470

75-
TEST_F(UtilTest, StringEqualNoCase) {
71+
TEST(UtilTest, StringEqualNoCase) {
7672
EXPECT_FALSE(StringEqualNoCase("a", "b"));
7773
EXPECT_TRUE(StringEqualNoCase("", ""));
7874
EXPECT_TRUE(StringEqualNoCase("equal", "equal"));
@@ -82,7 +78,7 @@ TEST_F(UtilTest, StringEqualNoCase) {
8278
EXPECT_FALSE(StringEqualNoCase("equals", "equal"));
8379
}
8480

85-
TEST_F(UtilTest, StringEqualNoCaseN) {
81+
TEST(UtilTest, StringEqualNoCaseN) {
8682
EXPECT_FALSE(StringEqualNoCaseN("a", "b", strlen("a")));
8783
EXPECT_TRUE(StringEqualNoCaseN("", "", strlen("")));
8884
EXPECT_TRUE(StringEqualNoCaseN("equal", "equal", strlen("equal")));
@@ -96,7 +92,7 @@ TEST_F(UtilTest, StringEqualNoCaseN) {
9692
EXPECT_FALSE(StringEqualNoCaseN("abc\0abc", "abcd\0efg", strlen("abcdefgh")));
9793
}
9894

99-
TEST_F(UtilTest, ToLower) {
95+
TEST(UtilTest, ToLower) {
10096
EXPECT_EQ('0', ToLower('0'));
10197
EXPECT_EQ('a', ToLower('a'));
10298
EXPECT_EQ('a', ToLower('A'));
@@ -109,28 +105,28 @@ TEST_F(UtilTest, ToLower) {
109105
free(pointer); \
110106
} while (0)
111107

112-
TEST_F(UtilTest, Malloc) {
108+
TEST(UtilTest, Malloc) {
113109
TEST_AND_FREE(Malloc<char>, 0);
114110
TEST_AND_FREE(Malloc<char>, 1);
115111
TEST_AND_FREE(Malloc, 0);
116112
TEST_AND_FREE(Malloc, 1);
117113
}
118114

119-
TEST_F(UtilTest, Calloc) {
115+
TEST(UtilTest, Calloc) {
120116
TEST_AND_FREE(Calloc<char>, 0);
121117
TEST_AND_FREE(Calloc<char>, 1);
122118
TEST_AND_FREE(Calloc, 0);
123119
TEST_AND_FREE(Calloc, 1);
124120
}
125121

126-
TEST_F(UtilTest, UncheckedMalloc) {
122+
TEST(UtilTest, UncheckedMalloc) {
127123
TEST_AND_FREE(UncheckedMalloc<char>, 0);
128124
TEST_AND_FREE(UncheckedMalloc<char>, 1);
129125
TEST_AND_FREE(UncheckedMalloc, 0);
130126
TEST_AND_FREE(UncheckedMalloc, 1);
131127
}
132128

133-
TEST_F(UtilTest, UncheckedCalloc) {
129+
TEST(UtilTest, UncheckedCalloc) {
134130
TEST_AND_FREE(UncheckedCalloc<char>, 0);
135131
TEST_AND_FREE(UncheckedCalloc<char>, 1);
136132
TEST_AND_FREE(UncheckedCalloc, 0);
@@ -216,7 +212,7 @@ static void MaybeStackBufferBasic() {
216212
free(rawbuf);
217213
}
218214

219-
TEST_F(UtilTest, MaybeStackBuffer) {
215+
TEST(UtilTest, MaybeStackBuffer) {
220216
MaybeStackBufferBasic<uint8_t>();
221217
MaybeStackBufferBasic<uint16_t>();
222218

@@ -257,7 +253,7 @@ TEST_F(UtilTest, MaybeStackBuffer) {
257253
}
258254
}
259255

260-
TEST_F(UtilTest, SPrintF) {
256+
TEST(UtilTest, SPrintF) {
261257
// %d, %u and %s all do the same thing. The actual C++ type is used to infer
262258
// the right representation.
263259
EXPECT_EQ(SPrintF("%s", false), "false");
@@ -304,6 +300,6 @@ TEST_F(UtilTest, SPrintF) {
304300
EXPECT_EQ(SPrintF("%s", with_zero), with_zero);
305301
}
306302

307-
TEST_F(UtilTest, DumpJavaScriptStackWithNoIsolate) {
303+
TEST(UtilTest, DumpJavaScriptStackWithNoIsolate) {
308304
node::DumpJavaScriptBacktrace(stderr);
309305
}

0 commit comments

Comments
 (0)