Skip to content

Commit b11ddb5

Browse files
committed
added memory gtests
1 parent 03f32ab commit b11ddb5

File tree

5 files changed

+237
-268
lines changed

5 files changed

+237
-268
lines changed

Makefile

+1-9
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,22 @@ CXXFLAGS=-Wall -Wextra -Wpedantic -std=c++11
44

55
all: build
66

7-
build: out out/Test out/TestBadData out/MemoryTest out/TestTreeList out/TestLargeData
7+
build: out out/TestBadData out/TestTreeList out/TestLargeData
88

99
out:
1010
mkdir -p out
1111

12-
out/Test: Test.cpp RTree.h
13-
$(CXX) -o $@ ${CXXFLAGS} $<
14-
1512
out/TestBadData: TestBadData.cpp RTree.h
1613
$(CXX) -o $@ ${CXXFLAGS} $<
1714

18-
out/MemoryTest: MemoryTest.cpp RTree.h
19-
$(CXX) -o $@ ${CXXFLAGS} $<
20-
2115
out/TestTreeList: TestTreeList.cpp RTree.h
2216
$(CXX) -o $@ ${CXXFLAGS} $<
2317

2418
out/TestLargeData: TestLargeData.cpp RTree.h
2519
$(CXX) -o $@ ${CXXFLAGS} $<
2620

2721
test: build
28-
./out/Test
2922
./out/TestBadData baddata.txt
30-
./out/MemoryTest
3123
./out/TestTreeList
3224
./out/TestLargeData
3325

MemoryTest.cpp

-257
This file was deleted.

tests/CMakeLists.txt

+12
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,24 @@ add_executable(
33
basics.cpp
44
)
55

6+
add_executable(
7+
memory
8+
memory.cpp
9+
)
10+
611
target_link_libraries(
712
basics
813
GTest::gtest_main
914
GTest::gmock_main
1015
)
1116

17+
target_link_libraries(
18+
memory
19+
GTest::gtest_main
20+
GTest::gmock_main
21+
)
22+
1223
include(GoogleTest)
1324
gtest_discover_tests(basics)
25+
gtest_discover_tests(memory)
1426

tests/basics.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ TEST(BasicTests, BasicTests) {
5050

5151
int i, nhits;
5252

53-
ASSERT_EQ(nrects, 4);
54-
5553
for (i = 0; i < nrects; i++) {
5654
tree.Insert(
5755
rects[i].min, rects[i].max,

0 commit comments

Comments
 (0)