diff options
Diffstat (limited to 'tests/test_common/test_fixture.cpp')
| -rw-r--r-- | tests/test_common/test_fixture.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index d86681eea..8caf1fca4 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp | |||
| @@ -11,14 +11,14 @@ extern "C" { | |||
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | extern "C" { | 13 | extern "C" { |
| 14 | void set_time(uint32_t t); | 14 | void set_time(uint32_t t); |
| 15 | void advance_time(uint32_t ms); | 15 | void advance_time(uint32_t ms); |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | using testing::_; | 18 | using testing::_; |
| 19 | using testing::AnyNumber; | 19 | using testing::AnyNumber; |
| 20 | using testing::Return; | ||
| 21 | using testing::Between; | 20 | using testing::Between; |
| 21 | using testing::Return; | ||
| 22 | 22 | ||
| 23 | void TestFixture::SetUpTestCase() { | 23 | void TestFixture::SetUpTestCase() { |
| 24 | TestDriver driver; | 24 | TestDriver driver; |
| @@ -26,11 +26,9 @@ void TestFixture::SetUpTestCase() { | |||
| 26 | keyboard_init(); | 26 | keyboard_init(); |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | void TestFixture::TearDownTestCase() { | 29 | void TestFixture::TearDownTestCase() {} |
| 30 | } | ||
| 31 | 30 | ||
| 32 | TestFixture::TestFixture() { | 31 | TestFixture::TestFixture() {} |
| 33 | } | ||
| 34 | 32 | ||
| 35 | TestFixture::~TestFixture() { | 33 | TestFixture::~TestFixture() { |
| 36 | TestDriver driver; | 34 | TestDriver driver; |
| @@ -50,7 +48,7 @@ void TestFixture::run_one_scan_loop() { | |||
| 50 | } | 48 | } |
| 51 | 49 | ||
| 52 | void TestFixture::idle_for(unsigned time) { | 50 | void TestFixture::idle_for(unsigned time) { |
| 53 | for (unsigned i=0; i<time; i++) { | 51 | for (unsigned i = 0; i < time; i++) { |
| 54 | run_one_scan_loop(); | 52 | run_one_scan_loop(); |
| 55 | } | 53 | } |
| 56 | } | 54 | } |
