Skip to content

Commit 6e3e813

Browse files
masx200masx200
committed
格式化
1 parent 13242ef commit 6e3e813

File tree

2 files changed

+103
-92
lines changed

2 files changed

+103
-92
lines changed

‎insert-into-a-binary-search-tree/LeetCodeTreeNodeToString.hpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ using namespace std;
1212
#include <iterator>
1313
#include <regex>
1414
#include <sstream>
15-
std::string LeetCodeTreeNodeToString(TreeNode *root) {
16-
stringstream sstream;
17-
auto result = bfsTravelsal(root);
18-
std::regex vowel_re("(,null){1,}\\]$");
15+
std::string LeetCodeTreeNodeToString(TreeNode* root)
16+
{
17+
stringstream sstream;
18+
auto result = bfsTravelsal(root);
19+
std::regex vowel_re("(,null){1,}\\]$");
1920

20-
std::regex_replace(std::ostreambuf_iterator<char>(sstream), result.begin(),
21-
result.end(), vowel_re, "]");
22-
return sstream.str();
21+
std::regex_replace(std::ostreambuf_iterator<char>(sstream), result.begin(),
22+
result.end(), vowel_re, "]");
23+
return sstream.str();
2324
}

‎insert-into-a-binary-search-tree/test.cpp

Lines changed: 95 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -20,111 +20,121 @@ using namespace std;
2020
#include "EqualTreeNode.hpp"
2121
#include "HashTreeNode.hpp"
2222
// #include "bfsTravelsal.hpp"
23+
#include "LeetCodeTreeNodeToString.hpp"
2324
#include "debugTreeNode.hpp"
2425
#include "printTreeNode.hpp"
2526
#include "treeparse.hpp"
26-
#include "LeetCodeTreeNodeToString.hpp"
2727

28-
void println(string s) { cout << s << endl; }
28+
void println(string s)
29+
{
30+
cout << s << endl;
31+
}
2932

30-
void assertEquals(string s1, string s2) {
31-
CPPUNIT_ASSERT_EQUAL(s1, s2);
32-
// if (s1 != s2)
33-
// {
34-
// throw(("assertion error: " + s1 + " != " + s2));
35-
// }
33+
void assertEquals(string s1, string s2)
34+
{
35+
CPPUNIT_ASSERT_EQUAL(s1, s2);
36+
// if (s1 != s2)
37+
// {
38+
// throw(("assertion error: " + s1 + " != " + s2));
39+
// }
3640
}
3741

38-
void test1() {
39-
println("test1 start");
40-
TreeNode *none = NULL;
41-
42-
auto result2 = Solution().insertIntoBST(none, 111);
43-
44-
println(serializeTreeNode(none));
45-
assertEquals(serializeTreeNode(none), "null");
46-
println(serializeTreeNode(result2));
47-
assertEquals(serializeTreeNode(result2),
48-
"TreeNode{val:111,left:null,right:null}");
49-
50-
auto nodes =
51-
unordered_set<TreeNode *, HashTreeNode, EqualTreeNode>{none, result2};
52-
for (auto node : nodes) {
53-
printTreeNode(node);
54-
freeTreeNode(node);
55-
}
56-
println("test1 end");
42+
void test1()
43+
{
44+
println("test1 start");
45+
TreeNode* none = NULL;
46+
47+
auto result2 = Solution().insertIntoBST(none, 111);
48+
49+
println(serializeTreeNode(none));
50+
assertEquals(serializeTreeNode(none), "null");
51+
println(serializeTreeNode(result2));
52+
assertEquals(serializeTreeNode(result2),
53+
"TreeNode{val:111,left:null,right:null}");
54+
55+
auto nodes = unordered_set<TreeNode*, HashTreeNode, EqualTreeNode> { none, result2 };
56+
for (auto node : nodes) {
57+
printTreeNode(node);
58+
freeTreeNode(node);
59+
}
60+
println("test1 end");
5761
}
5862

59-
void test2() {
60-
println("test2 start");
61-
auto tree = new TreeNode(99);
62-
println(serializeTreeNode(tree));
63-
assertEquals(serializeTreeNode(tree),
64-
"TreeNode{val:99,left:null,right:null}");
65-
auto result = Solution().insertIntoBST(tree, 111);
66-
67-
println(serializeTreeNode(result));
68-
assertEquals(serializeTreeNode(result),
69-
"TreeNode{val:99,left:null,right:TreeNode{val:111,left:null,"
70-
"right:null}}");
71-
72-
auto nodes =
73-
unordered_set<TreeNode *, HashTreeNode, EqualTreeNode>{tree, result};
74-
for (auto node : nodes) {
75-
printTreeNode(node);
76-
freeTreeNode(node);
77-
}
78-
println("test2 end");
63+
void test2()
64+
{
65+
println("test2 start");
66+
auto tree = new TreeNode(99);
67+
println(serializeTreeNode(tree));
68+
assertEquals(serializeTreeNode(tree),
69+
"TreeNode{val:99,left:null,right:null}");
70+
auto result = Solution().insertIntoBST(tree, 111);
71+
72+
println(serializeTreeNode(result));
73+
assertEquals(serializeTreeNode(result),
74+
"TreeNode{val:99,left:null,right:TreeNode{val:111,left:null,"
75+
"right:null}}");
76+
77+
auto nodes = unordered_set<TreeNode*, HashTreeNode, EqualTreeNode> { tree, result };
78+
for (auto node : nodes) {
79+
printTreeNode(node);
80+
freeTreeNode(node);
81+
}
82+
println("test2 end");
7983
}
8084

8185
class StringTest : public CppUnit::TestFixture {
82-
CPPUNIT_TEST_SUITE(StringTest);
83-
CPPUNIT_TEST(testSwap);
84-
CPPUNIT_TEST(testFind);
86+
CPPUNIT_TEST_SUITE(StringTest);
87+
CPPUNIT_TEST(testSwap);
88+
CPPUNIT_TEST(testFind);
8589

86-
CPPUNIT_TEST(test3);
87-
CPPUNIT_TEST_SUITE_END();
90+
CPPUNIT_TEST(test3);
91+
CPPUNIT_TEST_SUITE_END();
8892

8993
public:
90-
void setUp() {}
91-
92-
void tearDown() {}
93-
94-
void testSwap() { test1(); }
95-
96-
void testFind() { test2(); }
97-
98-
void test3() {
99-
println("test3 start");
100-
auto rawString = string("[4,2,7,1,3]");
101-
auto val = 5;
102-
TreeNode *root = nullptr;
103-
int status = parseLeetCodeBinaryTree(rawString, &root);
104-
CPPUNIT_ASSERT_EQUAL(0, status);
105-
106-
printTreeNode(root);
107-
std::string result = LeetCodeTreeNodeToString(root);
108-
CPPUNIT_ASSERT_EQUAL(result, rawString);
109-
println(result);
110-
cleanTreeNode(root);
111-
println("test3 end");
112-
}
94+
void setUp() { }
95+
96+
void tearDown() { }
97+
98+
void testSwap() { test1(); }
99+
100+
void testFind() { test2(); }
101+
102+
void test3()
103+
{
104+
println("test3 start");
105+
auto rawString = string("[4,2,7,1,3]");
106+
auto val = 5;
107+
TreeNode* root = nullptr;
108+
int status = parseLeetCodeBinaryTree(rawString, &root);
109+
CPPUNIT_ASSERT_EQUAL(0, status);
110+
111+
printTreeNode(root);
112+
std::string result = LeetCodeTreeNodeToString(root);
113+
CPPUNIT_ASSERT_EQUAL(result, rawString);
114+
println(result);
115+
println(serializeTreeNode(root));
116+
auto serialized = string("TreeNode{val:4,left:TreeNode{val:2,left:TreeNode{val:1,left:null,right:null},right:TreeNode{val:3,left:null,right:null}},right:TreeNode{val:7,left:null,right:null}}");
117+
CPPUNIT_ASSERT_EQUAL(serializeTreeNode(root),
118+
serialized);
119+
cleanTreeNode(root);
120+
println("test3 end");
121+
}
113122
};
114123

115124
CPPUNIT_TEST_SUITE_REGISTRATION(StringTest);
116125

117-
int main(int argc, char *argv[]) {
118-
CppUnit::TestResult r;
119-
CppUnit::TestResultCollector rc;
120-
r.addListener(&rc);
126+
int main(int argc, char* argv[])
127+
{
128+
CppUnit::TestResult r;
129+
CppUnit::TestResultCollector rc;
130+
r.addListener(&rc);
121131

122-
CppUnit::TestRunner runner;
123-
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
124-
runner.run(r);
132+
CppUnit::TestRunner runner;
133+
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
134+
runner.run(r);
125135

126-
CppUnit::TextOutputter o(&rc, std::cout);
127-
o.write();
136+
CppUnit::TextOutputter o(&rc, std::cout);
137+
o.write();
128138

129-
return rc.wasSuccessful() ? 0 : -1;
139+
return rc.wasSuccessful() ? 0 : -1;
130140
}

0 commit comments

Comments
 (0)