Skip to content

Commit c7929e9

Browse files
author
Sebastiano Merlino
committed
Moved all classes and functions into littletest namespace
1 parent 391e8e2 commit c7929e9

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

test/littletest.hpp

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@
3939
#define LT_END_TEST_ENV() return 0; }
4040

4141
#define AUTORUN_TESTS() \
42-
std::vector<test_base*>::iterator autorun_it; \
43-
for(autorun_it = auto_test_vector.begin(); autorun_it != auto_test_vector.end(); ++autorun_it) \
44-
auto_test_runner((*autorun_it)); \
45-
auto_test_runner();
42+
std::vector<littletest::test_base*>::iterator autorun_it; \
43+
for(autorun_it = littletest::auto_test_vector.begin(); autorun_it != littletest::auto_test_vector.end(); ++autorun_it) \
44+
littletest::auto_test_runner((*autorun_it)); \
45+
littletest::auto_test_runner();
4646

4747
#define LT_TEST(name) name ## _obj
4848

4949
#define LT_CREATE_RUNNER(suite_name, runner_name) \
5050
std::cout << "** Initializing Runner \"" << #runner_name << "\" **" << std::endl; \
51-
test_runner runner_name
51+
littletest::test_runner runner_name
5252

5353
#define LT_RUNNER(runner_name) runner_name
5454

5555
#define LT_BEGIN_SUITE(name) \
56-
struct name : public suite<name> \
56+
struct name : public littletest::suite<name> \
5757
{
5858

5959
#define LT_END_SUITE(name) \
@@ -62,14 +62,14 @@
6262
#define LT_CHECKPOINT() tr->set_checkpoint(__FILE__, __LINE__)
6363

6464
#define LT_BEGIN_TEST(suite_name, test_name) \
65-
struct test_name : public suite_name, test<test_name> \
65+
struct test_name : public suite_name, littletest::test<test_name> \
6666
{ \
6767
test_name() \
6868
{ \
6969
name = #test_name; \
70-
auto_test_vector.push_back(this); \
70+
littletest::auto_test_vector.push_back(this); \
7171
} \
72-
void operator()(test_runner* tr) \
72+
void operator()(littletest::test_runner* tr) \
7373
{
7474

7575
#define LT_END_TEST(test_name) \
@@ -86,11 +86,11 @@
8686
switch(mode) \
8787
{ \
8888
case(WARN): \
89-
throw warn_unattended(ss.str()); \
89+
throw littletest::warn_unattended(ss.str()); \
9090
case(CHECK): \
91-
throw check_unattended(ss.str()); \
91+
throw littletest::check_unattended(ss.str()); \
9292
case(ASSERT): \
93-
throw assert_unattended(ss.str()); \
93+
throw littletest::assert_unattended(ss.str()); \
9494
}
9595

9696
#define LT_SIMPLE_OP(name, val, file, line, mode) \
@@ -151,18 +151,18 @@
151151
}
152152

153153
#define LT_CATCH_ERRORS \
154-
catch(check_unattended& cu) \
154+
catch(littletest::check_unattended& cu) \
155155
{ \
156156
std::cout << "[CHECK FAILURE] " << cu.what() << std::endl; \
157157
tr->add_failure(); \
158158
} \
159-
catch(assert_unattended& au) \
159+
catch(littletest::assert_unattended& au) \
160160
{ \
161161
std::cout << "[ASSERT FAILURE] " << au.what() << std::endl; \
162162
tr->add_failure(); \
163163
throw au; \
164164
} \
165-
catch(warn_unattended& wu) \
165+
catch(littletest::warn_unattended& wu) \
166166
{ \
167167
std::cout << "[WARN] " << wu.what() << std::endl; \
168168
}
@@ -258,7 +258,10 @@
258258
#define LT_FAIL(message) \
259259
std::cout << "[ASSERT FAILURE] (" << __FILE__ << ":" << __LINE__ << ") - error in " << "\"" << name << "\": " << message << std::endl; \
260260
tr->add_failure(); \
261-
throw assert_unattended("");
261+
throw littletest::assert_unattended("");
262+
263+
namespace littletest
264+
{
262265

263266
struct check_unattended : public std::exception
264267
{
@@ -525,4 +528,6 @@ class test : public test_base
525528
friend class test_runner;
526529
};
527530

531+
};
532+
528533
#endif //_LITTLETEST_HPP_

0 commit comments

Comments
 (0)